From 6fc7cd350b7ee7e5dc592ad989f1c79fb7b9d6ff Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Tue, 13 Jul 2010 12:03:51 +0000 Subject: [PATCH] tiny osd edits git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@657 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/8031c49fdc1d06dcc01659646d3bf0b88ca18cb2 Author: Jacek Jendrzej Date: 2010-07-13 (Tue, 13 Jul 2010) ------------------ This commit was generated by Migit --- src/gui/eventlist.cpp | 10 +++++----- src/neutrino_menue.cpp | 7 +++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index a39b3bbf0..e22b8fb39 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -216,8 +216,8 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam neutrino_msg_data_t data; bool in_search = 0; - width = w_max (580, 20); - height = h_max (480, 20); + width = w_max (680, 20); + height = h_max (560, 20); iheight = 30; // info bar height (see below, hard coded at this time) @@ -724,7 +724,7 @@ void EventList::paintItem(unsigned int pos, t_channel_id channel_id) datetime2_str += g_Zapit->getChannelName(channel); } - sprintf(tmpstr, "[%d min]", evtlist[liststart+pos].duration / 60 ); + snprintf(tmpstr,sizeof(tmpstr), "[%d min]", evtlist[liststart+pos].duration / 60 ); duration_str = tmpstr; } @@ -739,7 +739,7 @@ void EventList::paintItem(unsigned int pos, t_channel_id channel_id) if ( (seit> 0) && (seit<100) && (duration_str.length()!=0) ) { char beginnt[100]; - sprintf((char*) &beginnt, "in %d min", seit); + snprintf((char*) &beginnt,sizeof(beginnt), "in %d min", seit); int w = g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMSMALL]->getRenderWidth(beginnt) + 10; g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMSMALL]->RenderString(x+width-fwidth2-5- 20- w, ypos+ fheight1+3, fwidth2, beginnt, color); @@ -749,7 +749,7 @@ void EventList::paintItem(unsigned int pos, t_channel_id channel_id) if(icontype != 0) { frameBuffer->getIconSize(icontype, &iw, &ih); //frameBuffer->paintIcon(icontype, x+5, ypos + fheight - 16 - (fheight1 - 16)/2); - frameBuffer->paintIcon(icontype, x+5, ypos + fheight - ih - (fheight1 - ih)/2, fheight1); + frameBuffer->paintIcon(icontype, x+5, ypos + fheight1+3 - (fheight1 - ih)/2, fheight1); } // 2nd line g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMLARGE]->RenderString(x+10+iw, ypos+ fheight, width- 25- 20, evtlist[liststart+pos].description, color, 0, true); diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index 5db092415..225b8b1d1 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -2466,9 +2466,6 @@ void CNeutrinoApp::InitColorSettings(CMenuWidget &colorSettings, CMenuWidget &fo colorSettings.addItem(new CMenuForwarder(LOCALE_COLORMENU_TIMING, true, NULL, colorSettings_timing, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW)); colorSettings.addItem(new CMenuForwarder(LOCALE_VIDEOMENU_SCREENSETUP, true, NULL, ScreenSetup, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE)); - CScreenPresetNotifier * presetNotify = new CScreenPresetNotifier(); - colorSettings.addItem(new CMenuOptionChooser(LOCALE_COLORMENU_OSD_PRESET, &g_settings.screen_preset, OSD_PRESET_OPTIONS, OSD_PRESET_OPTIONS_COUNT, true, presetNotify, CRCInput::RC_1)); - //infobar CMenuWidget *miscSettingsInfobar = new CMenuWidget(LOCALE_MISCSETTINGS_INFOBAR, NEUTRINO_ICON_SETTINGS); addMenueIntroItems(*miscSettingsInfobar); @@ -2479,8 +2476,10 @@ void CNeutrinoApp::InitColorSettings(CMenuWidget &colorSettings, CMenuWidget &fo miscSettingsInfobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SAT_DISPLAY, &g_settings.infobar_sat_display, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); miscSettingsInfobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_VAR_HDD, &g_settings.infobar_show_var_hdd, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); - colorSettings.addItem(new CMenuForwarder(LOCALE_MISCSETTINGS_INFOBAR, true, NULL, miscSettingsInfobar, NULL, CRCInput::RC_2)); + colorSettings.addItem(new CMenuForwarder(LOCALE_MISCSETTINGS_INFOBAR, true, NULL, miscSettingsInfobar, NULL, CRCInput::RC_1)); + CScreenPresetNotifier * presetNotify = new CScreenPresetNotifier(); + colorSettings.addItem(new CMenuOptionChooser(LOCALE_COLORMENU_OSD_PRESET, &g_settings.screen_preset, OSD_PRESET_OPTIONS, OSD_PRESET_OPTIONS_COUNT, true, presetNotify)); colorSettings.addItem(GenericMenuSeparatorLine); colorSettings.addItem(new CMenuOptionChooser(LOCALE_EXTRA_ROUNDED_CORNERS, &g_settings.rounded_corners, MENU_CORNERSETTINGS_TYPE_OPTIONS, MENU_CORNERSETTINGS_TYPE_OPTION_COUNT, true)); colorSettings.addItem(new CMenuOptionChooser(LOCALE_EXTRA_SCRAMBLED_MESSAGE, &g_settings.scrambled_message, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));