mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 00:11:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

miscsettings_menu.cpp: fix button order

Browse Source
This commit is contained in:
GetAway
2019-01-03 17:42:03 +01:00
parent fdeb594750
commit 9f642a1852
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/miscsettings_menu.cpp
View File

@@ -240,6 +240,8 @@ const CMenuOptionChooser::keyval_ext SLEEPTIMER_MIN_OPTIONS[SLEEPTIMER_MIN_OPTIO
//show misc settings menue //show misc settings menue
int CMiscMenue::showMiscSettingsMenu() int CMiscMenue::showMiscSettingsMenu()
{ {
int shortcut = 1;
//misc settings //misc settings
fanNotifier = new CFanControlNotifier(); fanNotifier = new CFanControlNotifier();
sectionsdConfigNotifier = new CSectionsdConfigNotifier(); sectionsdConfigNotifier = new CSectionsdConfigNotifier();
@@ -281,7 +283,7 @@ int CMiscMenue::showMiscSettingsMenu()
//cec settings //cec settings
CCECSetup cecsetup; CCECSetup cecsetup;
if (g_info.hw_caps->can_cec) { if (g_info.hw_caps->can_cec) {
mf = new CMenuForwarder(LOCALE_VIDEOMENU_HDMI_CEC, true, NULL, &cecsetup, NULL, CRCInput::RC_1); mf = new CMenuForwarder(LOCALE_VIDEOMENU_HDMI_CEC, true, NULL, &cecsetup, NULL, CRCInput::convertDigitToKey(shortcut++));
mf->setHint("", LOCALE_MENU_HINT_MISC_CEC); mf->setHint("", LOCALE_MENU_HINT_MISC_CEC);
misc_menue.addItem(mf); misc_menue.addItem(mf);
} }
@@ -293,25 +295,25 @@ int CMiscMenue::showMiscSettingsMenu()
misc_menue.addItem(mf); misc_menue.addItem(mf);
} }
//channellist //channellist
mf = new CMenuForwarder(LOCALE_MISCSETTINGS_CHANNELLIST, true, NULL, this, "channellist", CRCInput::RC_2); mf = new CMenuForwarder(LOCALE_MISCSETTINGS_CHANNELLIST, true, NULL, this, "channellist", CRCInput::convertDigitToKey(shortcut++));
mf->setHint("", LOCALE_MENU_HINT_MISC_CHANNELLIST); mf->setHint("", LOCALE_MENU_HINT_MISC_CHANNELLIST);
misc_menue.addItem(mf); misc_menue.addItem(mf);
//start channels //start channels
CZapitSetup zapitsetup; CZapitSetup zapitsetup;
mf = new CMenuForwarder(LOCALE_ZAPITSETUP_HEAD, true, NULL, &zapitsetup, NULL, CRCInput::RC_3); mf = new CMenuForwarder(LOCALE_ZAPITSETUP_HEAD, true, NULL, &zapitsetup, NULL, CRCInput::convertDigitToKey(shortcut++));
mf->setHint("", LOCALE_MENU_HINT_MISC_ZAPIT); mf->setHint("", LOCALE_MENU_HINT_MISC_ZAPIT);
misc_menue.addItem(mf); misc_menue.addItem(mf);
#ifdef ENABLE_LCD4LINUX #ifdef ENABLE_LCD4LINUX
// LCD4Linux Setup // LCD4Linux Setup
CLCD4lSetup lcd4lSetup; CLCD4lSetup lcd4lSetup;
mf = new CMenuForwarder(LOCALE_LCD4L_SUPPORT, !find_executable("lcd4linux").empty(), NULL, &lcd4lSetup, NULL, CRCInput::RC_4); mf = new CMenuForwarder(LOCALE_LCD4L_SUPPORT, !find_executable("lcd4linux").empty(), NULL, &lcd4lSetup, NULL, CRCInput::convertDigitToKey(shortcut++));
misc_menue.addItem(mf); misc_menue.addItem(mf);
#endif #endif
// onlineservices // onlineservices
mf = new CMenuForwarder(LOCALE_MISCSETTINGS_ONLINESERVICES, true, NULL, this, "onlineservices", CRCInput::RC_5); mf = new CMenuForwarder(LOCALE_MISCSETTINGS_ONLINESERVICES, true, NULL, this, "onlineservices", CRCInput::convertDigitToKey(shortcut++));
mf->setHint("", LOCALE_MENU_HINT_MISC_ONLINESERVICES); mf->setHint("", LOCALE_MENU_HINT_MISC_ONLINESERVICES);
misc_menue.addItem(mf); misc_menue.addItem(mf);
@@ -319,7 +321,7 @@ int CMiscMenue::showMiscSettingsMenu()
//CPU //CPU
CMenuWidget misc_menue_cpu("CPU", NEUTRINO_ICON_SETTINGS, width); CMenuWidget misc_menue_cpu("CPU", NEUTRINO_ICON_SETTINGS, width);
showMiscSettingsMenuCPUFreq(&misc_menue_cpu); showMiscSettingsMenuCPUFreq(&misc_menue_cpu);
misc_menue.addItem( new CMenuForwarder("CPU", true, NULL, &misc_menue_cpu, NULL, CRCInput::RC_6)); misc_menue.addItem( new CMenuForwarder("CPU", true, NULL, &misc_menue_cpu, NULL, CRCInput::convertDigitToKey(shortcut++)));
#endif /*CPU_FREQ*/ #endif /*CPU_FREQ*/
int res = misc_menue.exec(NULL, ""); int res = misc_menue.exec(NULL, "");