From fa2f642e4f4506207ef5cfef6881b3a201322f9f Mon Sep 17 00:00:00 2001 From: micha-bbg Date: Mon, 7 Nov 2011 20:48:41 +0000 Subject: [PATCH] Remove old DBox2 identifier (patch by svenhoefer) - Renaming NEUTRINO_ICON_BUTTON_DBOX* to NEUTRINO_ICON_BUTTON_MENU* - Changed menu icons git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1839 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- data/icons/Makefile.am | 4 ++-- data/icons/dbox.png | Bin 351 -> 0 bytes data/icons/dbox_small.png | Bin 276 -> 0 bytes data/icons/menu.png | Bin 0 -> 550 bytes data/icons/menu_small.png | Bin 0 -> 323 bytes src/gui/audioplayer.cpp | 6 +++--- src/gui/bedit/bouqueteditor_bouquets.cpp | 4 ++-- src/gui/channellist.cpp | 6 +++--- src/gui/mediaplayer.cpp | 2 +- src/gui/moviebrowser.cpp | 4 ++-- src/gui/movieplayer.cpp | 4 ++-- src/gui/pictureviewer.cpp | 6 +++--- src/gui/upnpbrowser.cpp | 4 ++-- src/gui/widget/icons.h | 4 ++-- 14 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 data/icons/dbox.png delete mode 100644 data/icons/dbox_small.png create mode 100644 data/icons/menu.png create mode 100644 data/icons/menu_small.png diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index 9a4733a57..bb3848036 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -44,8 +44,6 @@ install_DATA = \ d_green.png \ d_white.png \ d_yellow.png \ - dbox.png \ - dbox_small.png \ dd.png \ dd_avail.png \ dd_gray.png \ @@ -88,6 +86,8 @@ install_DATA = \ local.png \ lock.png \ mainmenue.png \ + menu.png \ + menu_small.png \ mounted.png \ movie.png \ mp_b-skip.png \ diff --git a/data/icons/dbox.png b/data/icons/dbox.png deleted file mode 100644 index 7c48b7465678466c2a82049c51f956280d2b17cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 351 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wg8-ipS06W@JGbssR8&luFd;D^ zF*iH6rKx51+}Sy4Ie-5BiHVGkPgl?9#^O0Zy<84?fML@a zo%29Z&H|6fVg?3oArNM~bhqvgP;kGei(`ny<>VQiED{C9Y6b@w)tR#`WmpV0v>&q# zx^!G2gAKZcg(4zTs#TWk)opCd6`k?f&m*&(iTV2~RfoQeITI#*V`Ezu zy4qn*fTgM`t3dj~1q)nO+)-9&=RY$sSG4x~3r6Po;vLMFzP@8*UVVC1=;~=ZcEs@Z lawjD4wl*__oEH>VV33|x5E~`l<_q)+gQu&X%Q~loCIHolfw%ww diff --git a/data/icons/dbox_small.png b/data/icons/dbox_small.png deleted file mode 100644 index 97c3b5f706655cbd4d57b8622361ae690ff57ef8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDU1=1mYArYYwF;Ovz35h9b zDLH95xjDIoMTHd=6-|vzJ$*fMrp=i*f8L#2cYNG^0_((tgHS%}Yp$=d1S;fA$G6OZ#o@!Z&_yd~+g=xsp@CUpgtU93$N zijD$S95!k{uBz9+sNI$K;YNAxgWhY!>=lx)Pp!W1xccHW@%^n~lC$T_Ca*KhmndA8 zad!vTqY}rE{|3{RZ#l*_&q*%zK+{B_R#9a^6OLJiLWk=%={(5mIb~$~Grxv0xg_M) Umy%;kfUaZkboFyt=akR{0OZ4Hpa1{> diff --git a/data/icons/menu.png b/data/icons/menu.png new file mode 100644 index 0000000000000000000000000000000000000000..fb4d418d65d7a75ec9cac34bb4e5c6eaeb726438 GIT binary patch literal 550 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAJrD2+aZO823kV3v&CabTuefvT zPGx0fVnSkiT6#=mOkPf2L0&;|VR313X=zDmMMZ^=n@@97b8=F0Y*cK0eSJb)LRD2& zNl{5^N@_xULUvYmZdPtwbX-zmQhsiJEfCbzR#jIO6%@6#wDolLOz595apJ@&Q>RRu zF>ThISt-dW8R;2yb#-N>W##4N85tQ_8CjJTAefzzU0GF`otd4KkW^h=T~kw2U0YpK zTa%NOlbD#8lbusnUl$)6-_X#|+}PaI)Rdc(+tSn$8y%aRoE#SuSD0Uzl9G}bpO}`G zHhb>u_?Y<5ueMbIz06n=Ua7ZfBY0p)CfBu5qIavfdhUM?GF?_XFjl@m{CXI!H#BS=72K2 z16&!*f3jCF?4PW3;A*!(b;I-g_dgoKbzM51c}_CXQM?mq`+?#3nz9_P{q{baZ{OHk mR+V4MK4Gcrf4eJezZnhmRsPR;Cocu`ID@CFpUXO@geCx#BI}6& literal 0 HcmV?d00001 diff --git a/data/icons/menu_small.png b/data/icons/menu_small.png new file mode 100644 index 0000000000000000000000000000000000000000..71bfe7335410741ba0bab73620d2f192a749d7eb GIT binary patch literal 323 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}et=JiE07Kd2)J|WPDMpUQ)82l zyH8A1Om0qYa#C_tRaJgoeqm8zRCrWeOk8z!bz?(gVnSj|OG|f8cTZnW|AhWo(`U__ zH!mqEDLp;Cp}rv}Cnq8_A}=p5CNd@=KB1_%sI0s!4G7ZH=FOj1SXg-d>_2;;m5e1p ze!&b5&u*jvIZd7}jv*CssppULF&XkOT)d%qyL$2W|Nq_6iXFInQjXSbmw3GYk>9-8 zLivAc_TJ2S-;tJ}6|&W>;torXr2>b7vVn@%wy;TzFXRii3RW%f{yMp&Av^LBtHpwq zbqd@E<}xl}d?Oh#Lwxeu0H*1#Pgrh<_AT|ex@@getIconSize(NEUTRINO_ICON_BUTTON_DBOX, &iw, &ih); - m_frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_DBOX, xpos - iw, ypos, m_theight); + m_frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_MENU, &iw, &ih); + m_frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_MENU, xpos - iw, ypos, m_theight); xpos -= (iw + 10); } - //m_frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_DBOX, m_x + m_width - 30, ypos); + //m_frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_MENU, m_x + m_width - 30, ypos); #endif #if 1 if ( CNeutrinoApp::getInstance()->isMuted() ) diff --git a/src/gui/bedit/bouqueteditor_bouquets.cpp b/src/gui/bedit/bouqueteditor_bouquets.cpp index bbdd2e8f8..14b32519f 100644 --- a/src/gui/bedit/bouqueteditor_bouquets.cpp +++ b/src/gui/bedit/bouqueteditor_bouquets.cpp @@ -164,7 +164,7 @@ void CBEBouquetWidget::paintFoot() frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_RED, &icol_w, &icol_h); /* ButtonHeight = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()+8*//*std::max(fh, icol_h+4)*/; - frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_DBOX, &icol_w, &h2); + frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_MENU, &icol_w, &h2); // ButtonHeight = std::max(ButtonHeight, h2+4); // frameBuffer->paintBoxRel(x,y+height, width,ButtonHeight, COL_MENUHEAD_PLUS_0, RADIUS_LARGE, CORNER_BOTTOM); @@ -183,7 +183,7 @@ void CBEBouquetWidget::paintFoot() break; } ::paintButtons(x, y+height, width, 4, Button, ButtonHeight); - frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_DBOX, x + width - 10 - icol_w, y + height, ButtonHeight); + frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_MENU, x + width - 10 - icol_w, y + height, ButtonHeight); } void CBEBouquetWidget::hide() diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 95fe66312..716c9191a 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -486,7 +486,7 @@ int CChannelList::show() frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_HELP, &icol_w, &icol_h); theight = std::max(theight, icol_h); - frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_DBOX, &icol_w, &icol_h); + frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_MENU, &icol_w, &icol_h); theight = std::max(theight, icol_h); frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_MUTE_ZAP_ACTIVE, &icol_w, &icol_h); @@ -2056,14 +2056,14 @@ void CChannelList::paintHead() int iw1, iw2, iw3, ih = 0; frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_HELP, &iw1, &ih); - frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_DBOX, &iw2, &ih); + frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_MENU, &iw2, &ih); frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_MUTE_ZAP_ACTIVE, &iw3, &ih); // head frameBuffer->paintBoxRel(x,y, width,theight+0, COL_MENUHEAD_PLUS_0, RADIUS_LARGE, CORNER_TOP);//round frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_HELP, x + width - iw1 - 4, y, theight); //y+ 5 ); - frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_DBOX, x + width - iw1 - iw2 - 8, y, theight);//y + 5); // icon for bouquet list button + frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_MENU, x + width - iw1 - iw2 - 8, y, theight);//y + 5); // icon for bouquet list button frameBuffer->paintIcon(this->new_mode_active ? NEUTRINO_ICON_BUTTON_MUTE_ZAP_ACTIVE : NEUTRINO_ICON_BUTTON_MUTE_ZAP_INACTIVE, x + width - iw1 - iw2 - iw3 - 12, y, theight); diff --git a/src/gui/mediaplayer.cpp b/src/gui/mediaplayer.cpp index 4f32bc454..0cec633f5 100644 --- a/src/gui/mediaplayer.cpp +++ b/src/gui/mediaplayer.cpp @@ -215,6 +215,6 @@ void CMediaPlayerMenu::showMoviePlayer(CMenuWidget *moviePlayer) // moviePlayer->addItem(new CMenuForwarder(LOCALE_MOVIEPLAYER_VCDPLAYBACK, true, NULL, moviePlayerGui, "vcdplayback", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE)); // moviePlayer->addItem(GenericMenuSeparatorLine); // moviePlayer->addItem(new CMenuForwarder(LOCALE_MAINMENU_SETTINGS, true, NULL, &streamingSettings, NULL, CRCInput::RC_help, NEUTRINO_ICON_BUTTON_HELP_SMALL)); -// moviePlayer->addItem(new CMenuForwarder(LOCALE_NFSMENU_HEAD, true, NULL, new CNFSSmallMenu(), NULL, CRCInput::RC_setup, NEUTRINO_ICON_BUTTON_DBOX_SMALL)); +// moviePlayer->addItem(new CMenuForwarder(LOCALE_NFSMENU_HEAD, true, NULL, new CNFSSmallMenu(), NULL, CRCInput::RC_setup, NEUTRINO_ICON_BUTTON_MENU_SMALL)); // #endif } diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp index 4066ec64b..671aa1f81 100644 --- a/src/gui/moviebrowser.cpp +++ b/src/gui/moviebrowser.cpp @@ -3008,7 +3008,7 @@ bool CMovieBrowser::showMenu(MI_MOVIE_INFO* /*movie_info*/) mainMenu.addItem( new CMenuForwarder(LOCALE_EPGPLUS_OPTIONS, true, NULL, &optionsMenu,NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN)); mainMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_DIRECTORIES_HEAD, true, NULL, &dirMenu, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW)); mainMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_SCAN_FOR_MOVIES, true, NULL, this, "reload_movie_info", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE)); - //mainMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_NFS_HEAD, true, NULL, nfs, NULL, CRCInput::RC_setup, NEUTRINO_ICON_BUTTON_DBOX_SMALL)); + //mainMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_NFS_HEAD, true, NULL, nfs, NULL, CRCInput::RC_setup, NEUTRINO_ICON_BUTTON_MENU_SMALL)); mainMenu.addItem(GenericMenuSeparatorLine); mainMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_HELP_HEAD, true, NULL, movieHelp, NULL, CRCInput::RC_help, NEUTRINO_ICON_BUTTON_HELP_SMALL)); //mainMenu.addItem(GenericMenuSeparator); @@ -3481,7 +3481,7 @@ int CMovieHelp::exec(CMenuTarget* /*parent*/, const std::string & /*actionKey*/) helpbox.addLine(NEUTRINO_ICON_BUTTON_GREEN, "Filterfenster einblenden"); helpbox.addLine(NEUTRINO_ICON_BUTTON_YELLOW, "Aktives Fenster wechseln"); helpbox.addLine(NEUTRINO_ICON_BUTTON_BLUE, "Filminfos neu laden"); - helpbox.addLine(NEUTRINO_ICON_BUTTON_DBOX, "Hauptmenü"); + helpbox.addLine(NEUTRINO_ICON_BUTTON_MENU, "Hauptmenü"); helpbox.addLine("+/- Ansicht wechseln"); helpbox.addLine(""); helpbox.addLine("Während der Filmwiedergabe:"); diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index c11769f58..c20db6481 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1382,7 +1382,7 @@ void CMoviePlayerGui::showHelpTS() helpbox.addLine(NEUTRINO_ICON_BUTTON_GREEN, g_Locale->getText(LOCALE_MOVIEPLAYER_TSHELP2)); helpbox.addLine(NEUTRINO_ICON_BUTTON_YELLOW, g_Locale->getText(LOCALE_MOVIEPLAYER_TSHELP3)); helpbox.addLine(NEUTRINO_ICON_BUTTON_BLUE, g_Locale->getText(LOCALE_MOVIEPLAYER_TSHELP4)); - helpbox.addLine(NEUTRINO_ICON_BUTTON_DBOX, g_Locale->getText(LOCALE_MOVIEPLAYER_TSHELP5)); + helpbox.addLine(NEUTRINO_ICON_BUTTON_MENU, g_Locale->getText(LOCALE_MOVIEPLAYER_TSHELP5)); helpbox.addLine(NEUTRINO_ICON_BUTTON_1, g_Locale->getText(LOCALE_MOVIEPLAYER_TSHELP6)); helpbox.addLine(NEUTRINO_ICON_BUTTON_3, g_Locale->getText(LOCALE_MOVIEPLAYER_TSHELP7)); helpbox.addLine(NEUTRINO_ICON_BUTTON_4, g_Locale->getText(LOCALE_MOVIEPLAYER_TSHELP8)); @@ -1403,7 +1403,7 @@ void CMoviePlayerGui::showHelpVLC() helpbox.addLine(NEUTRINO_ICON_BUTTON_GREEN, g_Locale->getText(LOCALE_MOVIEPLAYER_VLCHELP2)); helpbox.addLine(NEUTRINO_ICON_BUTTON_YELLOW, g_Locale->getText(LOCALE_MOVIEPLAYER_VLCHELP3)); helpbox.addLine(NEUTRINO_ICON_BUTTON_BLUE, g_Locale->getText(LOCALE_MOVIEPLAYER_VLCHELP4)); - helpbox.addLine(NEUTRINO_ICON_BUTTON_DBOX, g_Locale->getText(LOCALE_MOVIEPLAYER_VLCHELP5)); + helpbox.addLine(NEUTRINO_ICON_BUTTON_MENU, g_Locale->getText(LOCALE_MOVIEPLAYER_VLCHELP5)); helpbox.addLine(NEUTRINO_ICON_BUTTON_1, g_Locale->getText(LOCALE_MOVIEPLAYER_VLCHELP6)); helpbox.addLine(NEUTRINO_ICON_BUTTON_3, g_Locale->getText(LOCALE_MOVIEPLAYER_VLCHELP7)); helpbox.addLine(NEUTRINO_ICON_BUTTON_4, g_Locale->getText(LOCALE_MOVIEPLAYER_VLCHELP8)); diff --git a/src/gui/pictureviewer.cpp b/src/gui/pictureviewer.cpp index 78ac47f6c..f2c5694b2 100644 --- a/src/gui/pictureviewer.cpp +++ b/src/gui/pictureviewer.cpp @@ -129,7 +129,7 @@ int CPictureViewerGui::exec(CMenuTarget* parent, const std::string & /*actionKey frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_HELP, &icol_w, &icol_h); theight = std::max(theight, icol_h); - frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_DBOX, &icol_w, &icol_h); + frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_MENU, &icol_w, &icol_h); theight = std::max(theight, icol_h); frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_RED, &icol_w, &icol_h); @@ -629,7 +629,7 @@ void CPictureViewerGui::paintHead() int iw1, iw2, iw3, ih; frameBuffer->getIconSize(NEUTRINO_ICON_MP3, &iw1, &ih); frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_HELP, &iw2, &ih); - frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_DBOX, &iw3, &ih); + frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_MENU, &iw3, &ih); frameBuffer->paintBoxRel(x, y, width, theight, COL_MENUHEAD_PLUS_0, RADIUS_LARGE, CORNER_TOP); @@ -637,7 +637,7 @@ void CPictureViewerGui::paintHead() g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x+iw1+10, y+theight+0, width- iw1 - iw2 - iw3 - 5*5, strCaption, COL_MENUHEAD, 0, true); // UTF-8 frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_HELP, x+ width- iw2 - 5, y, theight); - frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_DBOX, x+ width- iw2 - iw3 - 10, y, theight ); + frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_MENU, x+ width- iw2 - iw3 - 10, y, theight ); // printf("paintHead}\n"); } diff --git a/src/gui/upnpbrowser.cpp b/src/gui/upnpbrowser.cpp index b1323b921..7229c06c1 100644 --- a/src/gui/upnpbrowser.cpp +++ b/src/gui/upnpbrowser.cpp @@ -1019,7 +1019,7 @@ void CUpnpBrowserGui::paintDevice() ypos = m_y + m_title_height; if (m_theight > 26) ypos = (m_theight - 26) / 2 + m_y + m_title_height; - m_frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_DBOX, m_x + m_width - 30, ypos); + m_frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_MENU, m_x + m_width - 30, ypos); #if 0 if ( CNeutrinoApp::getInstance()->isMuted() ) { @@ -1141,7 +1141,7 @@ void CUpnpBrowserGui::paintItem(std::vector *entry, unsigned int sele ypos = m_y + m_title_height; if (m_theight > 26) ypos = (m_theight - 26) / 2 + m_y + m_title_height; - m_frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_DBOX, m_x + m_width - 30, ypos); + m_frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_MENU, m_x + m_width - 30, ypos); #if 0 if ( CNeutrinoApp::getInstance()->isMuted() ) { diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h index b691b9148..c6e86b6c4 100644 --- a/src/gui/widget/icons.h +++ b/src/gui/widget/icons.h @@ -29,8 +29,8 @@ #define NEUTRINO_ICON_BUTTON_RED "rot" #define NEUTRINO_ICON_BUTTON_YELLOW "gelb" -#define NEUTRINO_ICON_BUTTON_DBOX "dbox" -#define NEUTRINO_ICON_BUTTON_DBOX_SMALL "dbox_small" +#define NEUTRINO_ICON_BUTTON_MENU "menu" +#define NEUTRINO_ICON_BUTTON_MENU_SMALL "menu_small" #define NEUTRINO_ICON_BUTTON_HELP "help" #define NEUTRINO_ICON_BUTTON_HELP_SMALL "help_small" #define NEUTRINO_ICON_BUTTON_INFO "info"