diff --git a/src/driver/framebuffer.cpp b/src/driver/framebuffer.cpp index 7ef8fae20..0995a9fa7 100644 --- a/src/driver/framebuffer.cpp +++ b/src/driver/framebuffer.cpp @@ -910,7 +910,6 @@ bool CFrameBuffer::paintIcon(const std::string & filename, const int x, const in int width, height; int lfd; fb_pixel_t * data; - uint8_t transp; struct rawIcon tmpIcon; std::map::iterator it; int dsize; @@ -922,36 +921,33 @@ bool CFrameBuffer::paintIcon(const std::string & filename, const int x, const in //printf("CFrameBuffer::paintIcon: load %s\n", filename.c_str());fflush(stdout); /* we cache and check original name */ - it = icon_cache.find(iconBasePath + filename); + it = icon_cache.find(filename); if(it == icon_cache.end()) { - char * ptr = rindex(filename.c_str(), '.'); - if(ptr) { - *ptr = 0; - std::string newname = iconBasePath + filename.c_str() + ".png"; - *ptr = '.'; - //printf("CFrameBuffer::paintIcon: check for %s\n", newname.c_str());fflush(stdout); + std::string newname = iconBasePath + filename.c_str() + ".png"; + //printf("CFrameBuffer::paintIcon: check for %s\n", newname.c_str());fflush(stdout); - data = g_PicViewer->getIcon(newname, &width, &height); + data = g_PicViewer->getIcon(newname, &width, &height); - if(data) { - dsize = width*height*sizeof(fb_pixel_t); - //printf("CFrameBuffer::paintIcon: %s found, data %x size %d x %d\n", newname.c_str(), data, width, height);fflush(stdout); - if(cache_size+dsize < ICON_CACHE_SIZE) { - cache_size += dsize; - tmpIcon.width = width; - tmpIcon.height = height; - tmpIcon.data = data; - icon_cache.insert(std::pair (iconBasePath + filename, tmpIcon)); - //printf("Cached %s, cache size %d\n", newname.c_str(), cache_size); - } - goto _display; + if(data) { + dsize = width*height*sizeof(fb_pixel_t); + //printf("CFrameBuffer::paintIcon: %s found, data %x size %d x %d\n", newname.c_str(), data, width, height);fflush(stdout); + if(cache_size+dsize < ICON_CACHE_SIZE) { + cache_size += dsize; + tmpIcon.width = width; + tmpIcon.height = height; + tmpIcon.data = data; + icon_cache.insert(std::pair (filename, tmpIcon)); + //printf("Cached %s, cache size %d\n", newname.c_str(), cache_size); } + goto _display; } - lfd = open((iconBasePath + filename).c_str(), O_RDONLY); + newname = iconBasePath + filename.c_str() + ".raw"; + + lfd = open(newname.c_str(), O_RDONLY); if (lfd == -1) { - //printf("paintIcon: error while loading icon: %s%s\n", iconBasePath.c_str(), filename.c_str()); + //printf("paintIcon: error while loading icon: %s\n", newname.c_str()); return false; } read(lfd, &header, sizeof(struct rawHeader)); @@ -988,14 +984,14 @@ bool CFrameBuffer::paintIcon(const std::string & filename, const int x, const in if(cache_size+dsize < ICON_CACHE_SIZE) { cache_size += dsize; - icon_cache.insert(std::pair (iconBasePath + filename, tmpIcon)); - //printf("Cached %s, cache size %d\n", (iconBasePath + filename).c_str(), cache_size); + icon_cache.insert(std::pair (filename, tmpIcon)); + //printf("Cached %s, cache size %d\n", newname.c_str(), cache_size); } } else { data = it->second.data; width = it->second.width; height = it->second.height; - //printf("paintIcon: already cached %s %d x %d\n", (iconBasePath + filename).c_str(), width, height); + //printf("paintIcon: already cached %s %d x %d\n", newname.c_str(), width, height); } _display: if (h != 0) diff --git a/src/gui/alphasetup.cpp b/src/gui/alphasetup.cpp index 1a92e824d..67e2cbd1e 100644 --- a/src/gui/alphasetup.cpp +++ b/src/gui/alphasetup.cpp @@ -57,9 +57,9 @@ #include #include -#define ALPHA_SETUP_ICON_DESELECTED "volumeslider2.raw" -#define ALPHA_SETUP_ICON_ALPHA1_SELECTED "volumeslider2red.raw" -#define ALPHA_SETUP_ICON_ALPHA2_SELECTED "volumeslider2green.raw" +#define ALPHA_SETUP_ICON_DESELECTED NEUTRINO_ICON_VOLUMESLIDER2 +#define ALPHA_SETUP_ICON_ALPHA1_SELECTED NEUTRINO_ICON_VOLUMESLIDER2RED +#define ALPHA_SETUP_ICON_ALPHA2_SELECTED NEUTRINO_ICON_VOLUMESLIDER2GREEN CAlphaSetup::CAlphaSetup(const neutrino_locale_t Name, unsigned char* Alpha1, unsigned char* Alpha2, CChangeObserver* Observer) @@ -265,7 +265,7 @@ void CAlphaSetup::paintSlider(const int px, const int py, const unsigned char * frameBuffer->paintBoxRel(x+70,y,120,mheight, COL_MENUCONTENT_PLUS_0); - frameBuffer->paintIcon("volumebody.raw", px + 70 , py + 2 + mheight / 4); + frameBuffer->paintIcon(NEUTRINO_ICON_VOLUMEBODY, px + 70 , py + 2 + mheight / 4); frameBuffer->paintIcon(iconname , px + 73 + sspos, py + mheight / 4); g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(px,py+mheight, width, g_Locale->getText(text), COL_MENUCONTENT, 0, true); // UTF-8 diff --git a/src/gui/audio_select.cpp b/src/gui/audio_select.cpp index 7826776ed..1103d64cf 100644 --- a/src/gui/audio_select.cpp +++ b/src/gui/audio_select.cpp @@ -77,7 +77,7 @@ int CAudioSelectMenuHandler::exec(CMenuTarget* parent, const std::string &/*acti int CAudioSelectMenuHandler::doMenu () { - CMenuWidget AudioSelector(LOCALE_APIDSELECTOR_HEAD, "audio.raw", 360); + CMenuWidget AudioSelector(LOCALE_APIDSELECTOR_HEAD, NEUTRINO_ICON_AUDIO, 360); unsigned int count; CSubtitleChangeExec SubtitleChanger; diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp index dc32349b1..3b0c5ef25 100644 --- a/src/gui/audioplayer.cpp +++ b/src/gui/audioplayer.cpp @@ -699,7 +699,7 @@ int CAudioPlayerGui::show() if (m_inetmode) { static int old_select = 0; char cnt[5]; - CMenuWidget InputSelector(LOCALE_AUDIOPLAYER_LOAD_RADIO_STATIONS, "audio.raw", 400); + CMenuWidget InputSelector(LOCALE_AUDIOPLAYER_LOAD_RADIO_STATIONS, NEUTRINO_ICON_AUDIO, 400); int count = 0; int select = -1; CMenuSelectorTarget *InetRadioInputChanger = new CMenuSelectorTarget(&select); @@ -1620,7 +1620,7 @@ void CAudioPlayerGui::paintHead() else strCaption = g_Locale->getText(LOCALE_AUDIOPLAYER_HEAD); m_frameBuffer->paintBoxRel(m_x, m_y + m_title_height, m_width, m_theight, COL_MENUHEAD_PLUS_0, c_rad_mid, CORNER_TOP); - m_frameBuffer->paintIcon("mp3.raw",m_x + 7, m_y + m_title_height + 10); + m_frameBuffer->paintIcon(NEUTRINO_ICON_MP3,m_x + 7, m_y + m_title_height + 10); g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(m_x + 35, m_y + m_theight + m_title_height + 0, m_width - 45, strCaption, COL_MENUHEAD, 0, true); // UTF-8 int ypos = m_y + m_title_height; @@ -2323,7 +2323,7 @@ void CAudioPlayerGui::screensaver(bool on) m_screensaver = false; #if 0 m_frameBuffer->loadPal("radiomode.pal", 18, COL_MAXFREE); - m_frameBuffer->useBackground(m_frameBuffer->loadBackground("radiomode.raw"));// set useBackground true or false + m_frameBuffer->useBackground(m_frameBuffer->loadBackground(NEUTRINO_ICON_RADIOMODE));// set useBackground true or false m_frameBuffer->paintBackground(); #endif paint(); diff --git a/src/gui/bedit/bouqueteditor_bouquets.cpp b/src/gui/bedit/bouqueteditor_bouquets.cpp index 0d589cd91..a5a8f43c1 100644 --- a/src/gui/bedit/bouqueteditor_bouquets.cpp +++ b/src/gui/bedit/bouqueteditor_bouquets.cpp @@ -95,10 +95,10 @@ void CBEBouquetWidget::paintItem(int pos) frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_YELLOW, x + 8, ypos+4); if ((*Bouquets)[current]->bLocked) - frameBuffer->paintIcon("lock.raw", x + 7, ypos); + frameBuffer->paintIcon(NEUTRINO_ICON_LOCK, x + 7, ypos); if ((*Bouquets)[current]->bHidden) - frameBuffer->paintIcon("hidden.raw", x + 37, ypos); + frameBuffer->paintIcon(NEUTRINO_ICON_HIDDEN, x + 37, ypos); //g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+68, ypos+ fheight, width-68, (*Bouquets)[current]->Name, color, 0, true); g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+68, ypos+ fheight, width-68, (*Bouquets)[current]->bFav ? g_Locale->getText(LOCALE_FAVORITES_BOUQUETNAME) : (*Bouquets)[current]->Name, color, 0, true); diff --git a/src/gui/bookmarkmanager.cpp b/src/gui/bookmarkmanager.cpp index 5c9188597..9ef958571 100644 --- a/src/gui/bookmarkmanager.cpp +++ b/src/gui/bookmarkmanager.cpp @@ -423,7 +423,7 @@ void CBookmarkManager::hide() void CBookmarkManager::paintHead() { frameBuffer->paintBoxRel(x,y, width,theight+0, COL_MENUHEAD_PLUS_0); - frameBuffer->paintIcon("bookmarkmanager.raw",x+5,y+4); + frameBuffer->paintIcon(NEUTRINO_ICON_BOOKMARK_MANAGER,x+5,y+4); g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x+35,y+theight+0, width- 45, g_Locale->getText(LOCALE_BOOKMARKMANAGER_NAME), COL_MENUHEAD, 0, true); // UTF-8 frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_HELP, x+ width- 30, y+ 5 ); } diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index e95402702..eea4e5050 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -1494,7 +1494,7 @@ void CChannelList::paintItem(int pos) } if(chan->scrambled) - frameBuffer->paintIcon("ca.raw", x+width- 15 - 28, ypos + (fheight - 16)/2); + frameBuffer->paintIcon(NEUTRINO_ICON_SCRAMBLED, x+width- 15 - 28, ypos + (fheight - 16)/2); int numpos = x+5+numwidth- g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->getRenderWidth(tmp); g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->RenderString(numpos,ypos+fheight, numwidth+5, tmp, color, fheight); diff --git a/src/gui/epg_menu.cpp b/src/gui/epg_menu.cpp index c6137c6ad..6e1f2bac7 100644 --- a/src/gui/epg_menu.cpp +++ b/src/gui/epg_menu.cpp @@ -65,7 +65,7 @@ int CEPGMenuHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*/) int CEPGMenuHandler::doMenu () { - CMenuWidget EPGSelector(LOCALE_EPGMENU_HEAD, "features.raw", 350); + CMenuWidget EPGSelector(LOCALE_EPGMENU_HEAD, NEUTRINO_ICON_FEATURES, 350); // EPGSelector.addItem(GenericMenuSeparator); EPGSelector.addItem(new CMenuForwarder(LOCALE_EPGMENU_EVENTLIST , true, NULL, new CEventListHandler(), NULL, CRCInput::RC_red , NEUTRINO_ICON_BUTTON_RED ), false); diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp index 75cb35d35..071cf35cf 100644 --- a/src/gui/epgplus.cpp +++ b/src/gui/epgplus.cpp @@ -868,7 +868,7 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu break; } } else if (msg == (neutrino_msg_t) CRCInput::RC_red) { - CMenuWidget menuWidgetActions (LOCALE_EPGPLUS_ACTIONS, "features.raw", 400); + CMenuWidget menuWidgetActions (LOCALE_EPGPLUS_ACTIONS, NEUTRINO_ICON_FEATURES, 400); if (!g_settings.minimode) menuWidgetActions.addItem (new CMenuForwarder (LOCALE_EPGPLUS_RECORD, true, NULL, new MenuTargetAddRecordTimer (this), NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED), false); menuWidgetActions.addItem (new CMenuForwarder (LOCALE_EPGPLUS_REFRESH_EPG, true, NULL, new MenuTargetRefreshEpg (this), NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN), false); @@ -879,7 +879,7 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu this->refreshAll = true; } else if (msg == (neutrino_msg_t) CRCInput::RC_blue) { - CMenuWidget menuWidgetOptions (LOCALE_EPGPLUS_OPTIONS, "features.raw", 500); + CMenuWidget menuWidgetOptions (LOCALE_EPGPLUS_OPTIONS, NEUTRINO_ICON_FEATURES, 500); menuWidgetOptions.addItem (new MenuOptionChooserSwitchSwapMode (this)); menuWidgetOptions.addItem (new MenuOptionChooserSwitchViewMode (this)); @@ -1207,7 +1207,7 @@ int EpgPlus::MenuTargetAddReminder::exec (CMenuTarget * /*parent*/, const std::s g_Timerd->addZaptoTimerEvent (this->epgPlus->selectedChannelEntry->channel->channel_id, (*It)->channelEvent.startTime, (*It)->channelEvent.startTime - ANNOUNCETIME, 0, (*It)->channelEvent.eventID, (*It)->channelEvent.startTime, 0); ShowMsgUTF (LOCALE_TIMER_EVENTTIMED_TITLE, g_Locale->getText (LOCALE_TIMER_EVENTTIMED_MSG) - , CMessageBox::mbrBack, CMessageBox::mbBack, "info.raw"); // UTF-8 + , CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); // UTF-8 } else printf ("timerd not available\n"); } @@ -1230,7 +1230,7 @@ int EpgPlus::MenuTargetAddRecordTimer::exec (CMenuTarget * /*parent*/, const std g_Timerd->addRecordTimerEvent (this->epgPlus->selectedChannelEntry->channel->channel_id, (*It)->channelEvent.startTime, (*It)->channelEvent.startTime + (*It)->channelEvent.duration, (*It)->channelEvent.eventID, (*It)->channelEvent.startTime, (*It)->channelEvent.startTime - (ANNOUNCETIME + 120) , TIMERD_APIDS_CONF, true); ShowMsgUTF (LOCALE_TIMER_EVENTRECORD_TITLE, g_Locale->getText (LOCALE_TIMER_EVENTRECORD_MSG) - , CMessageBox::mbrBack, CMessageBox::mbBack, "info.raw"); // UTF-8 + , CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); // UTF-8 } else printf ("timerd not available\n"); } diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index 9f8554a3b..50ca0180f 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -614,11 +614,11 @@ int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_ { if ( tags[i].streamContent == 1 && (tags[i].componentType == 2 || tags[i].componentType == 3) ) { - frameBuffer->paintIcon("16_9.raw" ,ox+sx-(ICON_LARGE_WIDTH+2)-(ICON_LARGE_WIDTH+2),sy + oy+5 ); + frameBuffer->paintIcon(NEUTRINO_ICON_16_9 ,ox+sx-(ICON_LARGE_WIDTH+2)-(ICON_LARGE_WIDTH+2),sy + oy+5 ); } else if ( tags[i].streamContent == 2 && tags[i].componentType == 5 ) { - frameBuffer->paintIcon("dd.raw", ox+sx-(ICON_LARGE_WIDTH+2), sy + oy+5); + frameBuffer->paintIcon(NEUTRINO_ICON_DD, ox+sx-(ICON_LARGE_WIDTH+2), sy + oy+5); } } } @@ -777,10 +777,10 @@ int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_ epgData.eventID, epgData.epg_times.startzeit, epgData.epg_times.startzeit - (ANNOUNCETIME + 120 ), TIMERD_APIDS_CONF, true, recDir,true); - ShowLocalizedMessage(LOCALE_TIMER_EVENTRECORD_TITLE, LOCALE_TIMER_EVENTRECORD_MSG, CMessageBox::mbrBack, CMessageBox::mbBack, "info.raw"); + ShowLocalizedMessage(LOCALE_TIMER_EVENTRECORD_TITLE, LOCALE_TIMER_EVENTRECORD_MSG, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); } } else { - ShowLocalizedMessage(LOCALE_TIMER_EVENTRECORD_TITLE, LOCALE_TIMER_EVENTRECORD_MSG, CMessageBox::mbrBack, CMessageBox::mbBack, "info.raw"); + ShowLocalizedMessage(LOCALE_TIMER_EVENTRECORD_TITLE, LOCALE_TIMER_EVENTRECORD_MSG, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); } } } @@ -799,7 +799,7 @@ int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_ epgData.epg_times.startzeit, epgData.epg_times.startzeit - ANNOUNCETIME, 0, epgData.eventID, epgData.epg_times.startzeit, 0); - ShowLocalizedMessage(LOCALE_TIMER_EVENTTIMED_TITLE, LOCALE_TIMER_EVENTTIMED_MSG, CMessageBox::mbrBack, CMessageBox::mbBack, "info.raw"); + ShowLocalizedMessage(LOCALE_TIMER_EVENTTIMED_TITLE, LOCALE_TIMER_EVENTTIMED_MSG, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); } else printf("timerd not available\n"); diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index c24b9887b..b26e7d12f 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -437,10 +437,10 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam evtlist[selected].eventID, evtlist[selected].startTime, evtlist[selected].startTime - (ANNOUNCETIME + 120), TIMERD_APIDS_CONF, true, recDir,true); - ShowLocalizedMessage(LOCALE_TIMER_EVENTRECORD_TITLE, LOCALE_TIMER_EVENTRECORD_MSG, CMessageBox::mbrBack, CMessageBox::mbBack, "info.raw"); + ShowLocalizedMessage(LOCALE_TIMER_EVENTRECORD_TITLE, LOCALE_TIMER_EVENTRECORD_MSG, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); } } else { - ShowLocalizedMessage(LOCALE_TIMER_EVENTRECORD_TITLE, LOCALE_TIMER_EVENTRECORD_MSG, CMessageBox::mbrBack, CMessageBox::mbBack, "info.raw"); + ShowLocalizedMessage(LOCALE_TIMER_EVENTRECORD_TITLE, LOCALE_TIMER_EVENTRECORD_MSG, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); } } timerlist.clear(); @@ -464,7 +464,7 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam evtlist[selected].startTime, evtlist[selected].startTime - ANNOUNCETIME, 0, evtlist[selected].eventID, evtlist[selected].startTime, 0); - ShowLocalizedMessage(LOCALE_TIMER_EVENTTIMED_TITLE, LOCALE_TIMER_EVENTTIMED_MSG, CMessageBox::mbrBack, CMessageBox::mbBack, "info.raw"); + ShowLocalizedMessage(LOCALE_TIMER_EVENTTIMED_TITLE, LOCALE_TIMER_EVENTTIMED_MSG, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); timerlist.clear(); g_Timerd->getTimerList (timerlist); paint(channel_id); @@ -1060,7 +1060,7 @@ int CEventFinderMenu::showMenu(void) CMenuOptionChooser* mo1 = new CMenuOptionChooser(LOCALE_EVENTFINDER_SEARCH_WITHIN_EPG, m_search_epg_item, SEARCH_EPG_OPTIONS, SEARCH_EPG_OPTION_COUNT, true, NULL, CRCInput::RC_4); CMenuForwarder* mf0 = new CMenuForwarder(LOCALE_EVENTFINDER_START_SEARCH, true, NULL, this, "1", CRCInput::RC_5 ); - CMenuWidget searchMenu(LOCALE_EVENTFINDER_HEAD, "features.raw", 450); + CMenuWidget searchMenu(LOCALE_EVENTFINDER_HEAD, NEUTRINO_ICON_FEATURES, 450); searchMenu.addItem(GenericMenuSeparator); searchMenu.addItem(mf2, false); diff --git a/src/gui/favorites.cpp b/src/gui/favorites.cpp index 496b1fdf2..00b702940 100644 --- a/src/gui/favorites.cpp +++ b/src/gui/favorites.cpp @@ -123,7 +123,7 @@ int CFavorites::exec(CMenuTarget* parent, const std::string & actionKey) parent->hide(); if (!bouquetList) { - ShowLocalizedMessage(LOCALE_FAVORITES_BOUQUETNAME, LOCALE_FAVORITES_NOBOUQUETS, CMessageBox::mbrBack, CMessageBox::mbBack, "info.raw"); + ShowLocalizedMessage(LOCALE_FAVORITES_BOUQUETNAME, LOCALE_FAVORITES_NOBOUQUETS, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); return res; } @@ -148,7 +148,7 @@ int CFavorites::exec(CMenuTarget* parent, const std::string & actionKey) { if (status & 2) str += g_Locale->getText(LOCALE_EXTRA_CHADDED); else str += g_Locale->getText(LOCALE_EXTRA_CHALREADYINBQ); - ShowMsgUTF(LOCALE_EXTRA_ADD_TO_BOUQUET, str, CMessageBox::mbrBack, CMessageBox::mbBack, "info.raw"); // UTF-8 + ShowMsgUTF(LOCALE_EXTRA_ADD_TO_BOUQUET, str, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); // UTF-8 } else { @@ -156,7 +156,7 @@ int CFavorites::exec(CMenuTarget* parent, const std::string & actionKey) if (status & 2) str += g_Locale->getText(LOCALE_FAVORITES_CHADDED); else str += g_Locale->getText(LOCALE_FAVORITES_CHALREADYINBQ); if (status) str += g_Locale->getText(LOCALE_FAVORITES_FINALHINT); - ShowMsgUTF(LOCALE_FAVORITES_BOUQUETNAME, str, CMessageBox::mbrBack, CMessageBox::mbBack, "info.raw"); // UTF-8 + ShowMsgUTF(LOCALE_FAVORITES_BOUQUETNAME, str, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); // UTF-8 } diff --git a/src/gui/filebrowser.cpp b/src/gui/filebrowser.cpp index bc2551ff3..2eed189de 100644 --- a/src/gui/filebrowser.cpp +++ b/src/gui/filebrowser.cpp @@ -1277,18 +1277,18 @@ void CFileBrowser::paintItem(unsigned int pos) #ifdef ENABLE_FLAC case CFile::FILE_FLAC: #endif - fileicon = "mp3.raw"; + fileicon = NEUTRINO_ICON_MP3; // color = COL_MENUCONTENT; break; case CFile::FILE_DIR: - fileicon = "folder.raw"; + fileicon = NEUTRINO_ICON_FOLDER; break; case CFile::FILE_PICTURE: case CFile::FILE_TEXT: default: - fileicon = "file.raw"; + fileicon = NEUTRINO_ICON_FILE; } frameBuffer->paintIcon(fileicon, x+5 , ypos + (fheight-16) / 2 ); diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 3d44d7937..e186dfc3c 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -302,7 +302,7 @@ void CInfoViewer::showRecordIcon (const bool show) if (recordModeActive) { int ChanName_X = BoxStartX + ChanWidth + 20; if (show) { - frameBuffer->paintIcon (autoshift ? "ats.raw" : NEUTRINO_ICON_BUTTON_RED, ChanName_X, BoxStartY + 12); + frameBuffer->paintIcon (autoshift ? NEUTRINO_ICON_AUTO_SHIFT : NEUTRINO_ICON_BUTTON_RED, ChanName_X, BoxStartY + 12); if (!autoshift && !shift_timer) { int chanH = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight (); frameBuffer->paintBoxRel (ChanName_X + 28 + SHADOW_OFFSET, BoxStartY + 12 + SHADOW_OFFSET, 300, 20, COL_INFOBAR_SHADOW_PLUS_0); @@ -880,7 +880,7 @@ void CInfoViewer::showIcon_16_9 () { if ((aspectRatio == 0) || (aspectRatio != videoDecoder->getAspectRatio())) { aspectRatio = videoDecoder->getAspectRatio(); - frameBuffer->paintIcon((aspectRatio > 2) ? "16_9.raw" : "16_9_gray.raw", + frameBuffer->paintIcon((aspectRatio > 2) ? NEUTRINO_ICON_16_9 : NEUTRINO_ICON_16_9_GREY, BoxEndX - (2*ICON_LARGE_WIDTH + 2*ICON_SMALL_WIDTH + 4*2), BBarY, InfoHeightY_Info); } @@ -888,7 +888,7 @@ void CInfoViewer::showIcon_16_9 () void CInfoViewer::showIcon_VTXT () const { - frameBuffer->paintIcon((g_RemoteControl->current_PIDs.PIDs.vtxtpid != 0) ? "vtxt.raw" : "vtxt_gray.raw", + frameBuffer->paintIcon((g_RemoteControl->current_PIDs.PIDs.vtxtpid != 0) ? NEUTRINO_ICON_VTXT : NEUTRINO_ICON_VTXT_GREY, BoxEndX - (2*ICON_SMALL_WIDTH + 2*2), BBarY, InfoHeightY_Info); } @@ -899,7 +899,7 @@ void CInfoViewer::showIcon_SubT() const if (cc && cc->getSubtitleCount()) have_sub = true; - frameBuffer->paintIcon(have_sub ? "subt.raw" : "subt_gray.raw", BoxEndX - (ICON_SMALL_WIDTH + 2), + frameBuffer->paintIcon(have_sub ? NEUTRINO_ICON_SUBT : NEUTRINO_ICON_SUBT_GREY, BoxEndX - (ICON_SMALL_WIDTH + 2), BBarY, InfoHeightY_Info); } @@ -1518,11 +1518,11 @@ void CInfoViewer::showButton_Audio () } const char *dd_icon; if ((g_RemoteControl->current_PIDs.PIDs.selected_apid < count) && (g_RemoteControl->current_PIDs.APIDs[g_RemoteControl->current_PIDs.PIDs.selected_apid].is_ac3)) - dd_icon = "dd.raw"; + dd_icon = NEUTRINO_ICON_DD; else if (g_RemoteControl->has_ac3) - dd_icon = "dd_avail.raw"; + dd_icon = NEUTRINO_ICON_DD_AVAIL; else - dd_icon = "dd_gray.raw"; + dd_icon = NEUTRINO_ICON_DD_GREY; frameBuffer->paintIcon(dd_icon, BoxEndX - (ICON_LARGE_WIDTH + 2*ICON_SMALL_WIDTH + 3*2), BBarY, InfoHeightY_Info); @@ -1784,46 +1784,46 @@ void CInfoViewer::paint_ca_icons(int caid, char * icon) switch ( caid & 0xFF00 ) { case 0x0E00: px = endx - 48 - 38 - 9*10 - 7*14 - 10; - sprintf(buf, "%s_%s.raw", "powervu", icon); + sprintf(buf, "%s_%s", "powervu", icon); break; case 0x4A00: px = endx - 48 - 38 - 8*10 - 6*14 - 10; - sprintf(buf, "%s_%s.raw", "d", icon); + sprintf(buf, "%s_%s", "d", icon); break; case 0x2600: px = endx - 48 - 38 - 7*10 - 5*14 - 10; - sprintf(buf, "%s_%s.raw", "biss", icon); + sprintf(buf, "%s_%s", "biss", icon); break; case 0x600: case 0x602: case 0x1700: px = endx - 48 - 38 - 6*10 - 4*14 - 10; - sprintf(buf, "%s_%s.raw", "ird", icon); + sprintf(buf, "%s_%s", "ird", icon); break; case 0x100: px = endx - 48 - 38 - 5*10 - 4*14; - sprintf(buf, "%s_%s.raw", "seca", icon); + sprintf(buf, "%s_%s", "seca", icon); break; case 0x500: px = endx - 48 - 38 - 4*10 - 3*14; - sprintf(buf, "%s_%s.raw", "via", icon); + sprintf(buf, "%s_%s", "via", icon); break; case 0x1800: case 0x1801: px = endx - 48 - 38 - 3*10 - 2*14; - sprintf(buf, "%s_%s.raw", "nagra", icon); + sprintf(buf, "%s_%s", "nagra", icon); break; case 0xB00: px = endx - 48 - 38 - 2*10 - 1*14; - sprintf(buf, "%s_%s.raw", "conax", icon); + sprintf(buf, "%s_%s", "conax", icon); break; case 0xD00: px = endx - 48 - 38 - 1*10; - sprintf(buf, "%s_%s.raw", "cw", icon); + sprintf(buf, "%s_%s", "cw", icon); break; case 0x900: px = endx - 48; - sprintf(buf, "%s_%s.raw", "nds", icon); + sprintf(buf, "%s_%s", "nds", icon); break; default: break; diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp index 33d92e5ad..4b411ec87 100644 --- a/src/gui/moviebrowser.cpp +++ b/src/gui/moviebrowser.cpp @@ -1677,7 +1677,7 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg) off64_t res = copy_movie(m_movieSelectionHandler, &m_movieInfo, msg == CRCInput::RC_radio); //g_RCInput->clearRCMsg(); if(res == 0) - ShowMsgUTF(LOCALE_MESSAGEBOX_ERROR, "Copy failed, is there jump bookmarks ? Or check free space.", CMessageBox::mbrCancel, CMessageBox::mbCancel, "error.raw"); + ShowMsgUTF(LOCALE_MESSAGEBOX_ERROR, "Copy failed, is there jump bookmarks ? Or check free space.", CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR); else loadMovies(); refresh(); @@ -1686,7 +1686,7 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg) else if (msg == CRCInput::RC_audio) { #if 0 if((m_movieSelectionHandler == playing_info) && (NeutrinoMessages::mode_ts == CNeutrinoApp::getInstance()->getMode())) - ShowMsgUTF(LOCALE_MESSAGEBOX_ERROR, "Impossible to cut playing movie.", CMessageBox::mbrCancel, CMessageBox::mbCancel, "error.raw"); + ShowMsgUTF(LOCALE_MESSAGEBOX_ERROR, "Impossible to cut playing movie.", CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR); else #endif if(ShowMsgUTF (LOCALE_MESSAGEBOX_INFO, "Cut jumps from movie ?", CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo) == CMessageBox::mbrYes) { @@ -1699,7 +1699,7 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg) off64_t res = cut_movie(m_movieSelectionHandler, &m_movieInfo); //g_RCInput->clearRCMsg(); if(res == 0) - ShowMsgUTF(LOCALE_MESSAGEBOX_ERROR, "Cut failed, is there jump bookmarks ? Or check free space.", CMessageBox::mbrCancel, CMessageBox::mbCancel, "error.raw"); + ShowMsgUTF(LOCALE_MESSAGEBOX_ERROR, "Cut failed, is there jump bookmarks ? Or check free space.", CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR); else { loadMovies(); } @@ -1708,9 +1708,9 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg) } else if (msg == CRCInput::RC_games) { if((m_movieSelectionHandler == playing_info) && (NeutrinoMessages::mode_ts == CNeutrinoApp::getInstance()->getMode())) - ShowMsgUTF(LOCALE_MESSAGEBOX_ERROR, "Impossible to truncate playing movie.", CMessageBox::mbrCancel, CMessageBox::mbCancel, "error.raw"); + ShowMsgUTF(LOCALE_MESSAGEBOX_ERROR, "Impossible to truncate playing movie.", CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR); else if(m_movieSelectionHandler->bookmarks.end == 0) - ShowMsgUTF(LOCALE_MESSAGEBOX_ERROR, "No End bookmark defined!", CMessageBox::mbrCancel, CMessageBox::mbCancel, "error.raw"); + ShowMsgUTF(LOCALE_MESSAGEBOX_ERROR, "No End bookmark defined!", CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR); else { if(ShowMsgUTF (LOCALE_MESSAGEBOX_INFO, "Truncate movie ?", CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo) == CMessageBox::mbrYes) { CHintBox * hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, "Truncating, please wait"); @@ -1720,7 +1720,7 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg) delete hintBox; g_RCInput->clearRCMsg(); if(res == 0) - ShowMsgUTF(LOCALE_MESSAGEBOX_ERROR, "Truncate failed.", CMessageBox::mbrCancel, CMessageBox::mbCancel, "error.raw"); + ShowMsgUTF(LOCALE_MESSAGEBOX_ERROR, "Truncate failed.", CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR); else { //printf("New movie info: size %lld len %d\n", res, m_movieSelectionHandler->bookmarks.end/60); m_movieInfo.saveMovieInfo( *m_movieSelectionHandler); @@ -2731,7 +2731,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_BOOK_HEAD , "streaming.raw"); + CMenuWidget bookmarkMenu (LOCALE_MOVIEBROWSER_BOOK_HEAD , NEUTRINO_ICON_STREAMING); bookmarkMenu.addItem(GenericMenuSeparator); bookmarkMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_CLEAR_ALL, true, NULL, this, "book_clear_all",CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE)); @@ -2747,7 +2747,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, "streaming.raw"); + pBookItemMenu[li] = new CMenuWidget(LOCALE_MOVIEBROWSER_BOOK_HEAD, NEUTRINO_ICON_STREAMING); 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])); @@ -2760,7 +2760,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_SERIE_HEAD, "streaming.raw"); + CMenuWidget serieMenu (LOCALE_MOVIEBROWSER_SERIE_HEAD, NEUTRINO_ICON_STREAMING); serieMenu.addItem(GenericMenuSeparator); serieMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_SERIE_NAME, true, movie_info->serieName,&serieUserInput)); serieMenu.addItem(GenericMenuSeparatorLine); @@ -2773,7 +2773,7 @@ void CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info) movieInfoUpdateAll[i]=0; movieInfoUpdateAllIfDestEmptyOnly=true; - CMenuWidget movieInfoMenuUpdate (LOCALE_MOVIEBROWSER_INFO_HEAD_UPDATE, "streaming.raw",450); + CMenuWidget movieInfoMenuUpdate (LOCALE_MOVIEBROWSER_INFO_HEAD_UPDATE, NEUTRINO_ICON_STREAMING,450); movieInfoMenuUpdate.addItem(GenericMenuSeparator); 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); @@ -2811,7 +2811,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_INFO_HEAD, "streaming.raw",m_cBoxFrame.iWidth); + CMenuWidget movieInfoMenu (LOCALE_MOVIEBROWSER_INFO_HEAD, NEUTRINO_ICON_STREAMING,m_cBoxFrame.iWidth); movieInfoMenu.addItem(GenericMenuSeparator); movieInfoMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_SAVE, true, NULL, this, "save_movie_info", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED)); @@ -2861,7 +2861,7 @@ bool CMovieBrowser::showMenu(MI_MOVIE_INFO* /*movie_info*/) /********************************************************************/ /** parental lock **************************************************/ - CMenuWidget parentalMenu (LOCALE_MOVIEBROWSER_MENU_PARENTAL_LOCK_HEAD , "streaming.raw",450); + CMenuWidget parentalMenu (LOCALE_MOVIEBROWSER_MENU_PARENTAL_LOCK_HEAD , NEUTRINO_ICON_STREAMING,450); parentalMenu.addItem(GenericMenuSeparator); 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 )); @@ -2869,7 +2869,7 @@ bool CMovieBrowser::showMenu(MI_MOVIE_INFO* /*movie_info*/) /********************************************************************/ /** optionsVerzeichnisse **************************************************/ - CMenuWidget optionsMenuDir (LOCALE_MOVIEBROWSER_MENU_DIRECTORIES_HEAD , "streaming.raw",450); + CMenuWidget optionsMenuDir (LOCALE_MOVIEBROWSER_MENU_DIRECTORIES_HEAD , NEUTRINO_ICON_STREAMING,450); optionsMenuDir.addItem(GenericMenuSeparator); 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)); @@ -2904,7 +2904,7 @@ bool CMovieBrowser::showMenu(MI_MOVIE_INFO* /*movie_info*/) for(i=0; igetText(LOCALE_PICTUREVIEWER_HEAD); frameBuffer->paintBoxRel(x, y, width, theight, COL_MENUHEAD_PLUS_0, ROUND_RADIUS, CORNER_TOP); - frameBuffer->paintIcon("mp3.raw",x+7,y+10); + frameBuffer->paintIcon(NEUTRINO_ICON_MP3,x+7,y+10); g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x+35,y+theight+0, width- 45, strCaption, COL_MENUHEAD, 0, true); // UTF-8 int ypos=y+0; if (theight > 26) diff --git a/src/gui/scan.cpp b/src/gui/scan.cpp index 519154ec6..2a0df0c75 100644 --- a/src/gui/scan.cpp +++ b/src/gui/scan.cpp @@ -254,7 +254,7 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey) g_RCInput->open_click(); } if(!test) { - //ShowLocalizedMessage(LOCALE_MESSAGEBOX_INFO, success ? LOCALE_SCANTS_FINISHED : LOCALE_SCANTS_FAILED, CMessageBox::mbrBack, CMessageBox::mbBack, "info.raw"); + //ShowLocalizedMessage(LOCALE_MESSAGEBOX_INFO, success ? LOCALE_SCANTS_FINISHED : LOCALE_SCANTS_FAILED, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); const char * text = g_Locale->getText(success ? LOCALE_SCANTS_FINISHED : LOCALE_SCANTS_FAILED); //paintLine(xpos2, ypos_frequency, xpos_frequency, text); diff --git a/src/gui/screensetup.cpp b/src/gui/screensetup.cpp index 497ca0e81..e8f0f2bc6 100644 --- a/src/gui/screensetup.cpp +++ b/src/gui/screensetup.cpp @@ -37,6 +37,7 @@ #include #include +#include "gui/widget/icons.h" #include #include @@ -212,18 +213,18 @@ void CScreenSetup::paintBorder( int pselected ) void CScreenSetup::paintIcons() { - frameBuffer->paintIcon("rot.raw", x+6, y+8); - frameBuffer->paintIcon("gruen.raw", x+6, y+36 ); + frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_RED, x+6, y+8); + frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_GREEN, x+6, y+36 ); } void CScreenSetup::paintBorderUL() { - frameBuffer->paintIcon( "border_ul.raw", x_coord[0], y_coord[0] ); + frameBuffer->paintIcon(NEUTRINO_ICON_BORDER_UL, x_coord[0], y_coord[0] ); } void CScreenSetup::paintBorderLR() { - frameBuffer->paintIcon("border_lr.raw", x_coord[1]- 96, y_coord[1]- 96 ); + frameBuffer->paintIcon(NEUTRINO_ICON_BORDER_LR, x_coord[1]- 96, y_coord[1]- 96 ); } void CScreenSetup::paintCoords() diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index 0f610a464..c5d4711f8 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -744,7 +744,7 @@ void CTimerList::paintItem(int pos) void CTimerList::paintHead() { frameBuffer->paintBoxRel(x, y, width, theight, COL_MENUHEAD_PLUS_0, ROUND_RADIUS, CORNER_TOP); - frameBuffer->paintIcon("timer.raw",x+5,y+4); + frameBuffer->paintIcon(NEUTRINO_ICON_TIMER,x+5,y+4); g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x+35,y+theight+0, width- 45, g_Locale->getText(LOCALE_TIMERLIST_NAME), COL_MENUHEAD, 0, true); // UTF-8 frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_HELP, x+ width- 30, y+ 5 ); diff --git a/src/gui/update.cpp b/src/gui/update.cpp index 020d1175a..66267f423 100644 --- a/src/gui/update.cpp +++ b/src/gui/update.cpp @@ -137,7 +137,7 @@ bool CFlashUpdate::selectHttpImage(void) httpTool.setStatusViewer(this); showStatusMessageUTF(g_Locale->getText(LOCALE_FLASHUPDATE_GETINFOFILE)); // UTF-8 - CMenuWidget SelectionWidget(LOCALE_FLASHUPDATE_SELECTIMAGE, "softupdate.raw", 600); + CMenuWidget SelectionWidget(LOCALE_FLASHUPDATE_SELECTIMAGE, NEUTRINO_ICON_UPDATE, 600); SelectionWidget.addItem(GenericMenuSeparator); SelectionWidget.addItem(GenericMenuBack); @@ -282,7 +282,7 @@ printf("[update] mode is %d\n", g_settings.softupdate_mode); if(fileType < '3') { if ((strncmp(RELEASE_CYCLE, versionInfo->getReleaseCycle(), 2) != 0) && - (ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_FLASHUPDATE_WRONGBASE), CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, "softupdate.raw") != CMessageBox::mbrYes)) + (ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_FLASHUPDATE_WRONGBASE), CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, NEUTRINO_ICON_UPDATE) != CMessageBox::mbrYes)) { delete versionInfo; //ShowHintUTF(LOCALE_MESSAGEBOX_ERROR, g_Locale->getText(LOCALE_FLASHUPDATE_WRONGBASE)); // UTF-8 @@ -290,8 +290,8 @@ printf("[update] mode is %d\n", g_settings.softupdate_mode); } if ((strcmp("Release", versionInfo->getType()) != 0) && - //(ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_FLASHUPDATE_EXPERIMENTALIMAGE), CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, "softupdate.raw") != CMessageBox::mbrYes)) // UTF-8 - (ShowLocalizedMessage(LOCALE_MESSAGEBOX_INFO, LOCALE_FLASHUPDATE_EXPERIMENTALIMAGE, CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, "softupdate.raw") != CMessageBox::mbrYes)) + //(ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_FLASHUPDATE_EXPERIMENTALIMAGE), CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, NEUTRINO_ICON_UPDATE) != CMessageBox::mbrYes)) // UTF-8 + (ShowLocalizedMessage(LOCALE_MESSAGEBOX_INFO, LOCALE_FLASHUPDATE_EXPERIMENTALIMAGE, CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, NEUTRINO_ICON_UPDATE) != CMessageBox::mbrYes)) { delete versionInfo; return false; @@ -348,7 +348,7 @@ printf("[update] mode is %d\n", g_settings.softupdate_mode); strcpy(msg, g_Locale->getText(LOCALE_FLASHUPDATE_SQUASHFS_NOVERSION)); msg_body = LOCALE_FLASHUPDATE_MSGBOX_MANUAL; } - return (ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, msg, CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, "softupdate.raw") == CMessageBox::mbrYes); // UTF-8 + return (ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, msg, CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, NEUTRINO_ICON_UPDATE) == CMessageBox::mbrYes); // UTF-8 } int CFlashUpdate::exec(CMenuTarget* parent, const std::string &) @@ -399,7 +399,7 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &) return menu_return::RETURN_REPAINT; } if(g_settings.softupdate_mode==1) { //internet-update - if ( ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, (fileType < '3') ? "Flash downloaded image ?" : "Install downloaded pack ?", CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, "softupdate.raw") != CMessageBox::mbrYes) // UTF-8 + if ( ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, (fileType < '3') ? "Flash downloaded image ?" : "Install downloaded pack ?", CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, NEUTRINO_ICON_UPDATE) != CMessageBox::mbrYes) // UTF-8 { hide(); return menu_return::RETURN_REPAINT; @@ -526,7 +526,7 @@ void CFlashExpert::writemtd(const std::string & filename, int mtdNumber) FILESYSTEM_ENCODING_TO_UTF8_STRING(filename).c_str(), CMTDInfo::getInstance()->getMTDName(mtdNumber).c_str()); - if (ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, message, CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo, "softupdate.raw") != CMessageBox::mbrYes) // UTF-8 + if (ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, message, CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo, NEUTRINO_ICON_UPDATE) != CMessageBox::mbrYes) // UTF-8 return; #ifdef VFD_UPDATE CVFD::getInstance()->showProgressBar2(0,"checking",0,"Update Neutrino"); @@ -555,7 +555,7 @@ void CFlashExpert::writemtd(const std::string & filename, int mtdNumber) void CFlashExpert::showMTDSelector(const std::string & actionkey) { //mtd-selector erzeugen - CMenuWidget* mtdselector = new CMenuWidget(LOCALE_FLASHUPDATE_MTDSELECTOR, "softupdate.raw"); + CMenuWidget* mtdselector = new CMenuWidget(LOCALE_FLASHUPDATE_MTDSELECTOR, NEUTRINO_ICON_UPDATE); mtdselector->addItem(GenericMenuSeparator); mtdselector->addItem(new CMenuForwarder(LOCALE_MESSAGEBOX_CANCEL)); mtdselector->addItem(GenericMenuSeparatorLine); @@ -571,7 +571,7 @@ void CFlashExpert::showMTDSelector(const std::string & actionkey) void CFlashExpert::showFileSelector(const std::string & actionkey) { - CMenuWidget* fileselector = new CMenuWidget(LOCALE_FLASHUPDATE_FILESELECTOR, "softupdate.raw"); + CMenuWidget* fileselector = new CMenuWidget(LOCALE_FLASHUPDATE_FILESELECTOR, NEUTRINO_ICON_UPDATE); fileselector->addItem(GenericMenuSeparator); fileselector->addItem(new CMenuForwarder(LOCALE_MESSAGEBOX_CANCEL)); fileselector->addItem(GenericMenuSeparatorLine); diff --git a/src/gui/upnpbrowser.cpp b/src/gui/upnpbrowser.cpp index 6e82dc669..92cfc1bf3 100644 --- a/src/gui/upnpbrowser.cpp +++ b/src/gui/upnpbrowser.cpp @@ -382,7 +382,7 @@ void CUpnpBrowserGui::selectDevice() catch (std::runtime_error error) { delete scanBox; - ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, error.what(), CMessageBox::mbrBack, CMessageBox::mbBack, "info.raw"); + ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, error.what(), CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); return; } #endif @@ -391,7 +391,7 @@ void CUpnpBrowserGui::selectDevice() if (!m_devices.size()) { - ShowLocalizedMessage(LOCALE_MESSAGEBOX_INFO, LOCALE_UPNPBROWSER_NOSERVERS, CMessageBox::mbrBack, CMessageBox::mbBack, "info.raw"); + ShowLocalizedMessage(LOCALE_MESSAGEBOX_INFO, LOCALE_UPNPBROWSER_NOSERVERS, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); delete scanBox; return; } @@ -450,7 +450,7 @@ void CUpnpBrowserGui::selectDevice() catch (std::runtime_error error) { delete scanBox; - ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, error.what(), CMessageBox::mbrBack, CMessageBox::mbBack, "info.raw"); + ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, error.what(), CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); return; } #endif @@ -458,7 +458,7 @@ void CUpnpBrowserGui::selectDevice() scanBox->hide(); if (!m_devices.size()) { - ShowLocalizedMessage(LOCALE_MESSAGEBOX_INFO, LOCALE_UPNPBROWSER_NOSERVERS, CMessageBox::mbrBack, CMessageBox::mbBack, "info.raw"); + ShowLocalizedMessage(LOCALE_MESSAGEBOX_INFO, LOCALE_UPNPBROWSER_NOSERVERS, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); delete scanBox; return; } @@ -520,7 +520,7 @@ void CUpnpBrowserGui::playnext(void) } catch (std::runtime_error error) { - ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, error.what(), CMessageBox::mbrBack, CMessageBox::mbBack, "info.raw"); + ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, error.what(), CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); m_folderplay = false; return; } @@ -641,7 +641,7 @@ bool CUpnpBrowserGui::selectItem(std::string id) } catch (std::runtime_error error) { - ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, error.what(), CMessageBox::mbrBack, CMessageBox::mbBack, "info.raw"); + ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, error.what(), CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); if (entries) delete entries; return endall; @@ -947,19 +947,19 @@ void CUpnpBrowserGui::paintItemPos(std::vector *entry, unsigned int p if ((*entry)[pos].isdir) { info = ""; - fileicon = "folder.raw"; + fileicon = NEUTRINO_ICON_FOLDER; } else { if (preferred != -1) { info = (*entry)[pos].resources[preferred].duration; - fileicon = "mp3.raw"; + fileicon = NEUTRINO_ICON_MP3; } else { info = "(none)"; - fileicon = "file.raw"; + fileicon = NEUTRINO_ICON_FILE; } } diff --git a/src/gui/widget/colorchooser.cpp b/src/gui/widget/colorchooser.cpp index 9f6b16757..d362b92b5 100644 --- a/src/gui/widget/colorchooser.cpp +++ b/src/gui/widget/colorchooser.cpp @@ -44,6 +44,7 @@ #include #include +#include "gui/widget/icons.h" #define ROUND_RADIUS 8 @@ -53,10 +54,10 @@ #define VALUE_ALPHA 3 static const char * const iconnames[4] = { - "volumeslider2red.raw", - "volumeslider2green.raw", - "volumeslider2blue.raw", - "volumeslider2alpha.raw" + NEUTRINO_ICON_VOLUMESLIDER2RED, + NEUTRINO_ICON_VOLUMESLIDER2GREEN, + NEUTRINO_ICON_VOLUMESLIDER2BLUE, + NEUTRINO_ICON_VOLUMESLIDER2ALPHA }; static const neutrino_locale_t colorchooser_names[4] = @@ -249,8 +250,8 @@ void CColorChooser::paintSlider(int px, int py, unsigned char *spos, const neutr if (!spos) return; frameBuffer->paintBoxRel(px+70,py,120,mheight, COL_MENUCONTENT_PLUS_0); - frameBuffer->paintIcon("volumebody.raw",px+70,py+2+mheight/4); - frameBuffer->paintIcon(selected ? iconname : "volumeslider2.raw",px+73+(*spos),py+mheight/4); + frameBuffer->paintIcon(NEUTRINO_ICON_VOLUMEBODY,px+70,py+2+mheight/4); + frameBuffer->paintIcon(selected ? iconname : NEUTRINO_ICON_VOLUMESLIDER2,px+73+(*spos),py+mheight/4); g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(px,py+mheight, width, g_Locale->getText(text), COL_MENUCONTENT, 0, true); // UTF-8 } diff --git a/src/gui/widget/hintbox.h b/src/gui/widget/hintbox.h index c291aa683..e647b5e25 100644 --- a/src/gui/widget/hintbox.h +++ b/src/gui/widget/hintbox.h @@ -63,7 +63,7 @@ class CHintBox public: // Text is UTF-8 encoded - CHintBox(const neutrino_locale_t Caption, const char * const Text, const int Width = 450, const char * const Icon = "info.raw"); + CHintBox(const neutrino_locale_t Caption, const char * const Text, const int Width = 450, const char * const Icon = NEUTRINO_ICON_INFO); ~CHintBox(void); bool has_scrollbar(void); diff --git a/src/gui/widget/hintboxext.h b/src/gui/widget/hintboxext.h index 9c19af80f..54cf4e2cd 100644 --- a/src/gui/widget/hintboxext.h +++ b/src/gui/widget/hintboxext.h @@ -37,6 +37,7 @@ #include #include +#include #include #include @@ -67,7 +68,7 @@ class CHintBoxExt public: CHintBoxExt(const neutrino_locale_t Caption, const char * const Text, const int Width, const char * const Icon); - CHintBoxExt(const neutrino_locale_t Caption, ContentLines& lines, const int Width = 450, const char * const Icon = "info.raw"); + CHintBoxExt(const neutrino_locale_t Caption, ContentLines& lines, const int Width = 450, const char * const Icon = NEUTRINO_ICON_INFO); ~CHintBoxExt(void); diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h index 707441e23..50f19620e 100644 --- a/src/gui/widget/icons.h +++ b/src/gui/widget/icons.h @@ -2,7 +2,7 @@ #define __gui_widget_icons_h__ /* - * $Header: /cvs/tuxbox/apps/tuxbox/neutrino/src/gui/widget/icons.h,v 1.18 2009/10/13 19:08:12 dbt Exp $ + * $Header: /cvs/tuxbox/apps/tuxbox/neutrino/src/gui/widget/icons.h,v 1.21 2009/12/15 09:51:23 dbt Exp $ * * (C) 2003 by thegoodguy * @@ -24,62 +24,106 @@ /* icon files */ -#define NEUTRINO_ICON_BUTTON_BLUE "blau.raw" -#define NEUTRINO_ICON_BUTTON_GREEN "gruen.raw" -#define NEUTRINO_ICON_BUTTON_RED "rot.raw" -#define NEUTRINO_ICON_BUTTON_YELLOW "gelb.raw" +#define NEUTRINO_ICON_BUTTON_BLUE "blau" +#define NEUTRINO_ICON_BUTTON_GREEN "gruen" +#define NEUTRINO_ICON_BUTTON_RED "rot" +#define NEUTRINO_ICON_BUTTON_YELLOW "gelb" -#define NEUTRINO_ICON_BUTTON_DBOX "dbox.raw" -#define NEUTRINO_ICON_BUTTON_DBOX_SMALL "dbox_small.raw" -#define NEUTRINO_ICON_BUTTON_HELP "help.raw" -#define NEUTRINO_ICON_BUTTON_HELP_SMALL "help_small.raw" -#define NEUTRINO_ICON_BUTTON_HOME "home.raw" -#define NEUTRINO_ICON_BUTTON_MUTE "mute.raw" -#define NEUTRINO_ICON_BUTTON_MUTE_SMALL "mute_small.raw" -#define NEUTRINO_ICON_BUTTON_POWER "power.raw" +#define NEUTRINO_ICON_BUTTON_DBOX "dbox" +#define NEUTRINO_ICON_BUTTON_DBOX_SMALL "dbox_small" +#define NEUTRINO_ICON_BUTTON_HELP "help" +#define NEUTRINO_ICON_BUTTON_HELP_SMALL "help_small" +#define NEUTRINO_ICON_BUTTON_HOME "home" +#define NEUTRINO_ICON_BUTTON_MUTE "mute" +#define NEUTRINO_ICON_BUTTON_MUTE_SMALL "mute_small" +#define NEUTRINO_ICON_BUTTON_POWER "power" -#define NEUTRINO_ICON_BUTTON_OKAY "ok.raw" -#define NEUTRINO_ICON_BUTTON_OKAY_SMALL "ok_small.raw" +#define NEUTRINO_ICON_BUTTON_OKAY "ok" +#define NEUTRINO_ICON_BUTTON_OKAY_SMALL "ok_small" -#define NEUTRINO_ICON_BUTTON_0 "0.raw" -#define NEUTRINO_ICON_BUTTON_1 "1.raw" -#define NEUTRINO_ICON_BUTTON_2 "2.raw" -#define NEUTRINO_ICON_BUTTON_3 "3.raw" -#define NEUTRINO_ICON_BUTTON_4 "4.raw" -#define NEUTRINO_ICON_BUTTON_5 "5.raw" -#define NEUTRINO_ICON_BUTTON_6 "6.raw" -#define NEUTRINO_ICON_BUTTON_7 "7.raw" -#define NEUTRINO_ICON_BUTTON_8 "8.raw" -#define NEUTRINO_ICON_BUTTON_9 "9.raw" +#define NEUTRINO_ICON_BUTTON_0 "0" +#define NEUTRINO_ICON_BUTTON_1 "1" +#define NEUTRINO_ICON_BUTTON_2 "2" +#define NEUTRINO_ICON_BUTTON_3 "3" +#define NEUTRINO_ICON_BUTTON_4 "4" +#define NEUTRINO_ICON_BUTTON_5 "5" +#define NEUTRINO_ICON_BUTTON_6 "6" +#define NEUTRINO_ICON_BUTTON_7 "7" +#define NEUTRINO_ICON_BUTTON_8 "8" +#define NEUTRINO_ICON_BUTTON_9 "9" -#define NEUTRINO_ICON_BUTTON_TOP "up.raw" -#define NEUTRINO_ICON_BUTTON_TOP_SMALL "up_small.raw" -#define NEUTRINO_ICON_BUTTON_RIGHT "right.raw" -#define NEUTRINO_ICON_BUTTON_DOWN "down.raw" -#define NEUTRINO_ICON_BUTTON_DOWN_SMALL "down_small.raw" -#define NEUTRINO_ICON_BUTTON_LEFT "left.raw" +#define NEUTRINO_ICON_BUTTON_TOP "up" +#define NEUTRINO_ICON_BUTTON_TOP_SMALL "up_small" +#define NEUTRINO_ICON_BUTTON_RIGHT "right" +#define NEUTRINO_ICON_BUTTON_DOWN "down" +#define NEUTRINO_ICON_BUTTON_DOWN_SMALL "down_small" +#define NEUTRINO_ICON_BUTTON_LEFT "left" -#define NEUTRINO_ICON_BUTTON_PLUS "plus.raw" -#define NEUTRINO_ICON_BUTTON_MINUS "minus.raw" +#define NEUTRINO_ICON_BUTTON_PLUS "plus" +#define NEUTRINO_ICON_BUTTON_MINUS "minus" -#define NEUTRINO_ICON_ERROR "error.raw" -#define NEUTRINO_ICON_FILE "file.raw" -#define NEUTRINO_ICON_GAMES "games.raw" -#define NEUTRINO_ICON_INFO "info.raw" -#define NEUTRINO_ICON_MOUNTED "mounted.raw" -#define NEUTRINO_ICON_NOT_MOUNTED "not_mounted.raw" -#define NEUTRINO_ICON_RECORDING "recording.raw" -#define NEUTRINO_ICON_SETTINGS "settings.raw" -#define NEUTRINO_ICON_SHELL "shell.raw" -#define NEUTRINO_ICON_UPNP "upnp.raw" -#define NEUTRINO_ICON_PROTECTING "protecting.raw" -#define NEUTRINO_ICON_EPGINFO "epginfo.raw" -#define NEUTRINO_ICON_UPDATE "softupdate.raw" -#define NEUTRINO_ICON_FEATURES "features.raw" +#define NEUTRINO_ICON_16_9 "16_9" +#define NEUTRINO_ICON_16_9_GREY "16_9_gray" +#define NEUTRINO_ICON_AUDIO "audio" +#define NEUTRINO_ICON_COLORS "colors" +#define NEUTRINO_ICON_DD "dd" +#define NEUTRINO_ICON_DD_AVAIL "dd_avail" +#define NEUTRINO_ICON_DD_GREY "dd_gray" +#define NEUTRINO_ICON_EPGINFO "epginfo" +#define NEUTRINO_ICON_ERROR "error" +#define NEUTRINO_ICON_FEATURES "features" +#define NEUTRINO_ICON_FILE "file" +#define NEUTRINO_ICON_FOLDER "folder" +#define NEUTRINO_ICON_GAMES "games" +#define NEUTRINO_ICON_INFO "info" +#define NEUTRINO_ICON_KEYBINDING "keybinding" +#define NEUTRINO_ICON_LOCK "lock" +#define NEUTRINO_ICON_HIDDEN "hidden" +#define NEUTRINO_ICON_MOUNTED "mounted" +#define NEUTRINO_ICON_MP3 "mp3" +#define NEUTRINO_ICON_NOT_MOUNTED "not_mounted" +#define NEUTRINO_ICON_PAUSE "pause" +#define NEUTRINO_ICON_PLAY "play" +#define NEUTRINO_ICON_PROTECTING "protecting" +#define NEUTRINO_ICON_QUESTION "question" +#define NEUTRINO_ICON_RADIOMODE "radiomode" +#define NEUTRINO_ICON_RECORDING "recording" +#define NEUTRINO_ICON_SETTINGS "settings" +#define NEUTRINO_ICON_SHELL "shell" +#define NEUTRINO_ICON_STREAMING "streaming" +#define NEUTRINO_ICON_TIMER "timer" +#define NEUTRINO_ICON_UPDATE "softupdate" +#define NEUTRINO_ICON_UPNP "upnp" +#define NEUTRINO_ICON_VIDEO "video" +#define NEUTRINO_ICON_VOLUMEBODY "volumebody" +#define NEUTRINO_ICON_VOLUMESLIDER2 "volumeslider2" +#define NEUTRINO_ICON_VOLUMESLIDER2ALPHA "volumeslider2alpha" +#define NEUTRINO_ICON_VOLUMESLIDER2BLUE "volumeslider2blue" +#define NEUTRINO_ICON_VOLUMESLIDER2GREEN "volumeslider2green" +#define NEUTRINO_ICON_VOLUMESLIDER2RED "volumeslider2red" +#define NEUTRINO_ICON_VTXT "vtxt" +#define NEUTRINO_ICON_VTXT_GREY "vtxt_gray" +#define NEUTRINO_ICON_PARTITION "partition" +#define NEUTRINO_ICON_SUBT "subt" +#define NEUTRINO_ICON_SUBT_GREY "subt_gray" +#define NEUTRINO_ICON_AUTO_SHIFT "ats" +#define NEUTRINO_ICON_NUMERIC_PAD "numericpad" +#define NEUTRINO_ICON_SCRAMBLED "ca" +#define NEUTRINO_ICON_BOOKMARK_MANAGER "bookmarkmanager" +#define NEUTRINO_ICON_BORDER_UL "border_ul" +#define NEUTRINO_ICON_BORDER_LR "border_lr" +#define NEUTRINO_ICON_MAINMENU "mainmenue" +#define NEUTRINO_ICON_LANGUAGE "language" +#define NEUTRINO_ICON_NETWORK "network" +#define NEUTRINO_ICON_LCD "lcd" +#define NEUTRINO_ICON_VOLUME "volume" -#define DUMMY_ICON "dummy.raw" +#define DUMMY_ICON "dummy" +#define NEUTRINO_ICON_BUTTON_MUTE_ZAP_ACTIVE "mute_zap_green" +#define NEUTRINO_ICON_BUTTON_MUTE_ZAP_INACTIVE "mute_zap_gray" + /* icon widths */ #define NEUTRINO_ICON_BUTTON_BLUE_WIDTH 16 @@ -87,8 +131,6 @@ #define NEUTRINO_ICON_BUTTON_RED_WIDTH 16 #define NEUTRINO_ICON_BUTTON_YELLOW_WIDTH 16 -#define NEUTRINO_ICON_BUTTON_MUTE_ZAP_ACTIVE "mute_zap_green.raw" -#define NEUTRINO_ICON_BUTTON_MUTE_ZAP_INACTIVE "mute_zap_gray.raw" /* misc */ diff --git a/src/gui/widget/lcdcontroler.cpp b/src/gui/widget/lcdcontroler.cpp index 8f66e8707..8e1f228f7 100644 --- a/src/gui/widget/lcdcontroler.cpp +++ b/src/gui/widget/lcdcontroler.cpp @@ -326,8 +326,8 @@ void CLcdControler::paintSlider(int x, int y, unsigned int spos, float factor, c char wert[5]; frameBuffer->paintBoxRel(x + startx, y, 120, mheight, COL_MENUCONTENT_PLUS_0); - frameBuffer->paintIcon("volumebody.raw", x + startx, y+2+mheight/4); - frameBuffer->paintIcon(selected ? "volumeslider2blue.raw" : "volumeslider2.raw", (int)(x + (startx+3)+(spos / factor)), y+mheight/4); + frameBuffer->paintIcon(NEUTRINO_ICON_VOLUMEBODY, x + startx, y+2+mheight/4); + frameBuffer->paintIcon(selected ? NEUTRINO_ICON_VOLUMESLIDER2BLUE : NEUTRINO_ICON_VOLUMESLIDER2, (int)(x + (startx+3)+(spos / factor)), y+mheight/4); g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x, y+mheight, width, g_Locale->getText(text), COL_MENUCONTENT, 0, true); // UTF-8 sprintf(wert, "%3d", spos); // UTF-8 encoded diff --git a/src/gui/widget/messagebox.cpp b/src/gui/widget/messagebox.cpp index 560dca393..6578d45ca 100644 --- a/src/gui/widget/messagebox.cpp +++ b/src/gui/widget/messagebox.cpp @@ -297,5 +297,5 @@ int ShowMsgUTF(const neutrino_locale_t Caption, const std::string & Text, const void DisplayErrorMessage(const char * const ErrorMsg) { - ShowMsgUTF(LOCALE_MESSAGEBOX_ERROR, ErrorMsg, CMessageBox::mbrCancel, CMessageBox::mbCancel, "error.raw"); + ShowMsgUTF(LOCALE_MESSAGEBOX_ERROR, ErrorMsg, CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR); } diff --git a/src/gui/widget/rgbcsynccontroler.cpp b/src/gui/widget/rgbcsynccontroler.cpp index a6117c634..a42fbd653 100644 --- a/src/gui/widget/rgbcsynccontroler.cpp +++ b/src/gui/widget/rgbcsynccontroler.cpp @@ -41,6 +41,7 @@ #include #include +#include "gui/widget/icons.h" #include #include @@ -179,8 +180,8 @@ void CRGBCSyncControler::paintSlider(int px, int py, unsigned int spos, float fa char wert[5]; frameBuffer->paintBoxRel(px + startx, py, 120, mheight, COL_MENUCONTENT_PLUS_0); - frameBuffer->paintIcon("volumebody.raw", px + startx, py+2+mheight/4); - frameBuffer->paintIcon(selected ? "volumeslider2blue.raw" : "volumeslider2.raw", (int)(px + (startx+3)+(spos / factor)), py+mheight/4); + frameBuffer->paintIcon(NEUTRINO_ICON_VOLUMEBODY, px + startx, py+2+mheight/4); + frameBuffer->paintIcon(selected ? NEUTRINO_ICON_VOLUMESLIDER2BLUE : NEUTRINO_ICON_VOLUMESLIDER2, (int)(px + (startx+3)+(spos / factor)), py+mheight/4); g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(px, py+mheight, width, g_Locale->getText(text), COL_MENUCONTENT, 0, true); // UTF-8 sprintf(wert, "%3d", spos); // UTF-8 encoded diff --git a/src/gui/widget/stringinput.cpp b/src/gui/widget/stringinput.cpp index f12fb6c91..27ea8d326 100644 --- a/src/gui/widget/stringinput.cpp +++ b/src/gui/widget/stringinput.cpp @@ -683,7 +683,7 @@ void CStringInputSMS::paint() { CStringInput::paint(); - frameBuffer->paintIcon("numericpad.raw", x+20+140, y+ hheight+ mheight+ iheight* 3+ 30, 0, COL_MENUCONTENT); + frameBuffer->paintIcon(NEUTRINO_ICON_NUMERIC_PAD, x+20+140, y+ hheight+ mheight+ iheight* 3+ 30, 0, COL_MENUCONTENT); frameBuffer->paintBoxRel(x,y+height-25, width,25, COL_MENUHEAD_PLUS_0, ROUND_RADIUS, CORNER_BOTTOM); frameBuffer->paintHLine(x, x+width, y+height-25, COL_INFOBAR_SHADOW_PLUS_0); diff --git a/src/gui/widget/stringinput.h b/src/gui/widget/stringinput.h index 832ad19c0..3f1f2f9b5 100644 --- a/src/gui/widget/stringinput.h +++ b/src/gui/widget/stringinput.h @@ -37,6 +37,7 @@ #include #include +#include #include @@ -128,9 +129,9 @@ class CPINInput : public CStringInput virtual void paintChar(int pos); public: CPINInput(const neutrino_locale_t Name, char* Value, int Size, const neutrino_locale_t Hint_1 = NONEXISTANT_LOCALE, const neutrino_locale_t Hint_2 = NONEXISTANT_LOCALE, const char * const Valid_Chars= (const char *)"0123456789", CChangeObserver* Observ = NULL) - : CStringInput(Name, (char *)Value, Size, Hint_1, Hint_2, Valid_Chars, Observ, (char *)"lock.raw") {}; + : CStringInput(Name, (char *)Value, Size, Hint_1, Hint_2, Valid_Chars, Observ, (char *) NEUTRINO_ICON_LOCK) {}; CPINInput(char * Head, char* Value, int Size, const neutrino_locale_t Hint_1 = NONEXISTANT_LOCALE, const neutrino_locale_t Hint_2 = NONEXISTANT_LOCALE, const char * const Valid_Chars= (const char *)"0123456789", CChangeObserver* Observ = NULL) - : CStringInput(Head, (char *)Value, Size, Hint_1, Hint_2, Valid_Chars, Observ, (char *)"lock.raw") {}; + : CStringInput(Head, (char *)Value, Size, Hint_1, Hint_2, Valid_Chars, Observ, (char *) NEUTRINO_ICON_LOCK) {}; int exec( CMenuTarget* parent, const std::string & actionKey ); }; diff --git a/src/gui/widget/vfdcontroler.cpp b/src/gui/widget/vfdcontroler.cpp index b63e8f108..832d8e8bf 100644 --- a/src/gui/widget/vfdcontroler.cpp +++ b/src/gui/widget/vfdcontroler.cpp @@ -41,6 +41,7 @@ #include #include +#include "gui/widget/icons.h" #include #include @@ -260,8 +261,8 @@ void CVfdControler::paintSlider(int px, int py, unsigned int spos, float factor, char wert[5]; frameBuffer->paintBoxRel(px + startx, py, 120, mheight, COL_MENUCONTENT_PLUS_0); - frameBuffer->paintIcon("volumebody.raw", px + startx, py+2+mheight/4); - frameBuffer->paintIcon(selected ? "volumeslider2blue.raw" : "volumeslider2.raw", (int)(px + (startx+3)+(spos / factor)), py+mheight/4); + frameBuffer->paintIcon(NEUTRINO_ICON_VOLUMEBODY, px + startx, py+2+mheight/4); + frameBuffer->paintIcon(selected ? NEUTRINO_ICON_VOLUMESLIDER2BLUE : NEUTRINO_ICON_VOLUMESLIDER2, (int)(px + (startx+3)+(spos / factor)), py+mheight/4); g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(px, py+mheight, width, g_Locale->getText(text), COL_MENUCONTENT, 0, true); // UTF-8 sprintf(wert, "%3d", spos); // UTF-8 encoded diff --git a/src/neutrino.cpp b/src/neutrino.cpp index f9924af85..97281ad8f 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2263,7 +2263,6 @@ void CNeutrinoApp::setupRecordingDevice(void) } } -//CMenuWidget moviePlayer (LOCALE_MOVIEPLAYER_HEAD , "streaming.raw" ); CMenuWidget * gmoviePlayer; #if 0 CPipSetup * g_Pip0; @@ -2407,25 +2406,23 @@ int CNeutrinoApp::run(int argc, char **argv) c_SMSKeyInput = new SMSKeyInput(); //Main settings - CMenuWidget mainMenu (LOCALE_MAINMENU_HEAD , "mainmenue.raw" ); + CMenuWidget mainMenu (LOCALE_MAINMENU_HEAD , NEUTRINO_ICON_MAINMENU); CMenuWidget mainSettings (LOCALE_MAINSETTINGS_HEAD , NEUTRINO_ICON_SETTINGS); - CMenuWidget languageSettings (LOCALE_LANGUAGESETUP_HEAD , "language.raw" ); - CMenuWidget audioSettings (LOCALE_AUDIOMENU_HEAD , "audio.raw" ); - CMenuWidget parentallockSettings(LOCALE_PARENTALLOCK_PARENTALLOCK , "lock.raw" , 500); - CMenuWidget networkSettings (LOCALE_NETWORKMENU_HEAD , "network.raw" ); - CMenuWidget recordingSettings (LOCALE_RECORDINGMENU_HEAD , "recording.raw" ); - CMenuWidget streamingSettings (LOCALE_STREAMINGMENU_HEAD , "streaming.raw" ); - //CMenuWidget colorSettings (LOCALE_COLORMENU_HEAD , "colors.raw" ); - CMenuWidget colorSettings (LOCALE_MAINSETTINGS_OSD , "colors.raw" ); - CMenuWidget fontSettings (LOCALE_FONTMENU_HEAD , "colors.raw" ); - CMenuWidget lcdSettings (LOCALE_LCDMENU_HEAD , "lcd.raw" ); - //CMenuWidget keySettings (LOCALE_KEYBINDINGMENU_HEAD , "keybinding.raw" , 400); - CMenuWidget keySettings (LOCALE_MAINSETTINGS_KEYBINDING , "keybinding.raw" , 400); + CMenuWidget languageSettings (LOCALE_LANGUAGESETUP_HEAD , NEUTRINO_ICON_LANGUAGE); + CMenuWidget audioSettings (LOCALE_AUDIOMENU_HEAD , NEUTRINO_ICON_AUDIO); + CMenuWidget parentallockSettings(LOCALE_PARENTALLOCK_PARENTALLOCK , NEUTRINO_ICON_LOCK , 500); + CMenuWidget networkSettings (LOCALE_NETWORKMENU_HEAD , NEUTRINO_ICON_NETWORK); + CMenuWidget recordingSettings (LOCALE_RECORDINGMENU_HEAD , NEUTRINO_ICON_RECORDING); + CMenuWidget streamingSettings (LOCALE_STREAMINGMENU_HEAD , NEUTRINO_ICON_STREAMING); + CMenuWidget colorSettings (LOCALE_MAINSETTINGS_OSD , NEUTRINO_ICON_COLORS); + CMenuWidget fontSettings (LOCALE_FONTMENU_HEAD , NEUTRINO_ICON_COLORS); + CMenuWidget lcdSettings (LOCALE_LCDMENU_HEAD , NEUTRINO_ICON_LCD); + CMenuWidget keySettings (LOCALE_MAINSETTINGS_KEYBINDING , NEUTRINO_ICON_KEYBINDING , 400); CMenuWidget miscSettings (LOCALE_MISCSETTINGS_HEAD , NEUTRINO_ICON_SETTINGS); CMenuWidget audioplPicSettings (LOCALE_AUDIOPLAYERPICSETTINGS_GENERAL, NEUTRINO_ICON_SETTINGS); CMenuWidget scanSettings (LOCALE_SERVICEMENU_SCANTS , NEUTRINO_ICON_SETTINGS); CMenuWidget service (LOCALE_SERVICEMENU_HEAD , NEUTRINO_ICON_SETTINGS); - CMenuWidget moviePlayer (LOCALE_MOVIEPLAYER_HEAD , "streaming.raw" ); + CMenuWidget moviePlayer (LOCALE_MOVIEPLAYER_HEAD , NEUTRINO_ICON_STREAMING); gmoviePlayer = &moviePlayer; InitMainMenu(mainMenu, mainSettings, audioSettings, parentallockSettings, networkSettings, recordingSettings, @@ -3644,7 +3641,7 @@ void CNeutrinoApp::setVolume(const neutrino_msg_t key, const bool bDoPaint, bool g_volscale = new CProgressBar(g_settings.progressbar_color, 200, 15, 50, 100, 80, true); } - frameBuffer->paintIcon("volume.raw",x,y, 0, COL_INFOBAR); + frameBuffer->paintIcon(NEUTRINO_ICON_VOLUME,x,y, 0, COL_INFOBAR); frameBuffer->paintBoxRel (x + 40, y+12, 200, 15, COL_INFOBAR_PLUS_0); g_volscale->reset(); g_volscale->paintProgressBar2(x + 41, y + 12, g_settings.current_volume); @@ -4276,7 +4273,7 @@ printf("New timeshift dir: %s\n", timeshiftDir); } else if(actionKey == "movieplugin") { parent->hide(); - CMenuWidget MoviePluginSelector(LOCALE_MOVIEPLAYER_DEFPLUGIN, "features.raw", 350); + CMenuWidget MoviePluginSelector(LOCALE_MOVIEPLAYER_DEFPLUGIN, NEUTRINO_ICON_FEATURES, 350); MoviePluginSelector.addItem(GenericMenuSeparator); char id[5]; @@ -4297,7 +4294,7 @@ printf("New timeshift dir: %s\n", timeshiftDir); } else if(actionKey == "onekeyplugin") { parent->hide(); - CMenuWidget MoviePluginSelector(LOCALE_EXTRA_KEY_PLUGIN, "features.raw", 350); + CMenuWidget MoviePluginSelector(LOCALE_EXTRA_KEY_PLUGIN, NEUTRINO_ICON_FEATURES, 350); MoviePluginSelector.addItem(GenericMenuSeparator); char id[5]; diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index e3597251c..f05913b91 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -266,7 +266,7 @@ const CMenuOptionChooser::keyval VIDEOMENU_DBDR_OPTIONS[VIDEOMENU_DBDR_OPTION_CO }; #include "videosettings.h" -CVideoSettings::CVideoSettings() : CMenuWidget(LOCALE_VIDEOMENU_HEAD, "video.raw"), RGBCSyncControler(LOCALE_VIDEOMENU_RGB_CENTERING, &g_settings.video_csync) +CVideoSettings::CVideoSettings() : CMenuWidget(LOCALE_VIDEOMENU_HEAD, NEUTRINO_ICON_VIDEO), RGBCSyncControler(LOCALE_VIDEOMENU_RGB_CENTERING, &g_settings.video_csync) { addItem(GenericMenuSeparator); addItem(GenericMenuBack); @@ -417,7 +417,7 @@ bool CVideoSettings::changeNotify(const neutrino_locale_t OptionName, void *) //videoDecoder->SetVideoMode((analog_mode_t) g_settings.analog_mode);//FIXME if (prev_video_mode != g_settings.video_Mode) { frameBuffer->paintBackground(); - if (ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_VIDEOMODE_OK), CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo, "info.raw") != CMessageBox::mbrYes) { + if (ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_VIDEOMODE_OK), CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo, NEUTRINO_ICON_INFO) != CMessageBox::mbrYes) { g_settings.video_Mode = prev_video_mode; videoDecoder->SetVideoSystem(g_settings.video_Mode); //videoDecoder->SetVideoMode((analog_mode_t) g_settings.analog_mode);//FIXME @@ -474,7 +474,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey) text[12*len] = 0; CVFD::getInstance()->ShowText(text); - ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, "VFD test, Press OK to return", CMessageBox::mbrBack, CMessageBox::mbBack, "info.raw"); + ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, "VFD test, Press OK to return", CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); CVFD::getInstance()->Clear(); } else if (actionKey == "network") { @@ -509,7 +509,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey) (unsigned char)ifr.ifr_hwaddr.sa_data[5], ip == NULL ? "Unknown" : ip); close(fd); - ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, str, CMessageBox::mbrBack, CMessageBox::mbBack, "info.raw"); + ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, str, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); } else if (actionKey == "card") { } @@ -528,7 +528,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey) } sprintf(buffer, "HDD: /dev/sda1 is %s", mounted ? "mounted" : "NOT mounted"); printf("%s\n", buffer); - ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, buffer, CMessageBox::mbrBack, CMessageBox::mbBack, "info.raw"); + ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, buffer, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); } else if (actionKey == "buttons") { neutrino_msg_t msg; @@ -700,7 +700,7 @@ void CNeutrinoApp::InitMainMenu(CMenuWidget &mainMenu, CMenuWidget &mainSettings mainMenu.addItem(new CMenuForwarder(LOCALE_MAINMENU_REBOOT, true, NULL, this, "reboot", CRCInput::convertDigitToKey(shortcut++))); - //mainMenu.addItem(new CMenuForwarder(LOCALE_MAINMENU_SHUTDOWN, true, NULL, this, "shutdown", CRCInput::RC_standby, "power.raw"));//FIXME + //mainMenu.addItem(new CMenuForwarder(LOCALE_MAINMENU_SHUTDOWN, true, NULL, this, "shutdown", CRCInput::RC_standby, NEUTRINO_ICON_BUTTON_POWER));//FIXME mainMenu.addItem( new CMenuSeparator(CMenuSeparator::LINE) ); mainMenu.addItem( new CMenuForwarder(LOCALE_DBOXINFO, true, NULL, new CDBoxInfoWidget, NULL, CRCInput::convertDigitToKey(shortcut++))); @@ -773,7 +773,7 @@ void CNeutrinoApp::InitMainMenu(CMenuWidget &mainMenu, CMenuWidget &mainSettings g_RFmod = new RFmod(); if (g_RFmod->rfmodfd >=0) { g_RFmod->init(); - CMenuWidget * rfmenu = new CMenuWidget(LOCALE_RFMOD, "settings.raw"); + CMenuWidget * rfmenu = new CMenuWidget(LOCALE_RFMOD, NEUTRINO_ICON_SETTINGS); CRfNotifier * rfnot = new CRfNotifier(); CRfExec * rfexec = new CRfExec(); @@ -1243,7 +1243,7 @@ void CNeutrinoApp::InitServiceSettings(CMenuWidget &service, CMenuWidget &scanSe #if 0 CZapitDestExec * zexec = new CZapitDestExec(); - CMenuWidget* zapit_menu = new CMenuWidget(LOCALE_EXTRA_ZAPIT_MENU, "settings.raw"); + CMenuWidget* zapit_menu = new CMenuWidget(LOCALE_EXTRA_ZAPIT_MENU, NEUTRINO_ICON_SETTINGS); zapit_menu->addItem( GenericMenuBack ); //zapit_menu->addItem(new CMenuForwarder(LOCALE_EXTRA_SAVESETTINGS, true, "", new CZapitDestExec, "savesettings", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED)); zapit_menu->addItem(new CMenuForwarder(LOCALE_EXTRA_SAVESETTINGS, true, "", this, "savesettings", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED)); @@ -1282,16 +1282,16 @@ void CNeutrinoApp::InitServiceSettings(CMenuWidget &service, CMenuWidget &scanSe service.addItem(GenericMenuSeparatorLine); service.addItem(new CMenuForwarder(LOCALE_SERVICEMENU_IMAGEINFO, true, NULL, new CImageInfo(), NULL, CRCInput::RC_help, NEUTRINO_ICON_BUTTON_HELP_SMALL ), false); - service.addItem(new CMenuForwarder(LOCALE_SERVICEMENU_RESTART , true, NULL, this, "restart", CRCInput::RC_standby, "power.raw")); + service.addItem(new CMenuForwarder(LOCALE_SERVICEMENU_RESTART , true, NULL, this, "restart", CRCInput::RC_standby, NEUTRINO_ICON_BUTTON_POWER)); //softupdate //if(softupdate) { dprintf(DEBUG_DEBUG, "init soft-update-stuff\n"); - CMenuWidget* updateSettings = new CMenuWidget(LOCALE_SERVICEMENU_UPDATE, "softupdate.raw", 550); + CMenuWidget* updateSettings = new CMenuWidget(LOCALE_SERVICEMENU_UPDATE, NEUTRINO_ICON_UPDATE, 550); addMenueIntroItems(*updateSettings); //experten-funktionen für mtd lesen/schreiben - CMenuWidget* mtdexpert = new CMenuWidget(LOCALE_FLASHUPDATE_EXPERTFUNCTIONS, "softupdate.raw"); + CMenuWidget* mtdexpert = new CMenuWidget(LOCALE_FLASHUPDATE_EXPERTFUNCTIONS, NEUTRINO_ICON_UPDATE); addMenueIntroItems(*mtdexpert); CFlashExpert* fe = new CFlashExpert(); @@ -1582,7 +1582,7 @@ void CNeutrinoApp::InitLanguageSettings(CMenuWidget &languageSettings) if (pos != NULL) { char iname[50]; *pos = '\0'; - sprintf(iname, "%s.raw", locale); + sprintf(iname, "%s", locale); CMenuOptionLanguageChooser* oj = new CMenuOptionLanguageChooser((char*)locale, this, iname); oj->addOption(locale); languageSettings.addItem( oj ); @@ -1808,7 +1808,7 @@ void CNeutrinoApp::InitRecordingSettings(CMenuWidget &recordingSettings) CMenuForwarder *fTimerAfter = new CMenuForwarder(LOCALE_TIMERSETTINGS_RECORD_SAFETY_TIME_AFTER, true, g_settings.record_safety_time_after, timerAfter); // default recording audio pids - //CMenuWidget * apidMenu = new CMenuWidget(LOCALE_RECORDINGMENU_APIDS, "audio.raw"); + //CMenuWidget * apidMenu = new CMenuWidget(LOCALE_RECORDINGMENU_APIDS, NEUTRINO_ICON_AUDIO); //CMenuForwarder* fApidMenu = new CMenuForwarder(LOCALE_RECORDINGMENU_APIDS ,true, NULL, apidMenu); g_settings.recording_audio_pids_std = ( g_settings.recording_audio_pids_default & TIMERD_APIDS_STD ) ? 1 : 0 ; g_settings.recording_audio_pids_alt = ( g_settings.recording_audio_pids_default & TIMERD_APIDS_ALT ) ? 1 : 0 ; @@ -2146,7 +2146,7 @@ void CNeutrinoApp::InitFontSettings(CMenuWidget &fontSettings) for (int i = 0; i < 5; i++) { - CMenuWidget * fontSettingsSubMenu = new CMenuWidget(font_sizes_groups[i].groupname, "colors.raw"); + CMenuWidget * fontSettingsSubMenu = new CMenuWidget(font_sizes_groups[i].groupname, NEUTRINO_ICON_COLORS); addMenueIntroItems(*fontSettingsSubMenu); for (unsigned int j = 0; j < font_sizes_groups[i].count; j++) { @@ -2428,7 +2428,7 @@ const neutrino_locale_t keydescription[KEYBINDS_COUNT] = void CNeutrinoApp::InitKeySettings(CMenuWidget &keySettings) { - CMenuWidget* bindSettings = new CMenuWidget(LOCALE_KEYBINDINGMENU_HEAD, "keybinding.raw", 400); + CMenuWidget* bindSettings = new CMenuWidget(LOCALE_KEYBINDINGMENU_HEAD, NEUTRINO_ICON_KEYBINDING, 400); addMenueIntroItems(keySettings); @@ -2548,7 +2548,7 @@ void CNeutrinoApp::SelectNVOD() if (!(g_RemoteControl->subChannels.empty())) { // NVOD/SubService- Kanal! - CMenuWidget NVODSelector(g_RemoteControl->are_subchannels ? LOCALE_NVODSELECTOR_SUBSERVICE : LOCALE_NVODSELECTOR_HEAD, "video.raw", 350); + CMenuWidget NVODSelector(g_RemoteControl->are_subchannels ? LOCALE_NVODSELECTOR_SUBSERVICE : LOCALE_NVODSELECTOR_HEAD, NEUTRINO_ICON_VIDEO, 350); if (getNVODMenu(&NVODSelector)) NVODSelector.exec(NULL, ""); } @@ -2618,7 +2618,7 @@ void CNeutrinoApp::SelectAPID() { // wir haben APIDs für diesen Kanal! - CMenuWidget APIDSelector(LOCALE_APIDSELECTOR_HEAD, "audio.raw", 300); + CMenuWidget APIDSelector(LOCALE_APIDSELECTOR_HEAD, NEUTRINO_ICON_AUDIO, 300); APIDSelector.addItem(GenericMenuSeparator); for ( unsigned int count=0; countcurrent_PIDs.APIDs.size(); count++ ) @@ -2752,7 +2752,7 @@ bool CNeutrinoApp::showUserMenu(int button) if ( txt.empty() ) txt = g_Locale->getText(LOCALE_INFOVIEWER_STREAMINFO); } - CMenuWidget *menu = new CMenuWidget(txt.c_str() , "features.raw", 350); + CMenuWidget *menu = new CMenuWidget(txt.c_str() , NEUTRINO_ICON_FEATURES, 350); if (menu == NULL) return 0; menu->addItem(GenericMenuSeparator); @@ -2876,7 +2876,7 @@ bool CNeutrinoApp::showUserMenu(int button) case SNeutrinoSettings::ITEM_SUBCHANNEL: if (!(g_RemoteControl->subChannels.empty())) { // NVOD/SubService- Kanal! - tmpNVODSelector = new CMenuWidget(g_RemoteControl->are_subchannels ? LOCALE_NVODSELECTOR_SUBSERVICE : LOCALE_NVODSELECTOR_HEAD, "video.raw", 350); + tmpNVODSelector = new CMenuWidget(g_RemoteControl->are_subchannels ? LOCALE_NVODSELECTOR_SUBSERVICE : LOCALE_NVODSELECTOR_HEAD, NEUTRINO_ICON_VIDEO, 350); if (getNVODMenu(tmpNVODSelector)) { menu_items++; menu_prev = SNeutrinoSettings::ITEM_SUBCHANNEL; diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index 2eea5559a..3efc51ad8 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -853,7 +853,7 @@ int CUserMenuMenu::exec(CMenuTarget* parent, const std::string & /*actionKey*/) if(parent != NULL) parent->hide(); - CMenuWidget menu (local , "keybinding.raw"); + CMenuWidget menu (local , NEUTRINO_ICON_KEYBINDING); menu.addItem(GenericMenuSeparator); menu.addItem(GenericMenuBack); menu.addItem(GenericMenuSeparatorLine);