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

Merge branch 'check/next-cc'

Browse Source 
Only compile-tested.
This commit is contained in:
Stefan Seyfried
2013-11-30 20:17:31 +01:00
parent 51422b1763 bf8ec4d89e
commit b5e736e81b
83 changed files with 913 additions and 652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/osdlang_setup.cpp
View File

@@ -60,6 +60,7 @@ COsdLangSetup::COsdLangSetup(bool wizard_mode)
is_wizard = wizard_mode;
width = w_max (45, 10);
tzNotifier = NULL;
}
COsdLangSetup::~COsdLangSetup()
@@ -97,6 +98,7 @@ int COsdLangSetup::showLocalSetup()
localSettings->addItem(mf);
//timezone setup
tzNotifier = new CTZChangeNotifier();
CMenuOptionStringChooser* tzSelect = getTzItems();
if (tzSelect != NULL)
localSettings->addItem(tzSelect);
@@ -115,6 +117,7 @@ int COsdLangSetup::showLocalSetup()
int res = localSettings->exec(NULL, "");
delete localSettings;
delete langNotifier;
delete tzNotifier;
return res;
}
@@ -127,7 +130,7 @@ CMenuOptionStringChooser* COsdLangSetup::getTzItems()
CMenuOptionStringChooser* tzSelect = NULL;
if (parser != NULL)
{
tzSelect = new CMenuOptionStringChooser(LOCALE_MAINSETTINGS_TIMEZONE, g_settings.timezone, true, new CTZChangeNotifier(), CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN, true);
tzSelect = new CMenuOptionStringChooser(LOCALE_MAINSETTINGS_TIMEZONE, g_settings.timezone, true, tzNotifier, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN, true);
tzSelect->setHint("", LOCALE_MENU_HINT_TIMEZONE);
xmlNodePtr search = xmlDocGetRootElement(parser)->xmlChildrenNode;
bool found = false;