From f26b53d4addb1788e2b8c724e5de3724851ecdd7 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 15 May 2015 03:39:24 +0200 Subject: [PATCH] start_wizard: use a global enum; switch detection from bool to int Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/af90286a305d788498b523a9f0675e03e2154fd8 Author: vanhofen Date: 2015-05-15 (Fri, 15 May 2015) Origin message was: ------------------ - start_wizard: use a global enum; switch detection from bool to int ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/audio_setup.cpp | 9 +-------- src/gui/audio_setup.h | 13 +++---------- src/gui/network_setup.cpp | 9 +-------- src/gui/network_setup.h | 14 +++----------- src/gui/osd_setup.cpp | 2 +- src/gui/osd_setup.h | 10 ++-------- src/gui/osdlang_setup.cpp | 2 +- src/gui/osdlang_setup.h | 12 ++---------- src/gui/scan_setup.cpp | 9 +-------- src/gui/scan_setup.h | 13 +++---------- src/gui/settings_manager.cpp | 2 +- src/gui/settings_manager.h | 10 ++-------- src/gui/start_wizard.cpp | 29 +++++++++++++---------------- src/gui/videosettings.cpp | 9 +-------- src/gui/videosettings.h | 13 +++---------- src/gui/widget/menue.cpp | 4 ++-- src/gui/widget/menue.h | 4 ++-- src/system/settings.h | 6 ++++++ 18 files changed, 48 insertions(+), 122 deletions(-) diff --git a/src/gui/audio_setup.cpp b/src/gui/audio_setup.cpp index 7f2d02f8f..27f8cb3a4 100644 --- a/src/gui/audio_setup.cpp +++ b/src/gui/audio_setup.cpp @@ -52,7 +52,7 @@ extern CAudioSetupNotifier * audioSetupNotifier; extern cAudio *audioDecoder; -CAudioSetup::CAudioSetup(bool wizard_mode) +CAudioSetup::CAudioSetup(int wizard_mode) { is_wizard = wizard_mode; @@ -255,13 +255,6 @@ int CAudioSetup::showAudioSetup() return res; } -//sets menu mode to "wizard" or "default" -void CAudioSetup::setWizardMode(bool mode) -{ - printf("[neutrino audio setup] %s set audio settings menu to mode %d...\n", __FUNCTION__, mode); - is_wizard = mode; -} - CTruVolumeNotifier::CTruVolumeNotifier(CMenuOptionChooser* o1, CMenuOptionChooser* o2, CMenuOptionNumberChooser *n1) { toDisable_oj[0]=o1; diff --git a/src/gui/audio_setup.h b/src/gui/audio_setup.h index 603643c20..ecb54a3fa 100644 --- a/src/gui/audio_setup.h +++ b/src/gui/audio_setup.h @@ -39,22 +39,15 @@ class CAudioSetup : public CMenuTarget { private: int width, selected; - bool is_wizard; + int is_wizard; int showAudioSetup(); public: - enum AUDIO_SETUP_MODE - { - AUDIO_SETUP_MODE_WIZARD_NO = 0, - AUDIO_SETUP_MODE_WIZARD = 1 - }; - - CAudioSetup(bool wizard_mode = AUDIO_SETUP_MODE_WIZARD_NO); + CAudioSetup(int wizard_mode = SNeutrinoSettings::WIZARD_OFF); ~CAudioSetup(); - bool getWizardMode() {return is_wizard;}; - void setWizardMode(bool mode); + void setWizardMode(int mode) {is_wizard = mode;}; int exec(CMenuTarget* parent, const std::string & actionKey); }; diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp index d51c295e3..87097ae20 100644 --- a/src/gui/network_setup.cpp +++ b/src/gui/network_setup.cpp @@ -65,7 +65,7 @@ extern int pinghost (const std::string &hostname, std::string *ip = NULL); -CNetworkSetup::CNetworkSetup(bool wizard_mode) +CNetworkSetup::CNetworkSetup(int wizard_mode) { networkConfig = CNetworkConfig::getInstance(); @@ -671,13 +671,6 @@ bool CNetworkSetup::changeNotify(const neutrino_locale_t locale, void * /*Data*/ return false; } -//sets menu mode to "wizard" or "default" -void CNetworkSetup::setWizardMode(bool mode) -{ - printf("[neutrino network setup] %s set network settings menu to mode %d...\n", __FUNCTION__, mode); - is_wizard = mode; -} - void CNetworkSetup::showCurrentNetworkSettings() { std::string ip, mask, broadcast, router, nameserver, text; diff --git a/src/gui/network_setup.h b/src/gui/network_setup.h index 04676b1cd..31b626b80 100644 --- a/src/gui/network_setup.h +++ b/src/gui/network_setup.h @@ -45,8 +45,7 @@ class CNetworkSetup : public CMenuTarget, CChangeObserver CNetworkConfig *networkConfig; int width; - - bool is_wizard; + int is_wizard; int network_dhcp; int network_automatic_start; @@ -117,19 +116,12 @@ class CNetworkSetup : public CMenuTarget, CChangeObserver NETWORK_NTP_ON = 1 }; - enum NETWORK_SETUP_MODE - { - N_SETUP_MODE_WIZARD_NO = 0, - N_SETUP_MODE_WIZARD = 1 - }; - - CNetworkSetup(bool wizard_mode = N_SETUP_MODE_WIZARD_NO); + CNetworkSetup(int wizard_mode = SNeutrinoSettings::WIZARD_OFF); ~CNetworkSetup(); static CNetworkSetup* getInstance(); - bool getWizardMode() {return is_wizard;}; - void setWizardMode(bool mode); + void setWizardMode(int mode) {is_wizard = mode;}; int exec(CMenuTarget* parent, const std::string & actionKey); virtual bool changeNotify(const neutrino_locale_t, void * Data); diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 7134d5c67..5cd3be41b 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -67,7 +67,7 @@ extern CRemoteControl * g_RemoteControl; extern const char * locale_real_names[]; extern std::string ttx_font_file; -COsdSetup::COsdSetup(bool wizard_mode) +COsdSetup::COsdSetup(int wizard_mode) { frameBuffer = CFrameBuffer::getInstance(); colorSetupNotifier = new CColorSetupNotifier(); diff --git a/src/gui/osd_setup.h b/src/gui/osd_setup.h index 69346b551..a461957f8 100644 --- a/src/gui/osd_setup.h +++ b/src/gui/osd_setup.h @@ -59,7 +59,7 @@ class COsdSetup : public CMenuTarget, public CChangeObserver COnOffNotifier* infobarHddNotifier; int width; - bool is_wizard; + int is_wizard; int show_menu_hints; int show_tuner_icon; @@ -95,13 +95,7 @@ class COsdSetup : public CMenuTarget, public CChangeObserver INFOBAR_LOGO_SHADED }; - enum OSD_SETUP_MODE - { - OSD_SETUP_MODE_WIZARD_NO = 0, - OSD_SETUP_MODE_WIZARD = 1 - }; - - COsdSetup(bool wizard_mode = OSD_SETUP_MODE_WIZARD_NO); + COsdSetup(int wizard_mode = SNeutrinoSettings::WIZARD_OFF); ~COsdSetup(); int exec(CMenuTarget* parent, const std::string & actionKey); bool changeNotify(const neutrino_locale_t OptionName, void * /*data*/); diff --git a/src/gui/osdlang_setup.cpp b/src/gui/osdlang_setup.cpp index 3c61bd5a3..dbf05ff02 100644 --- a/src/gui/osdlang_setup.cpp +++ b/src/gui/osdlang_setup.cpp @@ -55,7 +55,7 @@ -COsdLangSetup::COsdLangSetup(bool wizard_mode) +COsdLangSetup::COsdLangSetup(int wizard_mode) { is_wizard = wizard_mode; diff --git a/src/gui/osdlang_setup.h b/src/gui/osdlang_setup.h index e99125d76..ce8e58208 100644 --- a/src/gui/osdlang_setup.h +++ b/src/gui/osdlang_setup.h @@ -52,8 +52,7 @@ class COsdLangSetup : public CMenuTarget, CChangeObserver { private: int width; - - bool is_wizard; + int is_wizard; CTZChangeNotifier * tzNotifier; int showLocalSetup(); @@ -61,17 +60,10 @@ class COsdLangSetup : public CMenuTarget, CChangeObserver CMenuOptionStringChooser* getTzItems(); - bool changeNotify(const neutrino_locale_t, void *); public: - enum OSDLANG_SETUP_MODE - { - OSDLANG_SETUP_MODE_WIZARD_NO = 0, - OSDLANG_SETUP_MODE_WIZARD = 1 - }; - - COsdLangSetup(bool wizard_mode = OSDLANG_SETUP_MODE_WIZARD_NO); + COsdLangSetup(int wizard_mode = SNeutrinoSettings::WIZARD_OFF); ~COsdLangSetup(); int exec(CMenuTarget* parent, const std::string & actionKey); void showLanguageSetup(CMenuWidget *osdl_setup); diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index f5cea72b6..426eb0166 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -314,7 +314,7 @@ const CMenuOptionChooser::keyval SATSETUP_FRONTEND_MODE[SATSETUP_FRONTEND_MODE_C { CFrontend::FE_MODE_LINK_TWIN, LOCALE_SATSETUP_FE_MODE_LINK_TWIN }, }; -CScanSetup::CScanSetup(bool wizard_mode) +CScanSetup::CScanSetup(int wizard_mode) { width = 40; is_wizard = wizard_mode; @@ -1762,13 +1762,6 @@ int CScanSetup::addListFlagsItems(CMenuWidget *listflags_menu, const int &shortc return shortCut; } -//sets menu mode to "wizard" or "default" -void CScanSetup::setWizardMode(bool mode) -{ - printf("[neutrino] CScanSetup %s set scan-setup to mode %d...\n", __FUNCTION__, mode); - is_wizard = mode; -} - //save current settings void CScanSetup::saveScanSetup() { diff --git a/src/gui/scan_setup.h b/src/gui/scan_setup.h index 93c7188e7..bb1432de8 100644 --- a/src/gui/scan_setup.h +++ b/src/gui/scan_setup.h @@ -89,7 +89,7 @@ class CScanSetup : public CMenuTarget, public CChangeObserver /* flag to skip manual params update while in menu */ bool in_menu; - bool is_wizard; + int is_wizard; int r_system; @@ -124,20 +124,13 @@ class CScanSetup : public CMenuTarget, public CChangeObserver void saveScanSetup(); - CScanSetup(bool wizard_mode = SCAN_SETUP_MODE_WIZARD_NO); + CScanSetup(int wizard_mode = SNeutrinoSettings::WIZARD_OFF); public: - enum SCAN_SETUP_MODE - { - SCAN_SETUP_MODE_WIZARD_NO = 0, - SCAN_SETUP_MODE_WIZARD = 1 - }; - ~CScanSetup(); static CScanSetup* getInstance(); - bool getWizardMode() {return is_wizard;}; - void setWizardMode(bool mode); + void setWizardMode(int mode) {is_wizard = mode;}; void updateManualSettings(); int exec(CMenuTarget* parent, const std::string & actionKey = ""); diff --git a/src/gui/settings_manager.cpp b/src/gui/settings_manager.cpp index 9271dcd85..ebb1d8515 100644 --- a/src/gui/settings_manager.cpp +++ b/src/gui/settings_manager.cpp @@ -48,7 +48,7 @@ -CSettingsManager::CSettingsManager(bool wizard_mode) +CSettingsManager::CSettingsManager(int wizard_mode) { width = 40; is_wizard = wizard_mode; diff --git a/src/gui/settings_manager.h b/src/gui/settings_manager.h index e94d77795..f5ebe3d03 100644 --- a/src/gui/settings_manager.h +++ b/src/gui/settings_manager.h @@ -39,19 +39,13 @@ class CSettingsManager : public CMenuTarget { private: int width; - bool is_wizard; + int is_wizard; int showMenu(); int showMenu_wizard(); public: - enum SETTINGSMANAGER_MODE - { - SETTINGSMANAGER_MODE_WIZARD_NO = 0, - SETTINGSMANAGER_MODE_WIZARD = 1 - }; - - CSettingsManager(bool wizard_mode = SETTINGSMANAGER_MODE_WIZARD_NO); + CSettingsManager(int wizard_mode = SNeutrinoSettings::WIZARD_OFF); ~CSettingsManager(); int exec(CMenuTarget* parent, const std::string & actionKey = ""); diff --git a/src/gui/start_wizard.cpp b/src/gui/start_wizard.cpp index 28c9304ed..dddbc7ece 100644 --- a/src/gui/start_wizard.cpp +++ b/src/gui/start_wizard.cpp @@ -81,18 +81,15 @@ int CStartUpWizard::exec(CMenuTarget* parent, const string & /*actionKey*/) if (parent) parent->hide(); - COsdLangSetup languageSettings(COsdLangSetup::OSDLANG_SETUP_MODE_WIZARD); - -#if 0 - languageSettings.exec(NULL, ""); -#endif //language setup + COsdLangSetup languageSettings(SNeutrinoSettings::WIZARD_START); CMenuWidget osdl_setup(LOCALE_LANGUAGESETUP_OSD, NEUTRINO_ICON_LANGUAGE, 45, MN_WIDGET_ID_LANGUAGESETUP_LOCALE); osdl_setup.setWizardMode(true); languageSettings.showLanguageSetup(&osdl_setup); osdl_setup.exec(NULL, ""); - CSettingsManager settingsManager(CSettingsManager::SETTINGSMANAGER_MODE_WIZARD); + //restore backup + CSettingsManager settingsManager(SNeutrinoSettings::WIZARD_START); settingsManager.exec(NULL, ""); if(ShowMsg (LOCALE_WIZARD_WELCOME_HEAD, g_Locale->getText(LOCALE_WIZARD_WELCOME_TEXT), CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbrCancel) == CMessageBox::mbrYes) @@ -103,7 +100,7 @@ int CStartUpWizard::exec(CMenuTarget* parent, const string & /*actionKey*/) if (lang == "nederlands") { advanced = 0; CMenuWidget wtype(LOCALE_WIZARD_SETUP); - wtype.setWizardMode(true); + wtype.setWizardMode(SNeutrinoSettings::WIZARD_ON); wtype.addIntroItems(); CMenuOptionChooser * mc = new CMenuOptionChooser(LOCALE_WIZARD_SETUP_TYPE, &advanced, WIZARD_SETUP_TYPE, 2, true, NULL); mc->setHint("", LOCALE_WIZARD_SETUP_TYPE_HINT); @@ -113,20 +110,20 @@ int CStartUpWizard::exec(CMenuTarget* parent, const string & /*actionKey*/) #endif //open video settings in wizardmode if(advanced && res != menu_return::RETURN_EXIT_ALL) { - g_videoSettings->setWizardMode(CVideoSettings::V_SETUP_MODE_WIZARD); + g_videoSettings->setWizardMode(SNeutrinoSettings::WIZARD_ON); res = g_videoSettings->exec(NULL, ""); - g_videoSettings->setWizardMode(CVideoSettings::V_SETUP_MODE_WIZARD_NO); + g_videoSettings->setWizardMode(SNeutrinoSettings::WIZARD_OFF); } if(!g_settings.easymenu && advanced && res != menu_return::RETURN_EXIT_ALL) { - COsdSetup osdSettings(COsdSetup::OSD_SETUP_MODE_WIZARD); + COsdSetup osdSettings(SNeutrinoSettings::WIZARD_ON); res = osdSettings.exec(NULL, ""); } if(advanced && res != menu_return::RETURN_EXIT_ALL) { - CNetworkSetup::getInstance()->setWizardMode(CNetworkSetup::N_SETUP_MODE_WIZARD); + CNetworkSetup::getInstance()->setWizardMode(SNeutrinoSettings::WIZARD_ON); res = CNetworkSetup::getInstance()->exec(NULL, ""); - CNetworkSetup::getInstance()->setWizardMode(CNetworkSetup::N_SETUP_MODE_WIZARD_NO); + CNetworkSetup::getInstance()->setWizardMode(SNeutrinoSettings::WIZARD_OFF); } bool init_settings = false; if (CFEManager::getInstance()->haveSat()) @@ -144,7 +141,7 @@ int CStartUpWizard::exec(CMenuTarget* parent, const string & /*actionKey*/) } if(res != menu_return::RETURN_EXIT_ALL) { - CScanSetup::getInstance()->setWizardMode(CScanSetup::SCAN_SETUP_MODE_WIZARD); + CScanSetup::getInstance()->setWizardMode(SNeutrinoSettings::WIZARD_ON); if (advanced) { res = CScanSetup::getInstance()->exec(NULL, "setup_frontend"); if(res != menu_return::RETURN_EXIT_ALL) @@ -154,19 +151,19 @@ int CStartUpWizard::exec(CMenuTarget* parent, const string & /*actionKey*/) #ifdef ENABLE_FASTSCAN if (CFEManager::getInstance()->haveSat()) { CMenuWidget fastScanMenu(LOCALE_SATSETUP_FASTSCAN_HEAD, NEUTRINO_ICON_SETTINGS, 45, MN_WIDGET_ID_SCAN_FAST_SCAN); - fastScanMenu.setWizardMode(true); + fastScanMenu.setWizardMode(SNeutrinoSettings::WIZARD_ON); CScanSetup::getInstance()->addScanMenuFastScan(&fastScanMenu); res = fastScanMenu.exec(NULL, ""); } #endif if (CFEManager::getInstance()->haveCable()) { CMenuWidget cableScan(LOCALE_SATSETUP_CABLE, NEUTRINO_ICON_SETTINGS, 45, MN_WIDGET_ID_SCAN_CABLE_SCAN); - cableScan.setWizardMode(true); + cableScan.setWizardMode(SNeutrinoSettings::WIZARD_ON); CScanSetup::getInstance()->addScanMenuCable(&cableScan); res = cableScan.exec(NULL, ""); } } - CScanSetup::getInstance()->setWizardMode(CScanSetup::SCAN_SETUP_MODE_WIZARD_NO); + CScanSetup::getInstance()->setWizardMode(SNeutrinoSettings::WIZARD_OFF); } } diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index c91077af4..d2d3b1b37 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -65,7 +65,7 @@ extern cVideo *pipDecoder; extern int prev_video_mode; extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */ -CVideoSettings::CVideoSettings(bool wizard_mode) +CVideoSettings::CVideoSettings(int wizard_mode) { frameBuffer = CFrameBuffer::getInstance(); @@ -616,10 +616,3 @@ void CVideoSettings::nextMode(void) CVFD::getInstance()->showServicename(g_RemoteControl->getCurrentChannelName(), g_RemoteControl->getCurrentChannelNumber()); //ShowHint(LOCALE_VIDEOMENU_VIDEOMODE, text, 450, 2); } - -//sets menu mode to "wizard" or "default" -void CVideoSettings::setWizardMode(bool mode) -{ - printf("[neutrino VideoSettings] %s set video settings menu to mode %d...\n", __FUNCTION__, mode); - is_wizard = mode; -} diff --git a/src/gui/videosettings.h b/src/gui/videosettings.h index 7cdeebfac..824b4ed3a 100644 --- a/src/gui/videosettings.h +++ b/src/gui/videosettings.h @@ -45,19 +45,13 @@ class CVideoSettings : public CMenuWidget, CChangeObserver int vcr_video_out_signal; int prev_video_mode; - bool is_wizard; + int is_wizard; int width, selected; int showVideoSetup(); public: - enum VIDEO_SETUP_MODE - { - V_SETUP_MODE_WIZARD_NO = 0, - V_SETUP_MODE_WIZARD = 1 - }; - - CVideoSettings(bool wizard_mode = V_SETUP_MODE_WIZARD_NO); + CVideoSettings(int wizard_mode = SNeutrinoSettings::WIZARD_OFF); ~CVideoSettings(); virtual bool changeNotify(const neutrino_locale_t OptionName, void *data); @@ -69,8 +63,7 @@ public: void setVideoSettings(); void setupVideoSystem(bool do_ask); - bool getWizardMode() {return is_wizard;}; - void setWizardMode(bool mode); + void setWizardMode(int mode) {is_wizard = mode;}; int exec(CMenuTarget* parent, const std::string & actionKey); }; diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 13f671eae..d8afdd2fe 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -493,7 +493,7 @@ CMenuWidget::CMenuWidget() selected = -1; iconOffset = 0; offx = offy = 0; - from_wizard = false; + from_wizard = SNeutrinoSettings::WIZARD_OFF; fade = true; sb_width = 0; savescreen = false; @@ -562,7 +562,7 @@ void CMenuWidget::Init(const std::string &Icon, const int mwidth, const mn_widge current_page = 0; offx = offy = 0; - from_wizard = false; + from_wizard = SNeutrinoSettings::WIZARD_OFF; fade = true; savescreen = false; background = NULL; diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h index 6d3c20ed4..968eba85e 100644 --- a/src/gui/widget/menue.h +++ b/src/gui/widget/menue.h @@ -528,7 +528,7 @@ class CMenuWidget : public CMenuTarget unsigned int current_page; unsigned int total_pages; bool exit_pressed; - bool from_wizard; + int from_wizard; bool fade; bool washidden; int nextShortcut; @@ -574,7 +574,7 @@ class CMenuWidget : public CMenuTarget int getSelected()const { return selected; }; void move(int xoff, int yoff); int getSelectedLine(void)const {return exit_pressed ? -1 : selected;}; - void setWizardMode(bool _from_wizard) { from_wizard = _from_wizard;}; + void setWizardMode(int _from_wizard) { from_wizard = _from_wizard;}; void enableFade(bool _enable) { fade = _enable; }; void enableSaveScreen(bool enable); void paintHint(int num); diff --git a/src/system/settings.h b/src/system/settings.h index 9fa4a64e7..85b6b3666 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -764,6 +764,12 @@ struct SNeutrinoSettings INFOBAR_PROGRESSBAR_ARRANGEMENT_BETWEEN_EVENTS = 3 }INFOBAR_PROGRESSBAR_ARRANGEMENT_TYPES; + enum WIZARD_MODES + { + WIZARD_OFF = 0, + WIZARD_START = 1, + WIZARD_ON = 2 + }; }; /* some default Values */