From 59a76e52642add04d2b7d98fae5f42e89c02d999 Mon Sep 17 00:00:00 2001 From: striper Date: Tue, 29 Nov 2011 17:00:13 +0000 Subject: [PATCH] - settingsmanager: remember selected position git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1925 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/gui/settings_manager.cpp | 8 +------- src/gui/settings_manager.h | 2 +- src/neutrino_menue.h | 3 +++ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/gui/settings_manager.cpp b/src/gui/settings_manager.cpp index 96bf464bd..e4dee62f6 100644 --- a/src/gui/settings_manager.cpp +++ b/src/gui/settings_manager.cpp @@ -50,14 +50,11 @@ CSettingsManager::CSettingsManager() { width = w_max (40, 10); - selected = -1; } CSettingsManager::~CSettingsManager() { - - } int CSettingsManager::exec(CMenuTarget* parent, const std::string &actionKey) @@ -149,9 +146,7 @@ int CSettingsManager::showMenu() CDataResetNotifier * resetNotifier = new CDataResetNotifier(); - CMenuWidget * mset = new CMenuWidget(LOCALE_MAINSETTINGS_MANAGE, NEUTRINO_ICON_SETTINGS, width); - mset->setSelected(selected); - + CMenuWidget * mset = new CMenuWidget(LOCALE_MAINSETTINGS_MANAGE, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_SETTINGS_MNGR); mset->addIntroItems(); 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, ""); mset->hide(); - selected = mset->getSelected(); delete resetNotifier; delete mset; return res; diff --git a/src/gui/settings_manager.h b/src/gui/settings_manager.h index d6940668a..52ef67bbb 100644 --- a/src/gui/settings_manager.h +++ b/src/gui/settings_manager.h @@ -38,7 +38,7 @@ class CSettingsManager : public CMenuTarget { private: - int width, selected; + int width; int showMenu(); diff --git a/src/neutrino_menue.h b/src/neutrino_menue.h index aa716220d..dac4976fa 100644 --- a/src/neutrino_menue.h +++ b/src/neutrino_menue.h @@ -41,6 +41,9 @@ //enums for menu widget indicies, enum MN_WIDGET_ID { + //settings manager + MN_WIDGET_ID_SETTINGS_MNGR, + //network setup MN_WIDGET_ID_NETWORKSETUP, MN_WIDGET_ID_NETWORKSETUP_NTP,