mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

CMenuOptionStringChooser: clean up multiple code parts

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 284dba8c25
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2017-06-18 00:04:40 +02:00
parent 5f1d85300f
commit cd712fe5d5
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2004,20 +2004,25 @@ CMenuOptionStringChooser::CMenuOptionStringChooser(const neutrino_locale_t Optio
const neutrino_msg_t DirectKey, const char * const IconName, bool Pulldown) const neutrino_msg_t DirectKey, const char * const IconName, bool Pulldown)
: CMenuItem(Active, DirectKey, IconName) : CMenuItem(Active, DirectKey, IconName)
{ {
nameString = ""; init("", OptionName, OptionValue, Observ, Pulldown);
name = OptionName;
optionValuePtr = OptionValue ? OptionValue : &optionValue;
observ = Observ;
pulldown = Pulldown;
} }
CMenuOptionStringChooser::CMenuOptionStringChooser( const std::string &OptionName, std::string* OptionValue, bool Active, CChangeObserver* Observ, CMenuOptionStringChooser::CMenuOptionStringChooser( const std::string &OptionName, std::string* OptionValue, bool Active, CChangeObserver* Observ,
const neutrino_msg_t DirectKey, const char * const IconName, bool Pulldown) const neutrino_msg_t DirectKey, const char * const IconName, bool Pulldown)
: CMenuItem(Active, DirectKey, IconName) : CMenuItem(Active, DirectKey, IconName)
{
init(OptionName, NONEXISTANT_LOCALE, OptionValue, Observ, Pulldown);
}
void CMenuOptionStringChooser::init( const std::string &OptionName,
const neutrino_locale_t Name,
std::string* pOptionValue,
CChangeObserver * const Observ,
bool Pulldown)
{ {
nameString = OptionName; nameString = OptionName;
name = NONEXISTANT_LOCALE; name = Name;
optionValuePtr = OptionValue ? OptionValue : &optionValue; optionValuePtr = pOptionValue ? pOptionValue : &optionValue;
observ = Observ; observ = Observ;
pulldown = Pulldown; pulldown = Pulldown;
} }

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

@@ -453,6 +453,11 @@ class CMenuOptionStringChooser : public CMenuItem
std::vector<std::string> options; std::vector<std::string> options;
CChangeObserver * observ; CChangeObserver * observ;
bool pulldown; bool pulldown;
void init( const std::string &OptionName,
const neutrino_locale_t Name,
std::string* pOptionValue,
CChangeObserver * const Observ,
bool Pulldown );
public: public:
CMenuOptionStringChooser(const neutrino_locale_t Name, std::string* OptionValue, bool Active = false, CMenuOptionStringChooser(const neutrino_locale_t Name, std::string* OptionValue, bool Active = false,