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

Merge remote-tracking branch 'uncool/cst-next'

Browse Source 
This need buildfixes and some functional updates...
This commit is contained in:
Stefan Seyfried
2015-12-13 17:41:55 +01:00
parent 83c385c126 8f810d52fa
commit eeee5bacab
320 changed files with 21291 additions and 13199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/gui/settings_manager.cpp
View File

@@ -40,6 +40,7 @@
#include <gui/widget/stringinput.h>
#include <gui/widget/keyboard_input.h>
#include <driver/display.h>
#include <driver/screen_max.h>
#include <driver/display.h>
#include <system/helpers.h>
@@ -48,9 +49,10 @@
CSettingsManager::CSettingsManager()
CSettingsManager::CSettingsManager(int wizard_mode)
{
width = w_max (40, 10);
width = 40;
is_wizard = wizard_mode;
}
@@ -136,11 +138,35 @@ int CSettingsManager::exec(CMenuTarget* parent, const std::string &actionKey)
return res;
}
res = showMenu();
res = is_wizard ? showMenu_wizard() : showMenu();
return res;
}
//use a own small menu for start_wizard, because i don't want to fiddle around the easymenu code
int CSettingsManager::showMenu_wizard()
{
printf("[neutrino] CSettingsManager call %s...\n", __FUNCTION__);
CMenuWidget * mset = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_SETTINGS_MNGR);
mset->setWizardMode(is_wizard);
mset->addIntroItems(LOCALE_MAINSETTINGS_MANAGE);
CMenuForwarder * mf;
mf = new CMenuForwarder(LOCALE_EXTRA_LOADCONFIG, true, NULL, this, "loadconfig", CRCInput::RC_red);
mf->setHint(NEUTRINO_ICON_HINT_LOAD, LOCALE_MENU_HINT_LOAD);
mset->addItem(mf);
mf = new CMenuForwarder(LOCALE_SETTINGS_RESTORE, true, NULL, this, "restore", CRCInput::RC_green);
mf->setHint(NEUTRINO_ICON_HINT_BACKUP, LOCALE_MENU_HINT_BACKUP);
mset->addItem(mf);
int res = mset->exec(NULL, "");
delete mset;
return res;
}
int CSettingsManager::showMenu()
{
printf("[neutrino] CSettingsManager call %s...\n", __FUNCTION__);