mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-12 07:53:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

osd fixes & rotor fix by bazi98, THX

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@721 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 679845e567
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-08-13 (Fri, 13 Aug 2010)
This commit is contained in:
Jacek Jendrzej
2010-08-13 16:17:50 +00:00
parent a995057281
commit 2be746e079
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/epgplus.cpp
View File

@@ -656,6 +656,7 @@ void EpgPlus::init()
usableScreenWidth = w_max (g_settings.screen_EndX, 0); usableScreenWidth = w_max (g_settings.screen_EndX, 0);
usableScreenHeight = h_max (g_settings.screen_EndY, 0); usableScreenHeight = h_max (g_settings.screen_EndY, 0);
std::string FileName = std::string (g_settings.font_file); 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) { for (size_t i = 0; i < NumberOfFontSettings; ++i) {
int size = fontSettingTable[i].size; int size = fontSettingTable[i].size;
if (bigfont && (fontSettingTable[i].settingID == EpgPlus::EPGPlus_channelentry_font || if (bigfont && (fontSettingTable[i].settingID == EpgPlus::EPGPlus_channelentry_font ||

4
src/gui/moviebrowser.cpp
View File

@@ -1510,7 +1510,7 @@ void CMovieBrowser::refreshTitle(void)
void CMovieBrowser::refreshFoot(void) void CMovieBrowser::refreshFoot(void)
{ {
//TRACE("[mb]->refreshButtonLine \r\n"); //TRACE("[mb]->refreshButtonLine \r\n");
int color = (CFBWindow::color_t) COL_MENUHEAD; int color = (CFBWindow::color_t) COL_MENUCONTENT;
int iw = 0, ih; int iw = 0, ih;
std::string filter_text = g_Locale->getText(LOCALE_MOVIEBROWSER_FOOT_FILTER); std::string filter_text = g_Locale->getText(LOCALE_MOVIEBROWSER_FOOT_FILTER);
@@ -1549,7 +1549,7 @@ void CMovieBrowser::refreshFoot(void)
//std::string ok_text; //std::string ok_text;
if(m_settings.gui == MB_GUI_FILTER && m_windowFocus == MB_FOCUS_FILTER) if(m_settings.gui == MB_GUI_FILTER && m_windowFocus == MB_FOCUS_FILTER)
{ {
ok_text = "select"; ok_text = g_Locale->getText(LOCALE_BOOKMARKMANAGER_SELECT);
} }
else else
{ {

4
src/neutrino_menue.cpp
View File

@@ -1661,10 +1661,12 @@ void CNeutrinoApp::InitMiscSettings(CMenuWidget &miscSettings)
//don't show rotor and fan speed settings on cable box and NEO //don't show rotor and fan speed settings on cable box and NEO
funNotifier = new CFanControlNotifier(); funNotifier = new CFanControlNotifier();
if (g_info.delivery_system == DVB_S && (cs_get_revision() < 8)) { 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) ); 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); 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){ if(cs_get_revision() > 7){
miscSettingsGeneral->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MAINMENU_SHUTDOWN)); 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); 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);