From 10367957550b3c5c08693f9b6303cae4026c68a8 Mon Sep 17 00:00:00 2001 From: thilo Date: Mon, 10 Oct 2011 17:16:39 +0000 Subject: [PATCH] *neutrino icons: renamed some icons relevant for user defined icons git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1756 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- data/icons/Makefile.am | 8 ++--- ...active_16x16.png => btn_record_active.png} | Bin ...tive_16x16.png => btn_record_inactive.png} | Bin .../{btn_stop_16x16.png => btn_stop.png} | Bin ...eplayer_32x32.png => icon_movieplayer.png} | Bin src/gui/channellist.cpp | 8 ++--- src/gui/moviebrowser.cpp | 28 +++++++++--------- src/gui/widget/icons.h | 8 ++--- 8 files changed, 26 insertions(+), 26 deletions(-) rename data/icons/{btn_record_active_16x16.png => btn_record_active.png} (100%) rename data/icons/{btn_record_inactive_16x16.png => btn_record_inactive.png} (100%) rename data/icons/{btn_stop_16x16.png => btn_stop.png} (100%) rename data/icons/{icon_movieplayer_32x32.png => icon_movieplayer.png} (100%) diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index c511a6ed8..d5090991c 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -25,9 +25,9 @@ install_DATA = \ border_lr.png \ border_ul.png \ bosanski.png \ - btn_record_active_16x16.png \ - btn_record_inactive_16x16.png \ - btn_stop_16x16.png \ + btn_record_active.png \ + btn_record_inactive.png \ + btn_stop.png \ ca.png \ ca2.png \ ca2_gray.png \ @@ -70,7 +70,7 @@ install_DATA = \ home.png \ hungarian.png \ icon_green.png \ - icon_movieplayer_32x32.png \ + icon_movieplayer.png \ icon_red.png \ icon_yellow.png \ info.png \ diff --git a/data/icons/btn_record_active_16x16.png b/data/icons/btn_record_active.png similarity index 100% rename from data/icons/btn_record_active_16x16.png rename to data/icons/btn_record_active.png diff --git a/data/icons/btn_record_inactive_16x16.png b/data/icons/btn_record_inactive.png similarity index 100% rename from data/icons/btn_record_inactive_16x16.png rename to data/icons/btn_record_inactive.png diff --git a/data/icons/btn_stop_16x16.png b/data/icons/btn_stop.png similarity index 100% rename from data/icons/btn_stop_16x16.png rename to data/icons/btn_stop.png diff --git a/data/icons/icon_movieplayer_32x32.png b/data/icons/icon_movieplayer.png similarity index 100% rename from data/icons/icon_movieplayer_32x32.png rename to data/icons/icon_movieplayer.png diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 35cd6b6c0..6e0df4891 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -1776,7 +1776,7 @@ struct button_label SChannelListButtons[NUM_LIST_BUTTONS] = { NEUTRINO_ICON_BUTTON_RED, LOCALE_INFOVIEWER_EVENTLIST}, { NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_INFOVIEWER_NEXT}, { NEUTRINO_ICON_BUTTON_BLUE, LOCALE_BOUQUETLIST_HEAD}, - { NEUTRINO_ICON_BUTTON_RECORD_INACTIVE_16, NONEXISTANT_LOCALE} + { NEUTRINO_ICON_BUTTON_RECORD_INACTIVE, NONEXISTANT_LOCALE} }; void CChannelList::paintButtonBar(bool is_current) @@ -1795,13 +1795,13 @@ void CChannelList::paintButtonBar(bool is_current) if (g_settings.recording_type != RECORDING_OFF && !displayNext){ if (is_current && !do_record){ SChannelListButtons[3].locale = LOCALE_MAINMENU_RECORDING; - SChannelListButtons[3].button = NEUTRINO_ICON_BUTTON_RECORD_ACTIVE_16; + SChannelListButtons[3].button = NEUTRINO_ICON_BUTTON_RECORD_ACTIVE; }else if (do_record){ SChannelListButtons[3].locale = LOCALE_MAINMENU_RECORDING_STOP; - SChannelListButtons[3].button = NEUTRINO_ICON_BUTTON_STOP_16; + SChannelListButtons[3].button = NEUTRINO_ICON_BUTTON_STOP; }else{ SChannelListButtons[3].locale = NONEXISTANT_LOCALE; - SChannelListButtons[3].button = NEUTRINO_ICON_BUTTON_RECORD_INACTIVE_16; + SChannelListButtons[3].button = NEUTRINO_ICON_BUTTON_RECORD_INACTIVE; } } diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp index 1ac3b0bd6..4066ec64b 100644 --- a/src/gui/moviebrowser.cpp +++ b/src/gui/moviebrowser.cpp @@ -1540,8 +1540,8 @@ void CMovieBrowser::refreshTitle(void) m_cBoxFrameTitleRel.iWidth, m_cBoxFrameTitleRel.iHeight, TITLE_BACKGROUND_COLOR, RADIUS_LARGE, CORNER_TOP); int iconw = 0, iconh = 0; - CFrameBuffer::getInstance()->getIconSize(NEUTRINO_ICON_MOVIEPLAYER_32, &iconw, &iconh); - m_pcWindow->paintIcon(NEUTRINO_ICON_MOVIEPLAYER_32, m_cBoxFrame.iX+m_cBoxFrameTitleRel.iX+6, start_y+ m_cBoxFrameTitleRel.iHeight/2 - iconh/2); + CFrameBuffer::getInstance()->getIconSize(NEUTRINO_ICON_MOVIEPLAYER, &iconw, &iconh); + m_pcWindow->paintIcon(NEUTRINO_ICON_MOVIEPLAYER, m_cBoxFrame.iX+m_cBoxFrameTitleRel.iX+6, start_y+ m_cBoxFrameTitleRel.iHeight/2 - iconh/2); m_pcFontTitle->RenderString(m_cBoxFrame.iX+m_cBoxFrameTitleRel.iX + iconw + text_border_width, start_y + m_cBoxFrameTitleRel.iHeight, m_cBoxFrameTitleRel.iWidth - (text_border_width << 1), m_textTitle.c_str(), TITLE_FONT_COLOR, 0, true); // UTF-8 info_hdd_level(); @@ -2786,7 +2786,7 @@ void CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info) CIntInput bookLastIntInput (LOCALE_MOVIEBROWSER_EDIT_BOOK, (int&)movie_info->bookmarks.lastPlayStop, 5, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO2); CIntInput bookEndIntInput (LOCALE_MOVIEBROWSER_EDIT_BOOK, (int&)movie_info->bookmarks.end, 5, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO2); - CMenuWidget bookmarkMenu (LOCALE_MOVIEBROWSER_HEAD , NEUTRINO_ICON_MOVIEPLAYER_32); + CMenuWidget bookmarkMenu (LOCALE_MOVIEBROWSER_HEAD , NEUTRINO_ICON_MOVIEPLAYER); bookmarkMenu.addIntroItems(LOCALE_MOVIEBROWSER_BOOK_HEAD); bookmarkMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_CLEAR_ALL, true, NULL, this, "book_clear_all",CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE)); @@ -2802,7 +2802,7 @@ void CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info) pBookPosIntInput[li] = new CIntInput (LOCALE_MOVIEBROWSER_EDIT_BOOK, (int&) movie_info->bookmarks.user[li].pos, 20, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO2); pBookTypeIntInput[li] = new CIntInput (LOCALE_MOVIEBROWSER_EDIT_BOOK, (int&) movie_info->bookmarks.user[li].length, 20, LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO2); - pBookItemMenu[li] = new CMenuWidget(LOCALE_MOVIEBROWSER_BOOK_HEAD, NEUTRINO_ICON_MOVIEPLAYER_32); + pBookItemMenu[li] = new CMenuWidget(LOCALE_MOVIEBROWSER_BOOK_HEAD, NEUTRINO_ICON_MOVIEPLAYER); pBookItemMenu[li]->addItem(GenericMenuSeparator); pBookItemMenu[li]->addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_NAME, true, movie_info->bookmarks.user[li].name,pBookNameInput[li])); pBookItemMenu[li]->addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_POSITION, true, pBookPosIntInput[li]->getValue(), pBookPosIntInput[li])); @@ -2815,7 +2815,7 @@ void CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info) /** serie******************************************************/ CStringInput serieUserInput(LOCALE_MOVIEBROWSER_EDIT_SERIE, &movie_info->serieName, 20, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789-.: "); - CMenuWidget serieMenu (LOCALE_MOVIEBROWSER_HEAD, NEUTRINO_ICON_MOVIEPLAYER_32); + CMenuWidget serieMenu (LOCALE_MOVIEBROWSER_HEAD, NEUTRINO_ICON_MOVIEPLAYER); serieMenu.addIntroItems(LOCALE_MOVIEBROWSER_SERIE_HEAD); serieMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_SERIE_NAME, true, movie_info->serieName,&serieUserInput)); serieMenu.addItem(GenericMenuSeparatorLine); @@ -2828,7 +2828,7 @@ void CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info) movieInfoUpdateAll[i]=0; movieInfoUpdateAllIfDestEmptyOnly=true; - CMenuWidget movieInfoMenuUpdate(LOCALE_MOVIEBROWSER_HEAD, NEUTRINO_ICON_MOVIEPLAYER_32); + CMenuWidget movieInfoMenuUpdate(LOCALE_MOVIEBROWSER_HEAD, NEUTRINO_ICON_MOVIEPLAYER); movieInfoMenuUpdate.addIntroItems(LOCALE_MOVIEBROWSER_INFO_HEAD_UPDATE); movieInfoMenuUpdate.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_SAVE_ALL, true, NULL, this, "save_movie_info_all",CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED)); movieInfoMenuUpdate.addItem(GenericMenuSeparatorLine); @@ -2866,7 +2866,7 @@ void CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info) CStringInput countryUserInput(LOCALE_MOVIEBROWSER_INFO_PRODCOUNTRY, &movie_info->productionCountry, 11, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "ABCDEFGHIJKLMNOPQRSTUVWXYZ "); CIntInput yearUserIntInput(LOCALE_MOVIEBROWSER_INFO_PRODYEAR, (int&)movie_info->productionDate, 4, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE); - CMenuWidget movieInfoMenu(LOCALE_MOVIEBROWSER_HEAD, NEUTRINO_ICON_MOVIEPLAYER_32 /*,m_cBoxFrame.iWidth*/); //TODO: check + CMenuWidget movieInfoMenu(LOCALE_MOVIEBROWSER_HEAD, NEUTRINO_ICON_MOVIEPLAYER /*,m_cBoxFrame.iWidth*/); //TODO: check movieInfoMenu.addIntroItems(LOCALE_MOVIEBROWSER_INFO_HEAD); movieInfoMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_SAVE, true, NULL, this, "save_movie_info", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED)); @@ -2916,7 +2916,7 @@ bool CMovieBrowser::showMenu(MI_MOVIE_INFO* /*movie_info*/) /********************************************************************/ /** parental lock **************************************************/ - CMenuWidget parentalMenu(LOCALE_MOVIEBROWSER_HEAD, NEUTRINO_ICON_MOVIEPLAYER_32); + CMenuWidget parentalMenu(LOCALE_MOVIEBROWSER_HEAD, NEUTRINO_ICON_MOVIEPLAYER); parentalMenu.addIntroItems(LOCALE_MOVIEBROWSER_MENU_PARENTAL_LOCK_HEAD); parentalMenu.addItem( new CMenuOptionChooser(LOCALE_MOVIEBROWSER_MENU_PARENTAL_LOCK_ACTIVATED, (int*)(&m_parentalLock), MESSAGEBOX_PARENTAL_LOCK_OPTIONS, MESSAGEBOX_PARENTAL_LOCK_OPTIONS_COUNT, true )); parentalMenu.addItem( new CMenuOptionChooser(LOCALE_MOVIEBROWSER_MENU_PARENTAL_LOCK_RATE_HEAD, (int*)(&m_settings.parentalLockAge), MESSAGEBOX_PARENTAL_LOCKAGE_OPTIONS, MESSAGEBOX_PARENTAL_LOCKAGE_OPTION_COUNT, true )); @@ -2924,7 +2924,7 @@ bool CMovieBrowser::showMenu(MI_MOVIE_INFO* /*movie_info*/) /********************************************************************/ /** optionsVerzeichnisse **************************************************/ - CMenuWidget optionsMenuDir(LOCALE_MOVIEBROWSER_HEAD, NEUTRINO_ICON_MOVIEPLAYER_32); + CMenuWidget optionsMenuDir(LOCALE_MOVIEBROWSER_HEAD, NEUTRINO_ICON_MOVIEPLAYER); optionsMenuDir.addIntroItems(LOCALE_MOVIEBROWSER_MENU_DIRECTORIES_HEAD); optionsMenuDir.addItem( new CMenuOptionChooser(LOCALE_MOVIEBROWSER_USE_REC_DIR, (int*)(&m_settings.storageDirRecUsed), MESSAGEBOX_YES_NO_OPTIONS, MESSAGEBOX_YES_NO_OPTIONS_COUNT, true )); optionsMenuDir.addItem( new CMenuForwarder( LOCALE_MOVIEBROWSER_DIR , false ,g_settings.network_nfs_recordingdir)); @@ -2959,7 +2959,7 @@ bool CMovieBrowser::showMenu(MI_MOVIE_INFO* /*movie_info*/) for(i=0; i