mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

- settingsmanager: remember selected position

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1925 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
striper
2011-11-29 17:00:13 +00:00
parent a1a89b92a6
commit 59a76e5264
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/settings_manager.cpp
View File

@@ -50,14 +50,11 @@
CSettingsManager::CSettingsManager() CSettingsManager::CSettingsManager()
{ {
width = w_max (40, 10); width = w_max (40, 10);
selected = -1;
} }
CSettingsManager::~CSettingsManager() CSettingsManager::~CSettingsManager()
{ {
} }
int CSettingsManager::exec(CMenuTarget* parent, const std::string &actionKey) int CSettingsManager::exec(CMenuTarget* parent, const std::string &actionKey)
@@ -149,9 +146,7 @@ int CSettingsManager::showMenu()
CDataResetNotifier * resetNotifier = new CDataResetNotifier(); CDataResetNotifier * resetNotifier = new CDataResetNotifier();
CMenuWidget * mset = new CMenuWidget(LOCALE_MAINSETTINGS_MANAGE, NEUTRINO_ICON_SETTINGS, width); CMenuWidget * mset = new CMenuWidget(LOCALE_MAINSETTINGS_MANAGE, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_SETTINGS_MNGR);
mset->setSelected(selected);
mset->addIntroItems(); mset->addIntroItems();
mset->addItem(new CMenuForwarder(LOCALE_RESET_SETTINGS, true, NULL, resetNotifier, "settings", CRCInput::RC_recall));// FIXME: RC-button RECALL is broken mset->addItem(new CMenuForwarder(LOCALE_RESET_SETTINGS, true, NULL, resetNotifier, "settings", CRCInput::RC_recall));// FIXME: RC-button RECALL is broken
@@ -166,7 +161,6 @@ int CSettingsManager::showMenu()
int res = mset->exec(NULL, ""); int res = mset->exec(NULL, "");
mset->hide(); mset->hide();
selected = mset->getSelected();
delete resetNotifier; delete resetNotifier;
delete mset; delete mset;
return res; return res;

2
src/gui/settings_manager.h
View File

@@ -38,7 +38,7 @@
class CSettingsManager : public CMenuTarget class CSettingsManager : public CMenuTarget
{ {
private: private:
int width, selected; int width;
int showMenu(); int showMenu();

3
src/neutrino_menue.h
View File

@@ -41,6 +41,9 @@
//enums for menu widget indicies, //enums for menu widget indicies,
enum MN_WIDGET_ID enum MN_WIDGET_ID
{ {
//settings manager
MN_WIDGET_ID_SETTINGS_MNGR,
//network setup //network setup
MN_WIDGET_ID_NETWORKSETUP, MN_WIDGET_ID_NETWORKSETUP,
MN_WIDGET_ID_NETWORKSETUP_NTP, MN_WIDGET_ID_NETWORKSETUP_NTP,