From 0125eb6e15a40781006f5c26c2a9abe49a722a43 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Mon, 6 Dec 2021 05:18:19 +0100 Subject: [PATCH] - start-wizard: formatting code using astyle; some manual code nicenings Conflicts: src/gui/start_wizard.cpp Signed-off-by: Thilo Graf --- src/gui/start_wizard.cpp | 78 ++++++++++++++++++++++++---------------- src/gui/start_wizard.h | 20 +++++------ 2 files changed, 56 insertions(+), 42 deletions(-) diff --git a/src/gui/start_wizard.cpp b/src/gui/start_wizard.cpp index 15ff4edff..c33d34f2e 100644 --- a/src/gui/start_wizard.cpp +++ b/src/gui/start_wizard.cpp @@ -2,11 +2,11 @@ Neutrino-GUI - Tuxbox-Project Copyright (C) 2001 Steffen Hehn 'McClean' http://www.tuxbox.org - + Startup wizard - based upon an implementation created by + based upon an implementation created by Copyright (C) 2009 CoolStream International Ltd. - + Reworked by dbt (Thilo Graf) Copyright (C) 2012 dbt http://www.dbox2-tuning.net @@ -27,15 +27,14 @@ License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - + NOTE for ignorant distributors: It's not allowed to distribute any compiled parts of this code, if you don't accept the terms of GPL. Please read it and understand it right! - This means for you: Hold it, if not, leave it! You could face legal action! + This means for you: Hold it, if not, leave it! You could face legal action! Otherwise ask the copyright owners, anything else would be theft! */ - #include "start_wizard.h" #include @@ -58,7 +57,7 @@ #include -extern cVideo * videoDecoder; +extern cVideo *videoDecoder; extern Zapit_config zapitCfg; using namespace std; @@ -78,59 +77,64 @@ const CMenuOptionChooser::keyval WIZARD_SETUP_TYPE[] = }; #endif -int CStartUpWizard::exec(CMenuTarget* parent, const string & /*actionKey*/) +int CStartUpWizard::exec(CMenuTarget *parent, const string &/*actionKey*/) { + // remove menu-timeout during wizard + int default_timing_menu = g_settings.timing[SNeutrinoSettings::TIMING_MENU]; + g_settings.timing[SNeutrinoSettings::TIMING_MENU] = 0; + //printf("[neutrino] Removing 'timing.menu' during wizard ...\n"); + int res = menu_return::RETURN_REPAINT; showBackgroundLogo(); if (parent) parent->hide(); - //language setup + // 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, ""); - /* hack to ensure system's view of timezone is the same as neutrino's */ + // hack to ensure system's view of timezone is the same as neutrino's CTZChangeNotifier tzn; tzn.changeNotify(NONEXISTANT_LOCALE, (void *)"dummy"); - //restore backup + // restore backup CSettingsManager settingsManager(SNeutrinoSettings::WIZARD_START); settingsManager.exec(NULL, ""); -#if 0 - if(ShowMsg (LOCALE_WIZARD_WELCOME_HEAD, g_Locale->getText(LOCALE_WIZARD_WELCOME_TEXT), CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbrCancel) == CMsgBox::mbrYes) -#endif + //if (ShowMsg(LOCALE_WIZARD_WELCOME_HEAD, g_Locale->getText(LOCALE_WIZARD_WELCOME_TEXT), CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbrCancel) == CMsgBox::mbrYes) { int advanced = 1; #ifdef ENABLE_FASTSCAN std::string lang = g_settings.language; - if (lang == "nederlands") { + if (lang == "nederlands") + { advanced = 0; CMenuWidget wtype(LOCALE_WIZARD_SETUP); wtype.setWizardMode(SNeutrinoSettings::WIZARD_ON); wtype.addIntroItems(); - CMenuOptionChooser * mc = new CMenuOptionChooser(LOCALE_WIZARD_SETUP_TYPE, &advanced, WIZARD_SETUP_TYPE, 2, true, NULL); + CMenuOptionChooser *mc = new CMenuOptionChooser(LOCALE_WIZARD_SETUP_TYPE, &advanced, WIZARD_SETUP_TYPE, 2, true, NULL); mc->setHint("", LOCALE_WIZARD_SETUP_TYPE_HINT); wtype.addItem(mc); wtype.exec(NULL, ""); } #endif - //open video settings in wizardmode - if(advanced && res != menu_return::RETURN_EXIT_ALL) { + // open video settings in wizardmode + if (advanced && res != menu_return::RETURN_EXIT_ALL) + { g_videoSettings->setWizardMode(SNeutrinoSettings::WIZARD_ON); res = g_videoSettings->exec(NULL, ""); g_videoSettings->setWizardMode(SNeutrinoSettings::WIZARD_OFF); } - if(advanced && res != menu_return::RETURN_EXIT_ALL) + if (advanced && res != menu_return::RETURN_EXIT_ALL) { COsdSetup osdSettings(SNeutrinoSettings::WIZARD_ON); res = osdSettings.exec(NULL, ""); } - if(advanced && res != menu_return::RETURN_EXIT_ALL) + if (advanced && res != menu_return::RETURN_EXIT_ALL) { CNetworkSetup::getInstance()->setWizardMode(SNeutrinoSettings::WIZARD_ON); res = CNetworkSetup::getInstance()->exec(NULL, ""); @@ -138,8 +142,8 @@ int CStartUpWizard::exec(CMenuTarget* parent, const string & /*actionKey*/) } #if ENABLE_PKG_MANAGEMENT - //package update check - if(advanced && res != menu_return::RETURN_EXIT_ALL) + // package update check + if (advanced && res != menu_return::RETURN_EXIT_ALL) { COPKGManager man(SNeutrinoSettings::WIZARD_START); if (man.hasOpkgSupport()) @@ -158,34 +162,40 @@ int CStartUpWizard::exec(CMenuTarget* parent, const string & /*actionKey*/) if (CFEManager::getInstance()->haveSat()) init_settings = file_exists(CONFIGDIR "/initial/"); - if(advanced && init_settings && (res != menu_return::RETURN_EXIT_ALL)) + if (advanced && init_settings && (res != menu_return::RETURN_EXIT_ALL)) { if (ShowMsg(LOCALE_WIZARD_INITIAL_SETTINGS, g_Locale->getText(LOCALE_WIZARD_INSTALL_SETTINGS), - CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NULL, 450, 30) == CMsgBox::mbrYes) { + CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NULL, 450, 30) == CMsgBox::mbrYes) + { system("/bin/cp " CONFIGDIR "/initial/* " ZAPITDIR); CFEManager::getInstance()->loadSettings(); CFEManager::getInstance()->saveSettings(); CZapit::getInstance()->PrepareChannels(); } } - if(res != menu_return::RETURN_EXIT_ALL) + if (res != menu_return::RETURN_EXIT_ALL) { CScanSetup::getInstance()->setWizardMode(SNeutrinoSettings::WIZARD_ON); - if (advanced) { + if (advanced) + { res = CScanSetup::getInstance()->exec(NULL, "setup_frontend"); - if(res != menu_return::RETURN_EXIT_ALL) + if (res != menu_return::RETURN_EXIT_ALL) res = CScanSetup::getInstance()->exec(NULL, ""); - } else { + } + else + { CZapit::getInstance()->GetConfig(zapitCfg); #ifdef ENABLE_FASTSCAN - if (CFEManager::getInstance()->haveSat()) { + if (CFEManager::getInstance()->haveSat()) + { CMenuWidget fastScanMenu(LOCALE_SATSETUP_FASTSCAN_HEAD, NEUTRINO_ICON_SETTINGS, 45, MN_WIDGET_ID_SCAN_FAST_SCAN); fastScanMenu.setWizardMode(SNeutrinoSettings::WIZARD_ON); CScanSetup::getInstance()->addScanMenuFastScan(&fastScanMenu); res = fastScanMenu.exec(NULL, ""); } #endif - if (CFEManager::getInstance()->haveCable()) { + if (CFEManager::getInstance()->haveCable()) + { CMenuWidget cableScan(LOCALE_SATSETUP_CABLE, NEUTRINO_ICON_SETTINGS, 45, MN_WIDGET_ID_SCAN_CABLE_SCAN); cableScan.setWizardMode(SNeutrinoSettings::WIZARD_ON); CScanSetup::getInstance()->addScanMenuCable(&cableScan); @@ -196,6 +206,13 @@ int CStartUpWizard::exec(CMenuTarget* parent, const string & /*actionKey*/) } } + // reset menu-timeout to our default if user doesn't change the value + if (g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0) + { + g_settings.timing[SNeutrinoSettings::TIMING_MENU] = default_timing_menu; + //printf("[neutrino] Set 'timing.menu' to default...\n"); + } + killBackgroundLogo(); return res; } @@ -209,4 +226,3 @@ inline void CStartUpWizard::killBackgroundLogo() { CFrameBuffer::getInstance()->stopFrame(); } - diff --git a/src/gui/start_wizard.h b/src/gui/start_wizard.h index 4b8e51641..95ddeb7f9 100644 --- a/src/gui/start_wizard.h +++ b/src/gui/start_wizard.h @@ -2,11 +2,11 @@ Neutrino-GUI - Tuxbox-Project Copyright (C) 2001 Steffen Hehn 'McClean' http://www.tuxbox.org - + Startup wizard - based upon an implementation created by + based upon an implementation created by Copyright (C) 2009 CoolStream International Ltd. - + Reworked by dbt (Thilo Graf) Copyright (C) 2012 dbt http://www.dbox2-tuning.net @@ -27,11 +27,11 @@ License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - + NOTE for ignorant distributors: It's not allowed to distribute any compiled parts of this code, if you don't accept the terms of GPL. Please read it and understand it right! - This means for you: Hold it, if not, leave it! You could face legal action! + This means for you: Hold it, if not, leave it! You could face legal action! Otherwise ask the copyright owners, anything else would be theft! */ @@ -42,18 +42,16 @@ #include #include - class CStartUpWizard : public CMenuTarget { - private: + private: void showBackgroundLogo(); void killBackgroundLogo(); - public: + public: CStartUpWizard(); ~CStartUpWizard(); - - int exec(CMenuTarget* parent, const std::string & actionKey); + + int exec(CMenuTarget *parent, const std::string &actionKey); }; - #endif