diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp
index 88e67392d..e41d98824 100644
--- a/src/gui/audioplayer.cpp
+++ b/src/gui/audioplayer.cpp
@@ -19,8 +19,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with this program. If not, see .
*/
#ifdef HAVE_CONFIG_H
@@ -841,8 +840,8 @@ int CAudioPlayerGui::show()
int y1=(g_settings.screen_EndY- g_settings.screen_StartY)/2 + g_settings.screen_StartY;
int h = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNEL_NUM_ZAP]->getHeight();
w = std::max(w, g_Font[SNeutrinoSettings::FONT_TYPE_CHANNEL_NUM_ZAP]->getRenderWidth(selectedKey));
- m_frameBuffer->paintBoxRel(x1 - 7, y1 - h - 5, w + 14, h + 10, COL_FRAME_PLUS_0, RADIUS_SMALL); //NI
- m_frameBuffer->paintBoxRel(x1 - 6, y1 - h - 4, w + 12, h + 8, COL_MENUCONTENTSELECTED_PLUS_0, RADIUS_SMALL); //NI
+ m_frameBuffer->paintBoxRel(x1 - 7, y1 - h - 5, w + 14, h + 10, COL_FRAME_PLUS_0, RADIUS_SMALL);
+ m_frameBuffer->paintBoxRel(x1 - 6, y1 - h - 4, w + 12, h + 8, COL_MENUCONTENTSELECTED_PLUS_0, RADIUS_SMALL);
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNEL_NUM_ZAP]->RenderString(x1,y1,w+1,selectedKey,COL_MENUCONTENTSELECTED_TEXT);
g_RCInput->getMsg_ms(&msg, &data, AUDIOPLAYERGUI_SMSKEY_TIMEOUT - 200);
@@ -1730,7 +1729,7 @@ void CAudioPlayerGui::paintTitleBox()
m_frameBuffer->paintBackgroundBoxRel(m_x, m_y, m_width, m_title_height);
else
{
- m_frameBuffer->paintBoxRel(m_x, m_y, m_width, m_title_height, COL_MENUHEAD_PLUS_0, RADIUS_MID); //NI
+ m_frameBuffer->paintBoxRel(m_x, m_y, m_width, m_title_height, COL_MENUHEAD_PLUS_0, RADIUS_MID);
m_frameBuffer->paintBoxFrame(m_x, m_y, m_width, m_title_height, 1, COL_FRAME_PLUS_0, RADIUS_MID); //NI
paintCover();
@@ -2107,7 +2106,7 @@ void CAudioPlayerGui::updateMetaData()
paintCover();
}
if (CAudioPlayer::getInstance()->hasMetaDataChanged() != 0)
- updateLcd = true;
+ updateLcd = true;
//printf("CAudioPlayerGui::updateMetaData: updateLcd %d\n", updateLcd);
if (updateLcd)
@@ -2119,9 +2118,9 @@ void CAudioPlayerGui::updateMetaData()
if (updateMeta || updateScreen)
{
int cover_width = m_title_height + 2*OFFSET_INNER_MID;
- m_frameBuffer->paintBoxRel(m_x + cover_width, m_y + OFFSET_INNER_SMALL + 2*m_item_height + OFFSET_INNER_SMALL, m_width - cover_width - OFFSET_INNER_MID, m_meta_height, COL_MENUHEAD_PLUS_0); //NI
+ m_frameBuffer->paintBoxRel(m_x + cover_width, m_y + OFFSET_INNER_SMALL + 2*m_item_height + OFFSET_INNER_SMALL, m_width - cover_width - OFFSET_INNER_MID, m_meta_height, COL_MENUHEAD_PLUS_0);
int xstart = ((m_width - 2*OFFSET_INNER_MID - g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(m_metainfo))/2);
- g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(m_x + xstart, m_y + OFFSET_INNER_SMALL + 2*m_item_height + OFFSET_INNER_SMALL + m_meta_height, m_width - 2*xstart, m_metainfo, COL_MENUHEAD_TEXT); //NI
+ g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(m_x + xstart, m_y + OFFSET_INNER_SMALL + 2*m_item_height + OFFSET_INNER_SMALL + m_meta_height, m_width - 2*xstart, m_metainfo, COL_MENUHEAD_TEXT);
}
}
@@ -2172,20 +2171,20 @@ void CAudioPlayerGui::updateTimes(const bool force)
if (updateTotal && !m_inetmode)
{
- m_frameBuffer->paintBoxRel(x_total_time, y_times, w_total_time + OFFSET_INNER_MID, m_item_height, COL_MENUHEAD_PLUS_0); //NI
+ m_frameBuffer->paintBoxRel(x_total_time, y_times, w_total_time + OFFSET_INNER_MID, m_item_height, COL_MENUHEAD_PLUS_0);
if (m_time_total > 0)
{
- g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x_total_time, y_times + m_item_height, w_total_time, total_time, COL_MENUHEAD_TEXT); //NI
+ g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x_total_time, y_times + m_item_height, w_total_time, total_time, COL_MENUHEAD_TEXT);
}
}
if (updatePlayed || (m_state == CAudioPlayerGui::PAUSE))
{
- m_frameBuffer->paintBoxRel(x_faked_time, y_times, w_faked_time, m_item_height, COL_MENUHEAD_PLUS_0); //NI
+ m_frameBuffer->paintBoxRel(x_faked_time, y_times, w_faked_time, m_item_height, COL_MENUHEAD_PLUS_0);
struct timeval tv;
gettimeofday(&tv, NULL);
if ((m_state != CAudioPlayerGui::PAUSE) || (tv.tv_sec & 1))
{
- g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x_played_time, y_times + m_item_height, w_played_time, played_time, COL_MENUHEAD_TEXT); //NI
+ g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x_played_time, y_times + m_item_height, w_played_time, played_time, COL_MENUHEAD_TEXT);
}
}
}
@@ -2288,8 +2287,8 @@ bool CAudioPlayerGui::getNumericInput(neutrino_msg_t& msg, int& val)
sprintf(str, "%d", val);
int w = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNEL_NUM_ZAP]->getRenderWidth(str);
int h = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNEL_NUM_ZAP]->getHeight();
- m_frameBuffer->paintBoxRel(x1 - 7, y1 - h - 5, w + 14, h + 10, COL_FRAME_PLUS_0); //NI
- m_frameBuffer->paintBoxRel(x1 - 6, y1 - h - 4, w + 12, h + 8, COL_MENUCONTENTSELECTED_PLUS_0); //NI
+ m_frameBuffer->paintBoxRel(x1 - 7, y1 - h - 5, w + 14, h + 10, COL_FRAME_PLUS_0);
+ m_frameBuffer->paintBoxRel(x1 - 6, y1 - h - 4, w + 12, h + 8, COL_MENUCONTENTSELECTED_PLUS_0);
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNEL_NUM_ZAP]->RenderString(x1, y1, w + 1, str, COL_MENUCONTENTSELECTED_TEXT);
while (true)
{
diff --git a/src/gui/audioplayer.h b/src/gui/audioplayer.h
index 118a7419e..c99f6dbc5 100644
--- a/src/gui/audioplayer.h
+++ b/src/gui/audioplayer.h
@@ -18,8 +18,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with this program. If not, see .
*/
#ifndef __audioplayergui__
@@ -202,8 +201,8 @@ class CAudioPlayerGui : public CMenuTarget
void printTimevalDiff(timeval &start, timeval &end);
/**
- * Saves the current playlist into a .m3u playlist file.
- */
+ * Saves the current playlist into a .m3u playlist file.
+ */
void savePlaylist();
/**
diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp
index 7b890a29e..b5bb24b0e 100644
--- a/src/gui/widget/menue.cpp
+++ b/src/gui/widget/menue.cpp
@@ -1557,61 +1557,50 @@ void CMenuWidget::setFooter(const struct button_label *_fbutton_labels, const in
//-------------------------------------------------------------------------------------------------------------------------------
-CMenuOptionNumberChooser::CMenuOptionNumberChooser(const neutrino_locale_t Name, int * const OptionValue, const bool Active,
- const int min_value, const int max_value,
- CChangeObserver * const Observ, const neutrino_msg_t DirectKey, const char * const IconName,
- const int print_offset, const int special_value, const neutrino_locale_t special_value_name, bool sliderOn)
- : CAbstractMenuOptionChooser(Active, DirectKey, IconName)
+CMenuOptionNumberChooser::CMenuOptionNumberChooser( const neutrino_locale_t Name, int * const OptionValue, const bool Active,
+ const int min_value, const int max_value,
+ CChangeObserver * const Observ, const neutrino_msg_t DirectKey, const char * const IconName,
+ const int print_offset, const int special_value, const neutrino_locale_t special_value_name, bool sliderOn)
+ : CAbstractMenuOptionChooser(Active, DirectKey, IconName)
{
- name = Name;
- optionValue = OptionValue;
-
- lower_bound = min_value;
- upper_bound = max_value;
-
- display_offset = print_offset;
-
- localized_value = special_value;
- localized_value_name = special_value_name;
-
- display_offset = print_offset;
- nameString = "";
- numberFormat = "%d";
- numberFormatFunction = NULL;
- observ = Observ;
- slider_on = sliderOn;
-
- numeric_input = false;
-
- directKeyOK = false;
+ init(Name, "", OptionValue, min_value, max_value, print_offset, special_value, special_value_name, Observ, sliderOn);
}
-CMenuOptionNumberChooser::CMenuOptionNumberChooser(const std::string &Name, int * const OptionValue, const bool Active,
- const int min_value, const int max_value,
- CChangeObserver * const Observ, const neutrino_msg_t DirectKey, const char * const IconName,
- const int print_offset, const int special_value, const neutrino_locale_t special_value_name, bool sliderOn)
- : CAbstractMenuOptionChooser(Active, DirectKey, IconName)
+CMenuOptionNumberChooser::CMenuOptionNumberChooser( const std::string &Name, int * const OptionValue, const bool Active,
+ const int min_value, const int max_value,
+ CChangeObserver * const Observ, const neutrino_msg_t DirectKey, const char * const IconName,
+ const int print_offset, const int special_value, const neutrino_locale_t special_value_name, bool sliderOn)
+ : CAbstractMenuOptionChooser(Active, DirectKey, IconName)
{
- name = NONEXISTANT_LOCALE;
- optionValue = OptionValue;
+ init(NONEXISTANT_LOCALE, Name, OptionValue, min_value, max_value, print_offset, special_value, special_value_name, Observ, sliderOn);
+}
- lower_bound = min_value;
- upper_bound = max_value;
+void CMenuOptionNumberChooser::init( const neutrino_locale_t& lName,
+ const std::string &sName,
+ int* const Option_Value,
+ const int& min_value,
+ const int& max_value,
+ const int& print_offset,
+ const int& special_value,
+ const neutrino_locale_t& special_value_name,
+ CChangeObserver * const Observ,
+ bool sliderOn)
+{
+ name = lName;
+ nameString = sName;
+ optionValue = Option_Value;
+ lower_bound = min_value;
+ upper_bound = max_value;
+ display_offset = print_offset;
+ localized_value = special_value;
+ localized_value_name = special_value_name;
+ observ = Observ;
+ slider_on = sliderOn;
- display_offset = print_offset;
-
- localized_value = special_value;
- localized_value_name = special_value_name;
-
- nameString = Name;
- numberFormat = "%d";
- numberFormatFunction = NULL;
- observ = Observ;
- slider_on = sliderOn;
-
- numeric_input = false;
-
- directKeyOK = false;
+ numberFormat = "%d";
+ numberFormatFunction = NULL;
+ directKeyOK = false;
+ numeric_input = false;
}
int CMenuOptionNumberChooser::exec(CMenuTarget*)
@@ -1735,104 +1724,52 @@ int CMenuOptionNumberChooser::getWidth(void)
return width;
}
-CMenuOptionChooser::CMenuOptionChooser(const neutrino_locale_t OptionName, int * const OptionValue, const struct keyval * const Options, const unsigned Number_Of_Options,
- const bool Active, CChangeObserver * const Observ, const neutrino_msg_t DirectKey, const char * const IconName, bool Pulldown, bool OptionsSort)
- : CAbstractMenuOptionChooser(Active, DirectKey, IconName)
+CMenuOptionChooser::CMenuOptionChooser( const neutrino_locale_t OptionName, int * const OptionValue, const struct keyval * const Options, const size_t Number_Of_Options,
+ const bool Active, CChangeObserver * const Observ,
+ const neutrino_msg_t DirectKey, const char * const IconName, bool Pulldown, bool OptionsSort)
+ : CAbstractMenuOptionChooser(Active, DirectKey, IconName)
{
- nameString = "";
- name = OptionName;
- optionValue = OptionValue;
- number_of_options = Number_Of_Options;
- observ = Observ;
- pulldown = Pulldown;
- optionsSort = OptionsSort;
- for (unsigned int i = 0; i < number_of_options; i++)
- {
- struct keyval_ext opt;
- opt = Options[i];
- options.push_back(opt);
- }
+ init("", OptionName, OptionValue, Options, NULL, NULL, Number_Of_Options, Observ, Pulldown, OptionsSort);
}
-CMenuOptionChooser::CMenuOptionChooser(const std::string &OptionName, int * const OptionValue, const struct keyval * const Options, const unsigned Number_Of_Options,
- const bool Active, CChangeObserver * const Observ, const neutrino_msg_t DirectKey, const char * const IconName, bool Pulldown, bool OptionsSort)
- : CAbstractMenuOptionChooser(Active, DirectKey, IconName)
+CMenuOptionChooser::CMenuOptionChooser( const std::string &OptionName, int * const OptionValue, const struct keyval * const Options, const size_t Number_Of_Options,
+ const bool Active, CChangeObserver * const Observ,
+ const neutrino_msg_t DirectKey, const char * const IconName, bool Pulldown, bool OptionsSort)
+ : CAbstractMenuOptionChooser(Active, DirectKey, IconName)
{
- nameString = OptionName;
- name = NONEXISTANT_LOCALE;
- optionValue = OptionValue;
- number_of_options = Number_Of_Options;
- observ = Observ;
- pulldown = Pulldown;
- optionsSort = OptionsSort;
- for (unsigned int i = 0; i < number_of_options; i++)
- {
- struct keyval_ext opt;
- opt = Options[i];
- options.push_back(opt);
- }
+ init(OptionName, NONEXISTANT_LOCALE, OptionValue, Options, NULL, NULL, Number_Of_Options, Observ, Pulldown, OptionsSort);
}
-CMenuOptionChooser::CMenuOptionChooser(const neutrino_locale_t OptionName, int * const OptionValue, const struct keyval_ext * const Options,
- const unsigned Number_Of_Options, const bool Active, CChangeObserver * const Observ,
- const neutrino_msg_t DirectKey, const char * const IconName, bool Pulldown, bool OptionsSort)
- : CAbstractMenuOptionChooser(Active, DirectKey, IconName)
+CMenuOptionChooser::CMenuOptionChooser( const neutrino_locale_t OptionName, int * const OptionValue, const struct keyval_ext * const Options, const size_t Number_Of_Options,
+ const bool Active, CChangeObserver * const Observ,
+ const neutrino_msg_t DirectKey, const char * const IconName, bool Pulldown, bool OptionsSort)
+ : CAbstractMenuOptionChooser(Active, DirectKey, IconName)
{
- nameString = "";
- name = OptionName;
- optionValue = OptionValue;
- number_of_options = Number_Of_Options;
- observ = Observ;
- pulldown = Pulldown;
- optionsSort = OptionsSort;
- for (unsigned int i = 0; i < number_of_options; i++)
- options.push_back(Options[i]);
+ init("", OptionName, OptionValue, NULL, Options, NULL, Number_Of_Options, Observ, Pulldown, OptionsSort);
}
-CMenuOptionChooser::CMenuOptionChooser(const std::string &OptionName, int * const OptionValue, const struct keyval_ext * const Options,
- const unsigned Number_Of_Options, const bool Active, CChangeObserver * const Observ,
- const neutrino_msg_t DirectKey, const char * const IconName, bool Pulldown, bool OptionsSort)
- : CAbstractMenuOptionChooser(Active, DirectKey, IconName)
+CMenuOptionChooser::CMenuOptionChooser( const std::string &OptionName, int * const OptionValue, const struct keyval_ext * const Options, const size_t Number_Of_Options,
+ const bool Active, CChangeObserver * const Observ,
+ const neutrino_msg_t DirectKey, const char * const IconName, bool Pulldown, bool OptionsSort)
+ : CAbstractMenuOptionChooser(Active, DirectKey, IconName)
{
- nameString = OptionName;
- name = NONEXISTANT_LOCALE;
- optionValue = OptionValue;
- number_of_options = Number_Of_Options;
- observ = Observ;
- pulldown = Pulldown;
- optionsSort = OptionsSort;
- for (unsigned int i = 0; i < number_of_options; i++)
- options.push_back(Options[i]);
+ init(OptionName, NONEXISTANT_LOCALE, OptionValue, NULL, Options, NULL, Number_Of_Options, Observ, Pulldown, OptionsSort);
}
-CMenuOptionChooser::CMenuOptionChooser(const neutrino_locale_t OptionName, int * const OptionValue, std::vector &Options,
- const bool Active, CChangeObserver * const Observ,
- const neutrino_msg_t DirectKey, const char * const IconName, bool Pulldown, bool OptionsSort)
- : CAbstractMenuOptionChooser(Active, DirectKey, IconName)
+CMenuOptionChooser::CMenuOptionChooser( const neutrino_locale_t OptionName, int * const OptionValue, std::vector &Options,
+ const bool Active, CChangeObserver * const Observ,
+ const neutrino_msg_t DirectKey, const char * const IconName, bool Pulldown, bool OptionsSort)
+ : CAbstractMenuOptionChooser(Active, DirectKey, IconName)
{
- nameString = "";
- name = OptionName;
- optionValue = OptionValue;
- options = Options;
- number_of_options = options.size();
- observ = Observ;
- pulldown = Pulldown;
- optionsSort = OptionsSort;
+ init("", OptionName, OptionValue, NULL, NULL, &Options, Options.size(), Observ, Pulldown, OptionsSort);
}
CMenuOptionChooser::CMenuOptionChooser(const std::string &OptionName, int * const OptionValue, std::vector &Options,
const bool Active, CChangeObserver * const Observ,
const neutrino_msg_t DirectKey, const char * const IconName, bool Pulldown, bool OptionsSort)
- : CAbstractMenuOptionChooser(Active, DirectKey, IconName)
+ : CAbstractMenuOptionChooser(Active, DirectKey, IconName)
{
- nameString = OptionName;
- name = NONEXISTANT_LOCALE;
- optionValue = OptionValue;
- options = Options;
- number_of_options = options.size();
- observ = Observ;
- pulldown = Pulldown;
- optionsSort = OptionsSort;
+ init(OptionName, NONEXISTANT_LOCALE, OptionValue, NULL, NULL, &Options, Options.size(), Observ, Pulldown, OptionsSort);
}
CMenuOptionChooser::~CMenuOptionChooser()
@@ -1840,26 +1777,48 @@ CMenuOptionChooser::~CMenuOptionChooser()
clearChooserOptions();
}
-void CMenuOptionChooser::initVarOptionChooser( const std::string &OptionName,
- const neutrino_locale_t Name,
- int * const OptionValue,
- const bool Active,
- CChangeObserver * const Observ,
- neutrino_msg_t DirectKey,
- const char * IconName,
- bool Pulldown,
- bool OptionsSort)
+void CMenuOptionChooser::init( const std::string &OptionName,
+ const neutrino_locale_t Name,
+ int * const OptionValue,
+ const struct keyval * const Options,
+ const struct keyval_ext * const OptionsExt,
+ std::vector * v_Options,
+ const size_t Number_Of_Options,
+ CChangeObserver * const Observ,
+ bool Pulldown,
+ bool OptionsSort)
{
height = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
nameString = OptionName;
name = Name;
optionValue = OptionValue;
- active = Active;
+ number_of_options = Number_Of_Options;
observ = Observ;
- directKey = DirectKey;
- iconName = IconName;
pulldown = Pulldown;
optionsSort = OptionsSort;
+
+ if (Options || OptionsExt)
+ {
+ if (Options)
+ {
+ for (unsigned int i = 0; i < number_of_options; i++)
+ {
+ struct keyval_ext opt;
+ opt = Options[i];
+ options.push_back(opt);
+ }
+ }
+
+ if (OptionsExt)
+ {
+ for (unsigned int i = 0; i < number_of_options; i++)
+ options.push_back(OptionsExt[i]);
+ }
+ }
+ else{
+ if (v_Options)
+ options = *v_Options;
+ }
}
void CMenuOptionChooser::clearChooserOptions()
@@ -2062,24 +2021,29 @@ int CMenuOptionChooser::getWidth(void)
//-------------------------------------------------------------------------------------------------------------------------------
-CMenuOptionStringChooser::CMenuOptionStringChooser(const neutrino_locale_t OptionName, std::string* OptionValue, bool Active, CChangeObserver* Observ,
- const neutrino_msg_t DirectKey, const char * const IconName, bool Pulldown)
- : CMenuItem(Active, DirectKey, IconName)
+CMenuOptionStringChooser::CMenuOptionStringChooser( const neutrino_locale_t OptionName, std::string* OptionValue, bool Active, CChangeObserver* Observ,
+ const neutrino_msg_t DirectKey, const char * const IconName, bool Pulldown)
+ : CMenuItem(Active, DirectKey, IconName)
{
- nameString = "";
- name = OptionName;
- optionValuePtr = OptionValue ? OptionValue : &optionValue;
- observ = Observ;
- pulldown = Pulldown;
+ init("", OptionName, OptionValue, Observ, Pulldown);
}
-CMenuOptionStringChooser::CMenuOptionStringChooser(const std::string &OptionName, std::string* OptionValue, bool Active, CChangeObserver* Observ,
- const neutrino_msg_t DirectKey, const char * const IconName, bool Pulldown)
- : CMenuItem(Active, DirectKey, IconName)
+CMenuOptionStringChooser::CMenuOptionStringChooser( const std::string &OptionName, std::string* OptionValue, bool Active, CChangeObserver* Observ,
+ const neutrino_msg_t DirectKey, const char * const IconName, bool Pulldown)
+ : 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;
- name = NONEXISTANT_LOCALE;
- optionValuePtr = OptionValue ? OptionValue : &optionValue;
+ name = Name;
+ optionValuePtr = pOptionValue ? pOptionValue : &optionValue;
observ = Observ;
pulldown = Pulldown;
}
@@ -2184,48 +2148,52 @@ int CMenuOptionStringChooser::paint( bool selected )
}
//-------------------------------------------------------------------------------------------------------------------------------
-CMenuForwarder::CMenuForwarder(const neutrino_locale_t Text, const bool Active, const std::string &Option, CMenuTarget* Target, const char * const ActionKey,
- neutrino_msg_t DirectKey, const char * const IconName, const char * const IconName_Info_right, bool IsStatic)
- : CMenuItem(Active, DirectKey, IconName, IconName_Info_right, IsStatic)
+CMenuForwarder::CMenuForwarder( const neutrino_locale_t Text, const bool Active, const std::string &Option, CMenuTarget* Target, const char * const ActionKey,
+ neutrino_msg_t DirectKey, const char * const IconName, const char * const IconName_Info_right, bool IsStatic)
+ : CMenuItem(Active, DirectKey, IconName, IconName_Info_right, IsStatic)
{
- option_string_ptr = &Option;
- name = Text;
- nameString = "";
- jumpTarget = Target;
- actionKey = ActionKey ? ActionKey : "";
+ init("", Text, Option, NULL, Target, ActionKey);
}
-CMenuForwarder::CMenuForwarder(const std::string& Text, const bool Active, const std::string &Option, CMenuTarget* Target, const char * const ActionKey,
- neutrino_msg_t DirectKey, const char * const IconName, const char * const IconName_Info_right, bool IsStatic)
- : CMenuItem(Active, DirectKey, IconName, IconName_Info_right, IsStatic)
+CMenuForwarder::CMenuForwarder( const std::string& Text, const bool Active, const std::string &Option, CMenuTarget* Target, const char * const ActionKey,
+ neutrino_msg_t DirectKey, const char * const IconName, const char * const IconName_Info_right, bool IsStatic)
+ : CMenuItem(Active, DirectKey, IconName, IconName_Info_right, IsStatic)
+{
+ init(Text, NONEXISTANT_LOCALE, Option, NULL, Target, ActionKey);
+}
+
+CMenuForwarder::CMenuForwarder( const neutrino_locale_t Text, const bool Active, const char * const Option, CMenuTarget* Target, const char * const ActionKey,
+ neutrino_msg_t DirectKey, const char * const IconName, const char * const IconName_Info_right, bool IsStatic)
+ : CMenuItem(Active, DirectKey, IconName, IconName_Info_right, IsStatic)
+{
+ init("", Text, "", Option, Target, ActionKey);
+}
+
+CMenuForwarder::CMenuForwarder( const std::string& Text, const bool Active, const char * const Option, CMenuTarget* Target, const char * const ActionKey,
+ neutrino_msg_t DirectKey, const char * const IconName, const char * const IconName_Info_right, bool IsStatic)
+ : CMenuItem(Active, DirectKey, IconName, IconName_Info_right, IsStatic)
+{
+ init(Text, NONEXISTANT_LOCALE, "", Option, Target, ActionKey);
+}
+
+void CMenuForwarder::init( const std::string &Text,
+ const neutrino_locale_t Name,
+ const std::string &sOption,
+ const char * const cOption,
+ CMenuTarget* Target,
+ const char * const ActionKey)
{
- option_string_ptr = &Option;
- name = NONEXISTANT_LOCALE;
nameString = Text;
- jumpTarget = Target;
- actionKey = ActionKey ? ActionKey : "";
-}
+ name = Name;
-CMenuForwarder::CMenuForwarder(const neutrino_locale_t Text, const bool Active, const char * const Option, CMenuTarget* Target, const char * const ActionKey,
- neutrino_msg_t DirectKey, const char * const IconName, const char * const IconName_Info_right, bool IsStatic)
- : CMenuItem(Active, DirectKey, IconName, IconName_Info_right, IsStatic)
-{
- option_string = Option ? Option : "";
- option_string_ptr = &option_string;
- name = Text;
- nameString = "";
- jumpTarget = Target;
- actionKey = ActionKey ? ActionKey : "";
-}
+ if (sOption.empty())
+ {
+ option_string = cOption ? cOption : "";
+ option_string_ptr = &option_string;
+ }
+ else
+ option_string_ptr = &sOption;
-CMenuForwarder::CMenuForwarder(const std::string& Text, const bool Active, const char * const Option, CMenuTarget* Target, const char * const ActionKey,
- neutrino_msg_t DirectKey, const char * const IconName, const char * const IconName_Info_right, bool IsStatic)
- : CMenuItem(Active, DirectKey, IconName, IconName_Info_right, IsStatic)
-{
- option_string = Option ? Option : "";
- option_string_ptr = &option_string;
- name = NONEXISTANT_LOCALE;
- nameString = Text;
jumpTarget = Target;
actionKey = ActionKey ? ActionKey : "";
}
@@ -2295,18 +2263,20 @@ int CMenuForwarder::paint(bool selected)
//-------------------------------------------------------------------------------------------------------------------------------
CMenuSeparator::CMenuSeparator(const int Type, const neutrino_locale_t Text, bool IsStatic) : CMenuItem(false, CRCInput::RC_nokey, NULL, NULL, IsStatic)
{
- type = Type;
- name = Text;
- nameString = "";
+ init(Type, Text, "");
}
CMenuSeparator::CMenuSeparator(const int Type, const std::string &Text, bool IsStatic) : CMenuItem(false, CRCInput::RC_nokey, NULL, NULL, IsStatic)
{
- type = Type;
- name = NONEXISTANT_LOCALE;
- nameString = Text;
+ init(Type, NONEXISTANT_LOCALE, Text);
}
+void CMenuSeparator::init(const int& Type, const neutrino_locale_t& lText, const std::string &sText)
+{
+ type = Type;
+ name = lText;
+ nameString = sText;
+}
int CMenuSeparator::getHeight(void)
{
diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h
index 84ba02510..6c89f878e 100644
--- a/src/gui/widget/menue.h
+++ b/src/gui/widget/menue.h
@@ -205,6 +205,9 @@ class CMenuItem : public CComponentsSignals
class CMenuSeparator : public CMenuItem
{
int type;
+ void init( const int& Type,
+ const neutrino_locale_t& lText,
+ const std::string& sText);
public:
@@ -234,6 +237,12 @@ class CMenuSeparator : public CMenuItem
class CMenuForwarder : public CMenuItem
{
std::string actionKey;
+ void init( const std::string &OptionName,
+ const neutrino_locale_t Name,
+ const std::string &sOption,
+ const char * const cOption,
+ CMenuTarget* Target,
+ const char * const ActionKey);
protected:
std::string option_string;
@@ -322,6 +331,17 @@ private:
std::string numberFormat;
std::string (*numberFormatFunction)(int num);
+ void init( const neutrino_locale_t& lName,
+ const std::string &sName,
+ int* const Option_Value,
+ const int& min_value,
+ const int& max_value,
+ const int& print_offset,
+ const int& special_value,
+ const neutrino_locale_t& special_value_name,
+ CChangeObserver * const Observ,
+ bool sliderOn);
+
public:
CMenuOptionNumberChooser(const neutrino_locale_t name, int * const OptionValue, const bool Active,
const int min_value, const int max_value, CChangeObserver * const Observ = NULL,
@@ -389,39 +409,40 @@ class CMenuOptionChooser : public CAbstractMenuOptionChooser
private:
std::vector options;
std::vector option_chooser_options_v;
- unsigned number_of_options;
+ size_t number_of_options;
CChangeObserver * observ;
bool pulldown;
bool optionsSort;
void clearChooserOptions();
- void initVarOptionChooser( const std::string &OptionName,
+ void init( const std::string &OptionName,
const neutrino_locale_t Name,
int * const OptionValue,
- const bool Active,
+ const struct keyval * const Options,
+ const struct keyval_ext * const OptionsExt,
+ std::vector * v_Options,
+ const size_t Number_Of_Options,
CChangeObserver * const Observ,
- neutrino_msg_t DirectKey,
- const char * IconName,
bool Pulldown,
bool OptionsSort
- );
+ );
public:
CMenuOptionChooser(const neutrino_locale_t Name, int * const OptionValue, const struct keyval * const Options,
- const unsigned Number_Of_Options, const bool Active = false, CChangeObserver * const Observ = NULL,
+ const size_t Number_Of_Options, const bool Active = false, CChangeObserver * const Observ = NULL,
const neutrino_msg_t DirectKey = CRCInput::RC_nokey, const char * const IconName = NULL,
bool Pulldown = false, bool OptionsSort = false);
CMenuOptionChooser(const neutrino_locale_t Name, int * const OptionValue, const struct keyval_ext * const Options,
- const unsigned Number_Of_Options, const bool Active = false, CChangeObserver * const Observ = NULL,
+ const size_t Number_Of_Options, const bool Active = false, CChangeObserver * const Observ = NULL,
const neutrino_msg_t DirectKey = CRCInput::RC_nokey, const char * const IconName = NULL,
bool Pulldown = false, bool OptionsSort = false);
CMenuOptionChooser(const std::string &Name, int * const OptionValue, const struct keyval * const Options,
- const unsigned Number_Of_Options, const bool Active = false, CChangeObserver * const Observ = NULL,
+ const size_t Number_Of_Options, const bool Active = false, CChangeObserver * const Observ = NULL,
const neutrino_msg_t DirectKey = CRCInput::RC_nokey, const char * const IconName = NULL,
- bool Pulldown = false, bool OptionsSort = false);
+ bool size_t = false, bool OptionsSort = false);
CMenuOptionChooser(const std::string &Name, int * const OptionValue, const struct keyval_ext * const Options,
- const unsigned Number_Of_Options, const bool Active = false, CChangeObserver * const Observ = NULL,
+ const size_t Number_Of_Options, const bool Active = false, CChangeObserver * const Observ = NULL,
const neutrino_msg_t DirectKey = CRCInput::RC_nokey, const char * const IconName = NULL,
bool Pulldown = false, bool OptionsSort = false);
CMenuOptionChooser(const neutrino_locale_t Name, int * const OptionValue, std::vector &Options,
@@ -432,6 +453,7 @@ class CMenuOptionChooser : public CAbstractMenuOptionChooser
const bool Active = false, CChangeObserver * const Observ = NULL,
const neutrino_msg_t DirectKey = CRCInput::RC_nokey, const char * const IconName = NULL,
bool Pulldown = false, bool OptionsSort = false);
+
~CMenuOptionChooser();
void setOption(const int newvalue);
@@ -454,6 +476,11 @@ class CMenuOptionStringChooser : public CMenuItem
std::vector options;
CChangeObserver * observ;
bool pulldown;
+ void init( const std::string &OptionName,
+ const neutrino_locale_t Name,
+ std::string* pOptionValue,
+ CChangeObserver * const Observ,
+ bool Pulldown );
public:
CMenuOptionStringChooser(const neutrino_locale_t Name, std::string* OptionValue, bool Active = false,