diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index fa95541f8..56ce93573 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -40,6 +40,7 @@ #include "gui/keybind_setup.h" #include "gui/plugins.h" #include "gui/sleeptimer.h" +#include "gui/zapit_setup.h" #include #include @@ -197,13 +198,18 @@ void CMiscMenue::showMiscSettingsMenu() showMiscSettingsMenuFBrowser(misc_menue_fbrowser); misc_menue->addItem( new CMenuForwarder(LOCALE_FILEBROWSER_HEAD, true, NULL, misc_menue_fbrowser, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE)); + misc_menue->addItem(GenericMenuSeparatorLine); + //cec settings - misc_menue->addItem(new CMenuForwarder(LOCALE_VIDEOMENU_HDMI_CEC, true, NULL, new CCECSetup() , NULL, CRCInput::RC_0)); + misc_menue->addItem(new CMenuForwarder(LOCALE_VIDEOMENU_HDMI_CEC, true, NULL, new CCECSetup() , NULL, CRCInput::RC_1)); //channellist CMenuWidget *misc_menue_chanlist = new CMenuWidget(LOCALE_MISCSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width); showMiscSettingsMenuChanlist(misc_menue_chanlist); - misc_menue->addItem( new CMenuForwarder(LOCALE_MISCSETTINGS_CHANNELLIST, true, NULL, misc_menue_chanlist, NULL, CRCInput::RC_1)); + misc_menue->addItem( new CMenuForwarder(LOCALE_MISCSETTINGS_CHANNELLIST, true, NULL, misc_menue_chanlist, NULL, CRCInput::RC_2)); + + //start channels + misc_menue->addItem(new CMenuForwarder(LOCALE_ZAPITSETUP_HEAD, true, NULL, new CZapitSetup() , NULL, CRCInput::RC_3)); #ifdef CPU_FREQ //CPU diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index 9387078b1..d53ccd410 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -75,7 +75,6 @@ #endif /*TEST_MENU*/ #include "gui/update.h" #include "gui/vfd_setup.h" -#include "gui/zapit_setup.h" #include "gui/widget/stringinput.h" #include "gui/widget/stringinput_ext.h" @@ -802,10 +801,9 @@ void CNeutrinoApp::InitServiceSettings(CMenuWidget &service, CMenuWidget &_scanS // service.addItem(new CMenuForwarder(LOCALE_EXTRA_ZAPIT_MENU , true, NULL, zapit_menu, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN)); service.addItem(new CMenuForwarder(LOCALE_SERVICEMENU_RELOAD , true, NULL, this, "reloadchannels", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN )); service.addItem(new CMenuForwarder(LOCALE_BOUQUETEDITOR_NAME , true, NULL, new CBEBouquetWidget(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW )); - service.addItem(new CMenuForwarder(LOCALE_ZAPITSETUP_HEAD, true, NULL, new CZapitSetup() , NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE )); CDataResetNotifier * resetNotifier = new CDataResetNotifier(); - service.addItem(new CMenuForwarder(LOCALE_RESET_CHANNELS , true, NULL, resetNotifier, "channels", CRCInput::RC_1)); + service.addItem(new CMenuForwarder(LOCALE_RESET_CHANNELS , true, NULL, resetNotifier, "channels", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE)); service.addItem(GenericMenuSeparatorLine); service.addItem(new CMenuForwarder(LOCALE_SERVICEMENU_RESTART , true, NULL, this, "restart", CRCInput::RC_standby, NEUTRINO_ICON_BUTTON_POWER));