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

update2:http://www.dbox2world.net/index.php?page=Thread&postID=129650#post129650

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1426 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2011-05-02 20:48:09 +00:00
parent 6615a15256
commit 9f28769f94
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/widget/menue.cpp
View File

@@ -576,7 +576,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
case (CRCInput::RC_left): case (CRCInput::RC_left):
{ {
CMenuItem* itemX = items[selected]; 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)) || if ((hasItem() && (selected < 0 || !items[selected]->can_arrow)) ||
menu_left_exit) { menu_left_exit) {
msg = CRCInput::RC_timeout; msg = CRCInput::RC_timeout;

6
src/gui/widget/menue.h
View File

@@ -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 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 class CMenuSeparator : public CMenuItem
@@ -261,7 +261,7 @@ private:
int paint(bool selected, bool last = false); int paint(bool selected, bool last = false);
int exec(CMenuTarget* parent); int exec(CMenuTarget* parent);
int isNumberChooser(void) const{return 1;} int isMenueOptionChooser(void) const{return 1;}
}; };
class CMenuOptionChooser : public CAbstractMenuOptionChooser class CMenuOptionChooser : public CAbstractMenuOptionChooser
@@ -314,6 +314,7 @@ class CMenuOptionChooser : public CAbstractMenuOptionChooser
std::string getOptionName() {return optionNameString;}; std::string getOptionName() {return optionNameString;};
int exec(CMenuTarget* parent); int exec(CMenuTarget* parent);
int isMenueOptionChooser(void) const{return 1;}
}; };
class CMenuOptionStringChooser : public CMenuItem class CMenuOptionStringChooser : public CMenuItem
@@ -342,6 +343,7 @@ class CMenuOptionStringChooser : public CMenuItem
} }
void sortOptions(); void sortOptions();
int exec(CMenuTarget* parent); int exec(CMenuTarget* parent);
int isMenueOptionChooser(void) const{return 1;}
}; };
class CMenuOptionLanguageChooser : public CMenuItem class CMenuOptionLanguageChooser : public CMenuItem