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

Revert "CStringInput: remove possible display of NONEXISTANT_LOCALE"

Browse Source 
This reverts commit 4e853d98c2.

Conflicts:
	src/gui/widget/stringinput.cpp
This commit is contained in:
Thilo Graf
2016-12-27 13:15:32 +01:00
parent 3cd509aa2d
commit b9eeaf74dc
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/widget/stringinput.cpp
View File

@@ -47,7 +47,8 @@
CStringInput::CStringInput(const neutrino_locale_t Name, std::string* Value, int Size, const neutrino_locale_t Hint_1, const neutrino_locale_t Hint_2, const char * const Valid_Chars, CChangeObserver* Observ, const char * const Icon) CStringInput::CStringInput(const neutrino_locale_t Name, std::string* Value, int Size, const neutrino_locale_t Hint_1, const neutrino_locale_t Hint_2, const char * const Valid_Chars, CChangeObserver* Observ, const char * const Icon)
{ {
title = g_Locale->getText(Name); name = Name;
head = g_Locale->getText(Name);
valueString = Value; valueString = Value;
lower_bound = -1; lower_bound = -1;
upper_bound = -1; upper_bound = -1;
@@ -64,7 +65,8 @@ CStringInput::CStringInput(const neutrino_locale_t Name, std::string* Value, int
CStringInput::CStringInput(const std::string &Name, std::string *Value, int Size, const neutrino_locale_t Hint_1, const neutrino_locale_t Hint_2, const char * const Valid_Chars, CChangeObserver* Observ, const char * const Icon) CStringInput::CStringInput(const std::string &Name, std::string *Value, int Size, const neutrino_locale_t Hint_1, const neutrino_locale_t Hint_2, const char * const Valid_Chars, CChangeObserver* Observ, const char * const Icon)
{ {
title = Name; name = NONEXISTANT_LOCALE;
head = Name;
valueString = Value; valueString = Value;
lower_bound = -1; lower_bound = -1;
upper_bound = -1; upper_bound = -1;
@@ -113,7 +115,7 @@ void CStringInput::init()
width = std::max(size*input_w + 2*offset, (int) frameBuffer->getScreenWidth() / 100 * 45); width = std::max(size*input_w + 2*offset, (int) frameBuffer->getScreenWidth() / 100 * 45);
int tmp_w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(title); int tmp_w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(head);
if (!(iconfile.empty())) if (!(iconfile.empty()))
{ {
@@ -495,7 +497,7 @@ int CStringInput::exec( CMenuTarget* parent, const std::string & )
else if ( (msg==CRCInput::RC_home) || (msg==CRCInput::RC_timeout) ) else if ( (msg==CRCInput::RC_home) || (msg==CRCInput::RC_timeout) )
{ {
if ((trim (*valueString) != trim(oldval)) && if ((trim (*valueString) != trim(oldval)) &&
(ShowMsg(title, LOCALE_MESSAGEBOX_DISCARD, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbCancel) == CMsgBox::mbrCancel)) { (ShowMsg(name, LOCALE_MESSAGEBOX_DISCARD, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbCancel) == CMsgBox::mbrCancel)) {
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]); timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
continue; continue;
} }
@@ -540,7 +542,7 @@ int CStringInput::exec( CMenuTarget* parent, const std::string & )
if ( (observ) && (msg==CRCInput::RC_ok) ) if ( (observ) && (msg==CRCInput::RC_ok) )
{ {
observ->changeNotify(title, (void *) valueString->c_str()); observ->changeNotify(name, (void *) valueString->c_str());
} }
return res; return res;
} }
@@ -561,7 +563,7 @@ void CStringInput::paint(bool sms)
frameBuffer->paintBoxRel(x + OFFSET_SHADOW, y + OFFSET_SHADOW, width, height, COL_SHADOW_PLUS_0, RADIUS_LARGE, CORNER_ALL); //round frameBuffer->paintBoxRel(x + OFFSET_SHADOW, y + OFFSET_SHADOW, width, height, COL_SHADOW_PLUS_0, RADIUS_LARGE, CORNER_ALL); //round
frameBuffer->paintBoxRel(x, y + hheight, width, bheight, COL_MENUCONTENT_PLUS_0, sms ? 0 : RADIUS_LARGE, CORNER_BOTTOM); frameBuffer->paintBoxRel(x, y + hheight, width, bheight, COL_MENUCONTENT_PLUS_0, sms ? 0 : RADIUS_LARGE, CORNER_BOTTOM);
CComponentsHeader header(x, y, width, hheight, title, iconfile); CComponentsHeader header(x, y, width, hheight, head, iconfile);
header.paint(CC_SAVE_SCREEN_NO); header.paint(CC_SAVE_SCREEN_NO);
int tmp_y = y+ hheight+ offset+ input_h+ offset; int tmp_y = y+ hheight+ offset+ input_h+ offset;
@@ -859,7 +861,7 @@ int CPINInput::exec( CMenuTarget* parent, const std::string & )
if ( (observ) && (msg==CRCInput::RC_ok) ) if ( (observ) && (msg==CRCInput::RC_ok) )
{ {
observ->changeNotify(title, (void *) valueString->c_str()); observ->changeNotify(name, (void *) valueString->c_str());
} }
return res; return res;

3
src/gui/widget/stringinput.h
View File

@@ -53,7 +53,8 @@ class CStringInput : public CMenuTarget
uint32_t smstimer; uint32_t smstimer;
std::string title; std::string head;
neutrino_locale_t name;
neutrino_locale_t hint_1, hint_2; neutrino_locale_t hint_1, hint_2;
std::string iconfile; std::string iconfile;
const char * validchars; const char * validchars;