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

- osd_progressbar_setup: rework locales; marginal changes in code

Browse Source 
Conflicts:
	data/locale/deutsch.locale
This commit is contained in:
svenhoefer
2013-03-26 00:48:04 +01:00
committed by [CST] Focus
parent 6bb85ef71d
commit c20d1ef6eb
6 changed files with 94 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/gui/osd_progressbar_setup.cpp
View File

@@ -39,22 +39,22 @@
#include <system/debug.h>
#define LOCALE_MISCSETTINGS_INFOBAR_POSITION_COUNT 4
const CMenuOptionChooser::keyval LOCALE_MISCSETTINGS_INFOBAR_POSITION_OPTIONS[LOCALE_MISCSETTINGS_INFOBAR_POSITION_COUNT]=
#define PROGRESSBAR_INFOBAR_POSITION_COUNT 4
const CMenuOptionChooser::keyval PROGRESSBAR_INFOBAR_POSITION_OPTIONS[PROGRESSBAR_INFOBAR_POSITION_COUNT]=
{
{ 0 , LOCALE_MISCSETTINGS_INFOBAR_POSITION_0 },
{ 1 , LOCALE_MISCSETTINGS_INFOBAR_POSITION_1 },
{ 2 , LOCALE_MISCSETTINGS_INFOBAR_POSITION_2 },
{ 3 , LOCALE_MISCSETTINGS_INFOBAR_POSITION_3 }
{ 0 , LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_0 },
{ 1 , LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_1 },
{ 2 , LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_2 },
{ 3 , LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_3 }
};
#define LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN_COUNT 4
const CMenuOptionChooser::keyval LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN_OPTIONS[LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN_COUNT]=
#define PROGRESSBAR_DESIGN_COUNT 4
const CMenuOptionChooser::keyval PROGRESSBAR_DESIGN_OPTIONS[PROGRESSBAR_DESIGN_COUNT]=
{
{ 0 , LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN_0 },
{ 1 , LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN_1 },
{ 2 , LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN_2 },
{ 3 , LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN_3 }
{ 0 , LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_0 },
{ 1 , LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_1 },
{ 2 , LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_2 },
{ 3 , LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_3 }
};
CProgressbarSetup::CProgressbarSetup()
@@ -83,31 +83,32 @@ int CProgressbarSetup::showMenu()
CMenuWidget *progress = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_PROGRESSBAR);
//intros: back ande save
progress->addIntroItems(LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR);
progress->addIntroItems(LOCALE_MISCSETTINGS_PROGRESSBAR);
//infobar progresscolor on/off
COnOffNotifier* miscProgressNotifier = new COnOffNotifier(0);
CMenuOptionChooser *progresscolor;
progresscolor = new CMenuOptionChooser(LOCALE_PROGRESSBAR_COLOR, &g_settings.progressbar_color, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, miscProgressNotifier);
progresscolor->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_COLOR);
//color on/off
CMenuOptionChooser *color;
color = new CMenuOptionChooser(LOCALE_MISCSETTINGS_PROGRESSBAR_COLOR, &g_settings.progressbar_color, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, miscProgressNotifier);
color->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_COLOR);
//infobar design
CMenuOptionChooser *progressdesign = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN, &g_settings.progressbar_design, LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN_OPTIONS, LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN_COUNT, g_settings.progressbar_color);
progressdesign->setHint("", LOCALE_MENU_HINT_INFOBAR_PROGRESSBAR_DESIGN);
//design
CMenuOptionChooser *design;
design = new CMenuOptionChooser(LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN, &g_settings.progressbar_design, PROGRESSBAR_DESIGN_OPTIONS, PROGRESSBAR_DESIGN_COUNT, g_settings.progressbar_color);
design->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_DESIGN);
//infobar progressbarposition
CMenuOptionChooser *progressbarposition;
progressbarposition = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_POSITION, &g_settings.infobar_progressbar, LOCALE_MISCSETTINGS_INFOBAR_POSITION_OPTIONS, LOCALE_MISCSETTINGS_INFOBAR_POSITION_COUNT, true);
progressbarposition->setHint("", LOCALE_MENU_HINT_INFOBAR_POSITION);
//infobar position
CMenuOptionChooser *infobar_position;
infobar_position = new CMenuOptionChooser(LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION, &g_settings.infobar_progressbar, PROGRESSBAR_INFOBAR_POSITION_OPTIONS, PROGRESSBAR_INFOBAR_POSITION_COUNT, true);
infobar_position->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_INFOBAR_POSITION);
miscProgressNotifier->addItem(progressdesign);
miscProgressNotifier->addItem(design);
//paint items
progress->addItem(progresscolor);
progress->addItem(progressdesign);
progress->addItem(color);
progress->addItem(design);
progress->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MISCSETTINGS_INFOBAR));
progress->addItem(progressbarposition);
progress->addItem(infobar_position);
int res = progress->exec (NULL, "");
delete miscProgressNotifier;

6
src/gui/osd_setup.cpp
View File

@@ -429,9 +429,9 @@ int COsdSetup::showOsdSetup()
osd_menu->addItem(mf);
//progressbar
CMenuForwarder * progress = new CMenuForwarder(LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR, true, NULL, new CProgressbarSetup(), NULL, CRCInput::RC_1);
progress->setHint("", LOCALE_MENU_HINT_INFOBAR_PROGRESSBAR);
osd_menu->addItem(progress);
mf = new CMenuForwarder(LOCALE_MISCSETTINGS_PROGRESSBAR, true, NULL, new CProgressbarSetup(), NULL, CRCInput::RC_1);
mf->setHint("", LOCALE_MENU_HINT_PROGRESSBAR);
osd_menu->addItem(mf);
//infobar
CMenuWidget osd_menu_infobar(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP_INFOBAR);

30
src/system/locals.h
View File

@@ -834,9 +834,6 @@ typedef enum
LOCALE_MENU_HINT_INFOBAR_LOGO,
LOCALE_MENU_HINT_INFOBAR_LOGO_DIR,
LOCALE_MENU_HINT_INFOBAR_ON_EPG,
LOCALE_MENU_HINT_INFOBAR_POSITION,
LOCALE_MENU_HINT_INFOBAR_PROGRESSBAR,
LOCALE_MENU_HINT_INFOBAR_PROGRESSBAR_DESIGN,
LOCALE_MENU_HINT_INFOBAR_RADIOTEXT,
LOCALE_MENU_HINT_INFOBAR_RES,
LOCALE_MENU_HINT_INFOBAR_SAT,
@@ -969,7 +966,10 @@ typedef enum
LOCALE_MENU_HINT_POWER_LEDS,
LOCALE_MENU_HINT_PREF_LANG,
LOCALE_MENU_HINT_PREF_SUBS,
LOCALE_MENU_HINT_PROGRESSBAR,
LOCALE_MENU_HINT_PROGRESSBAR_COLOR,
LOCALE_MENU_HINT_PROGRESSBAR_DESIGN,
LOCALE_MENU_HINT_PROGRESSBAR_INFOBAR_POSITION,
LOCALE_MENU_HINT_PROTECTION,
LOCALE_MENU_HINT_RADIOMODE,
LOCALE_MENU_HINT_REBOOT,
@@ -1179,17 +1179,6 @@ typedef enum
LOCALE_MISCSETTINGS_INFOBAR_DISP_6,
LOCALE_MISCSETTINGS_INFOBAR_DISP_LOG,
LOCALE_MISCSETTINGS_INFOBAR_LOGO_HDD_DIR,
LOCALE_MISCSETTINGS_INFOBAR_POSITION,
LOCALE_MISCSETTINGS_INFOBAR_POSITION_0,
LOCALE_MISCSETTINGS_INFOBAR_POSITION_1,
LOCALE_MISCSETTINGS_INFOBAR_POSITION_2,
LOCALE_MISCSETTINGS_INFOBAR_POSITION_3,
LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR,
LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN,
LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN_0,
LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN_1,
LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN_2,
LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN_3,
LOCALE_MISCSETTINGS_INFOBAR_SAT_DISPLAY,
LOCALE_MISCSETTINGS_INFOBAR_SHOW,
LOCALE_MISCSETTINGS_INFOBAR_SHOW_DD_AVAILABLE,
@@ -1197,6 +1186,18 @@ typedef enum
LOCALE_MISCSETTINGS_INFOBAR_SHOW_RES_SIMPLE,
LOCALE_MISCSETTINGS_INFOBAR_SHOW_SYSFS_HDD,
LOCALE_MISCSETTINGS_INFOBAR_SHOW_TUNER,
LOCALE_MISCSETTINGS_PROGRESSBAR,
LOCALE_MISCSETTINGS_PROGRESSBAR_COLOR,
LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN,
LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_0,
LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_1,
LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_2,
LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_3,
LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION,
LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_0,
LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_1,
LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_2,
LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_3,
LOCALE_MISCSETTINGS_RADIOTEXT,
LOCALE_MISCSETTINGS_SHUTDOWN_COUNT,
LOCALE_MISCSETTINGS_SHUTDOWN_COUNT_HINT1,
@@ -1550,7 +1551,6 @@ typedef enum
LOCALE_PINPROTECTION_WRONGCODE,
LOCALE_PLUGINS_HDD_DIR,
LOCALE_PLUGINS_RESULT,
LOCALE_PROGRESSBAR_COLOR,
LOCALE_RCLOCK_LOCKMSG,
LOCALE_RCLOCK_MENUEADD,
LOCALE_RCLOCK_TITLE,

30
src/system/locals_intern.h
View File

@@ -834,9 +834,6 @@ const char * locale_real_names[] =
"menu.hint_infobar_logo",
"menu.hint_infobar_logo_dir",
"menu.hint_infobar_on_epg",
"menu.hint_infobar_position",
"menu.hint_infobar_progressbar",
"menu.hint_infobar_progressbar_design",
"menu.hint_infobar_radiotext",
"menu.hint_infobar_res",
"menu.hint_infobar_sat",
@@ -969,7 +966,10 @@ const char * locale_real_names[] =
"menu.hint_power_leds",
"menu.hint_pref_lang",
"menu.hint_pref_subs",
"menu.hint_progressbar",
"menu.hint_progressbar_color",
"menu.hint_progressbar_design",
"menu.hint_progressbar_infobar_position",
"menu.hint_protection",
"menu.hint_radiomode",
"menu.hint_reboot",
@@ -1179,17 +1179,6 @@ const char * locale_real_names[] =
"miscsettings.infobar_disp_6",
"miscsettings.infobar_disp_log",
"miscsettings.infobar_logo_hdd_dir",
"miscsettings.infobar_position",
"miscsettings.infobar_position_0",
"miscsettings.infobar_position_1",
"miscsettings.infobar_position_2",
"miscsettings.infobar_position_3",
"miscsettings.infobar_progressbar",
"miscsettings.infobar_progressbar_design",
"miscsettings.infobar_progressbar_design_0",
"miscsettings.infobar_progressbar_design_1",
"miscsettings.infobar_progressbar_design_2",
"miscsettings.infobar_progressbar_design_3",
"miscsettings.infobar_sat_display",
"miscsettings.infobar_show",
"miscsettings.infobar_show_dd_available",
@@ -1197,6 +1186,18 @@ const char * locale_real_names[] =
"miscsettings.infobar_show_res_simple",
"miscsettings.infobar_show_sysfs_hdd",
"miscsettings.infobar_show_tuner",
"miscsettings.progressbar",
"miscsettings.progressbar_color",
"miscsettings.progressbar_design",
"miscsettings.progressbar_design_0",
"miscsettings.progressbar_design_1",
"miscsettings.progressbar_design_2",
"miscsettings.progressbar_design_3",
"miscsettings.progressbar_infobar_position",
"miscsettings.progressbar_infobar_position_0",
"miscsettings.progressbar_infobar_position_1",
"miscsettings.progressbar_infobar_position_2",
"miscsettings.progressbar_infobar_position_3",
"miscsettings.radiotext",
"miscsettings.shutdown_count",
"miscsettings.shutdown_count_hint1",
@@ -1550,7 +1551,6 @@ const char * locale_real_names[] =
"pinprotection.wrongcode",
"plugins.hdd_dir",
"plugins.result",
"progressbar.color",
"rclock.lockmsg",
"rclock.menueadd",
"rclock.title",