From bc2eb5444b93e9fd936b2f6102d2461c80c43b8d Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Fri, 13 Aug 2010 16:17:50 +0000 Subject: [PATCH] osd fixes & rotor fix by bazi98, THX git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@721 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/679845e5674191a7e8e62a588db032d3c801d4cb Author: Jacek Jendrzej Date: 2010-08-13 (Fri, 13 Aug 2010) ------------------ This commit was generated by Migit --- src/gui/epgplus.cpp | 1 + src/gui/moviebrowser.cpp | 4 ++-- src/neutrino_menue.cpp | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp index 12cfe5f46..607081497 100644 --- a/src/gui/epgplus.cpp +++ b/src/gui/epgplus.cpp @@ -656,6 +656,7 @@ void EpgPlus::init() usableScreenWidth = w_max (g_settings.screen_EndX, 0); usableScreenHeight = h_max (g_settings.screen_EndY, 0); std::string FileName = std::string (g_settings.font_file); + fontSettingTable[0].size = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight(); for (size_t i = 0; i < NumberOfFontSettings; ++i) { int size = fontSettingTable[i].size; if (bigfont && (fontSettingTable[i].settingID == EpgPlus::EPGPlus_channelentry_font || diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp index 8dfb5fc03..f45bae56b 100644 --- a/src/gui/moviebrowser.cpp +++ b/src/gui/moviebrowser.cpp @@ -1510,7 +1510,7 @@ void CMovieBrowser::refreshTitle(void) void CMovieBrowser::refreshFoot(void) { //TRACE("[mb]->refreshButtonLine \r\n"); - int color = (CFBWindow::color_t) COL_MENUHEAD; + int color = (CFBWindow::color_t) COL_MENUCONTENT; int iw = 0, ih; std::string filter_text = g_Locale->getText(LOCALE_MOVIEBROWSER_FOOT_FILTER); @@ -1549,7 +1549,7 @@ void CMovieBrowser::refreshFoot(void) //std::string ok_text; if(m_settings.gui == MB_GUI_FILTER && m_windowFocus == MB_FOCUS_FILTER) { - ok_text = "select"; + ok_text = g_Locale->getText(LOCALE_BOOKMARKMANAGER_SELECT); } else { diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index 00484b6b3..e3dd3e93a 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -1661,10 +1661,12 @@ void CNeutrinoApp::InitMiscSettings(CMenuWidget &miscSettings) //don't show rotor and fan speed settings on cable box and NEO funNotifier = new CFanControlNotifier(); if (g_info.delivery_system == DVB_S && (cs_get_revision() < 8)) { - miscSettingsGeneral->addItem(new CMenuOptionChooser(LOCALE_EXTRA_ROTORSWAP, &g_settings.rotor_swap, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); miscSettingsGeneral->addItem(new CMenuOptionNumberChooser(LOCALE_FAN_SPEED, &g_settings.fan_speed, true, 1, 14, funNotifier, 0, 0, LOCALE_OPTIONS_OFF) ); funNotifier->changeNotify(NONEXISTANT_LOCALE, (void*) &g_settings.fan_speed); } + if (g_info.delivery_system == DVB_S) { + miscSettingsGeneral->addItem(new CMenuOptionChooser(LOCALE_EXTRA_ROTORSWAP, &g_settings.rotor_swap, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); + } if(cs_get_revision() > 7){ miscSettingsGeneral->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MAINMENU_SHUTDOWN)); CMenuOptionChooser *m1 = new CMenuOptionChooser(LOCALE_MISCSETTINGS_SHUTDOWN_REAL_RCDELAY, &g_settings.shutdown_real_rcdelay, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, !g_settings.shutdown_real);