mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-28 07:51:19 +02:00
miscsettings_menu.cpp: fix button order
This commit is contained in:
@@ -240,6 +240,8 @@ const CMenuOptionChooser::keyval_ext SLEEPTIMER_MIN_OPTIONS[SLEEPTIMER_MIN_OPTIO
|
||||
//show misc settings menue
|
||||
int CMiscMenue::showMiscSettingsMenu()
|
||||
{
|
||||
int shortcut = 1;
|
||||
|
||||
//misc settings
|
||||
fanNotifier = new CFanControlNotifier();
|
||||
sectionsdConfigNotifier = new CSectionsdConfigNotifier();
|
||||
@@ -281,7 +283,7 @@ int CMiscMenue::showMiscSettingsMenu()
|
||||
//cec settings
|
||||
CCECSetup cecsetup;
|
||||
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);
|
||||
misc_menue.addItem(mf);
|
||||
}
|
||||
@@ -293,25 +295,25 @@ int CMiscMenue::showMiscSettingsMenu()
|
||||
misc_menue.addItem(mf);
|
||||
}
|
||||
//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);
|
||||
misc_menue.addItem(mf);
|
||||
|
||||
//start channels
|
||||
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);
|
||||
misc_menue.addItem(mf);
|
||||
|
||||
#ifdef ENABLE_LCD4LINUX
|
||||
// LCD4Linux Setup
|
||||
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);
|
||||
#endif
|
||||
|
||||
// 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);
|
||||
misc_menue.addItem(mf);
|
||||
|
||||
@@ -319,7 +321,7 @@ int CMiscMenue::showMiscSettingsMenu()
|
||||
//CPU
|
||||
CMenuWidget misc_menue_cpu("CPU", NEUTRINO_ICON_SETTINGS, width);
|
||||
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*/
|
||||
|
||||
int res = misc_menue.exec(NULL, "");
|
||||
|
Reference in New Issue
Block a user