From 9f28769f94d0f1d16d9d420aa0f068eb6fe7e520 Mon Sep 17 00:00:00 2001 From: satbaby Date: Mon, 2 May 2011 20:48:09 +0000 Subject: [PATCH] update2:http://www.dbox2world.net/index.php?page=Thread&postID=129650#post129650 git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1426 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/gui/widget/menue.cpp | 2 +- src/gui/widget/menue.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 0f459bb36..24df2797b 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -576,7 +576,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) case (CRCInput::RC_left): { CMenuItem* itemX = items[selected]; - int menu_left_exit = (itemX->isNumberChooser() == 1) ? 0 : g_settings.menu_left_exit; + int menu_left_exit = (itemX->isMenueOptionChooser() == 1) ? 0 : g_settings.menu_left_exit; if ((hasItem() && (selected < 0 || !items[selected]->can_arrow)) || menu_left_exit) { msg = CRCInput::RC_timeout; diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h index 6578fecbb..629a3f814 100644 --- a/src/gui/widget/menue.h +++ b/src/gui/widget/menue.h @@ -132,7 +132,7 @@ class CMenuItem virtual void paintItemSlider( const bool select_mode, const int &item_height, const int &optionvalue, const int &factor, const char * left_text=NULL, const char * right_text=NULL); - virtual int isNumberChooser(void) const{return 0;} + virtual int isMenueOptionChooser(void) const{return 0;} }; class CMenuSeparator : public CMenuItem @@ -261,7 +261,7 @@ private: int paint(bool selected, bool last = false); int exec(CMenuTarget* parent); - int isNumberChooser(void) const{return 1;} + int isMenueOptionChooser(void) const{return 1;} }; class CMenuOptionChooser : public CAbstractMenuOptionChooser @@ -314,6 +314,7 @@ class CMenuOptionChooser : public CAbstractMenuOptionChooser std::string getOptionName() {return optionNameString;}; int exec(CMenuTarget* parent); + int isMenueOptionChooser(void) const{return 1;} }; class CMenuOptionStringChooser : public CMenuItem @@ -342,6 +343,7 @@ class CMenuOptionStringChooser : public CMenuItem } void sortOptions(); int exec(CMenuTarget* parent); + int isMenueOptionChooser(void) const{return 1;} }; class CMenuOptionLanguageChooser : public CMenuItem