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

CMenuWidget: use only nameString as container for widget name

Browse Source 
neutrino_locale_t	name could be transformed always to real string to
unify this container


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2dda93ed2b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2017-02-09 15:52:39 +01:00
parent cc37e37e40
commit f6ea40a11e
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -534,8 +534,7 @@ CMenuGlobal* CMenuGlobal::getInstance()
CMenuWidget::CMenuWidget() CMenuWidget::CMenuWidget()
{ {
nameString = g_Locale->getText(NONEXISTANT_LOCALE); nameString = "";
name = NONEXISTANT_LOCALE;
iconfile = ""; iconfile = "";
selected = -1; selected = -1;
iconOffset = 0; iconOffset = 0;
@@ -555,7 +554,6 @@ CMenuWidget::CMenuWidget()
CMenuWidget::CMenuWidget(const neutrino_locale_t Name, const std::string & Icon, const int mwidth, const mn_widget_id_t &w_index) CMenuWidget::CMenuWidget(const neutrino_locale_t Name, const std::string & Icon, const int mwidth, const mn_widget_id_t &w_index)
{ {
name = Name;
nameString = g_Locale->getText(Name); nameString = g_Locale->getText(Name);
preselected = -1; preselected = -1;
Init(Icon, mwidth, w_index); Init(Icon, mwidth, w_index);
@@ -563,7 +561,6 @@ CMenuWidget::CMenuWidget(const neutrino_locale_t Name, const std::string & Icon,
CMenuWidget::CMenuWidget(const std::string &Name, const std::string & Icon, const int mwidth, const mn_widget_id_t &w_index) CMenuWidget::CMenuWidget(const std::string &Name, const std::string & Icon, const int mwidth, const mn_widget_id_t &w_index)
{ {
name = NONEXISTANT_LOCALE;
nameString = Name; nameString = Name;
preselected = -1; preselected = -1;
Init(Icon, mwidth, w_index); Init(Icon, mwidth, w_index);
@@ -729,8 +726,6 @@ CMenuItem* CMenuWidget::getItem(const uint& item_id)
const char *CMenuWidget::getName() const char *CMenuWidget::getName()
{ {
if (name != NONEXISTANT_LOCALE)
return g_Locale->getText(name);
return nameString.c_str(); return nameString.c_str();
} }

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

@@ -504,7 +504,7 @@ class CMenuWidget : public CMenuTarget, public CComponentsSignals
unsigned int saveScreen_x; unsigned int saveScreen_x;
protected: protected:
std::string nameString; std::string nameString;
neutrino_locale_t name;
CFrameBuffer *frameBuffer; CFrameBuffer *frameBuffer;
std::vector<CMenuItem*> items; std::vector<CMenuItem*> items;
std::vector<int> page_start; std::vector<int> page_start;