mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

glcd: some locale adjustments

Browse Source 
Origin commit data
------------------
Commit: f46d8d1776
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-07-11 (Sat, 11 Jul 2020)

Origin message was:
------------------
- glcd: some locale adjustments
This commit is contained in:
vanhofen
2020-07-11 01:50:53 +02:00
parent 0c39f16487
commit a012e717b9
4 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
data/locale/deutsch.locale
View File

@@ -900,10 +900,10 @@ glcd.bar_width Fortschrittsbalken Weite
glcd.bar_x_position Fortschrittsbalken x-Position glcd.bar_x_position Fortschrittsbalken x-Position
glcd.bar_y_position Fortschrittsbalken y-Position glcd.bar_y_position Fortschrittsbalken y-Position
glcd.brightness Helligkeit glcd.brightness Helligkeit
glcd.brightness_standby Helligkeit im Standby glcd.brightness_standby Helligkeit im Standby-Modus
glcd.brightness_dim Dimmen glcd.brightness_dim Dimmen
glcd.brightness_dim_time Dimmen nach glcd.brightness_dim_time Dimmen nach
glcd.brightness_settings Helligkeits-Einstellungen glcd.brightness_settings Helligkeit
glcd.color.amber Amber glcd.color.amber Amber
glcd.color.black Schwarz glcd.color.black Schwarz
glcd.color.blue Blau glcd.color.blue Blau
@@ -943,12 +943,12 @@ glcd.logo_x_position Senderlogo x-Position
glcd.logo_y_position Senderlogo y-Position glcd.logo_y_position Senderlogo y-Position
glcd.mirror_osd OSD-Menü auf GraphLCD anzeigen glcd.mirror_osd OSD-Menü auf GraphLCD anzeigen
glcd.mirror_video Videobild auf GraphLCD anzeigen glcd.mirror_video Videobild auf GraphLCD anzeigen
glcd.position_settings Positions-Einstellungen glcd.position_settings Positionen und Größen
glcd.restart Neu erkennen glcd.restart Neu erkennen
glcd.scroll_speed Scroll-Geschwindigkeit glcd.scroll_speed Scroll-Geschwindigkeit
glcd.select.bar Fortschrittsbalken-Farbe glcd.select.bar Fortschrittsbalkenfarbe
glcd.select.bg Hintergrund-Farbe glcd.select.bg Hintergrundfarbe
glcd.select.fg Vordergrund-Farbe glcd.select.fg Textfarbe
glcd.show_duration Sendungsdauer anzeigen glcd.show_duration Sendungsdauer anzeigen
glcd.show_end Sendungsende anzeigen glcd.show_end Sendungsende anzeigen
glcd.show_logo Senderlogo anzeigen glcd.show_logo Senderlogo anzeigen
@@ -967,9 +967,8 @@ glcd.size_simple_clock Einfache Uhr Höhe
glcd.size_start Sendungsstart Höhe glcd.size_start Sendungsstart Höhe
glcd.size_time Uhrzeit Höhe glcd.size_time Uhrzeit Höhe
glcd.size_time_standby Uhrzeit Höhe im Standby glcd.size_time_standby Uhrzeit Höhe im Standby
glcd.theme Thema glcd.theme Theme auswählen
glcd.theme_position_settings Positions-Einstellungen glcd.theme_settings Themes
glcd.theme_settings Thema-Einstellungen
glcd.standby_analog_clock Analoge Uhr glcd.standby_analog_clock Analoge Uhr
glcd.standby_digital_clock Digitale Uhr glcd.standby_digital_clock Digitale Uhr
glcd.standby_lcd_clock LCD-Uhr glcd.standby_lcd_clock LCD-Uhr

37
src/gui/glcdsetup.cpp
View File

@@ -291,7 +291,7 @@ bool GLCD_Menu::changeNotify (const neutrino_locale_t OptionName, void *Data)
case LOCALE_GLCD_TIME_X_POSITION: case LOCALE_GLCD_TIME_X_POSITION:
case LOCALE_GLCD_TIME_Y_POSITION: case LOCALE_GLCD_TIME_Y_POSITION:
case LOCALE_GLCD_SCROLL_SPEED: case LOCALE_GLCD_SCROLL_SPEED:
case LOCALE_GLCD_THEME_POSITION_SETTINGS: case LOCALE_GLCD_POSITION_SETTINGS:
break; break;
default: default:
return false; return false;
@@ -319,8 +319,8 @@ bool GLCD_Menu::changeNotify (const neutrino_locale_t OptionName, void *Data)
int GLCD_Menu::GLCD_Menu_Settings() int GLCD_Menu::GLCD_Menu_Settings()
{ {
CMenuWidget *gms = new CMenuWidget(LOCALE_GLCD_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_GLCD_SETTINGS); CMenuWidget *gms = new CMenuWidget(LOCALE_MAINSETTINGS_LCD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_GLCD_SETTINGS);
gms->addIntroItems(); gms->addIntroItems(LOCALE_GLCD_HEAD);
//sigc::slot0<void> slot_repaint = sigc::mem_fun(gms, &CMenuWidget::paint); //we want to repaint after changed Option //sigc::slot0<void> slot_repaint = sigc::mem_fun(gms, &CMenuWidget::paint); //we want to repaint after changed Option
@@ -360,8 +360,8 @@ int GLCD_Menu::GLCD_Menu_Settings()
int GLCD_Menu::GLCD_Standby_Settings() int GLCD_Menu::GLCD_Standby_Settings()
{ {
CMenuWidget *gss = new CMenuWidget(LOCALE_GLCD_STANDBY_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_GLCD_STANDBY_SETTINGS); CMenuWidget *gss = new CMenuWidget(LOCALE_GLCD_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_GLCD_STANDBY_SETTINGS);
gss->addIntroItems(); gss->addIntroItems(LOCALE_GLCD_STANDBY_SETTINGS);
SNeutrinoGlcdTheme &t = g_settings.glcd_theme; SNeutrinoGlcdTheme &t = g_settings.glcd_theme;
CMenuOptionChooser *mc; CMenuOptionChooser *mc;
@@ -396,8 +396,8 @@ int GLCD_Menu::GLCD_Standby_Settings()
int GLCD_Menu::GLCD_Brightness_Settings() int GLCD_Menu::GLCD_Brightness_Settings()
{ {
CMenuWidget *gbs = new CMenuWidget(LOCALE_GLCD_BRIGHTNESS_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_GLCD_BRIGHTNESS_SETTINGS); CMenuWidget *gbs = new CMenuWidget(LOCALE_GLCD_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_GLCD_BRIGHTNESS_SETTINGS);
gbs->addIntroItems(); gbs->addIntroItems(LOCALE_GLCD_BRIGHTNESS_SETTINGS);
CMenuOptionNumberChooser *mn; CMenuOptionNumberChooser *mn;
CMenuForwarder *mf; CMenuForwarder *mf;
@@ -437,16 +437,19 @@ int GLCD_Menu::GLCD_Theme_Settings()
{ {
CColorSetupNotifier *colorSetupNotifier = new CColorSetupNotifier(); CColorSetupNotifier *colorSetupNotifier = new CColorSetupNotifier();
CMenuWidget *gts = new CMenuWidget(LOCALE_GLCD_THEME_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_GLCD_THEME_SETTINGS); CMenuWidget *gts = new CMenuWidget(LOCALE_GLCD_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_GLCD_THEME_SETTINGS);
gts->addIntroItems(); gts->addIntroItems(LOCALE_GLCD_THEME_SETTINGS);
int shortcut = 1;
SNeutrinoGlcdTheme &t = g_settings.glcd_theme; SNeutrinoGlcdTheme &t = g_settings.glcd_theme;
//sigc::slot0<void> slot_repaint = sigc::mem_fun(gts, &CMenuWidget::paint); //we want to repaint after changed Option //sigc::slot0<void> slot_repaint = sigc::mem_fun(gts, &CMenuWidget::paint); //we want to repaint after changed Option
gts->addItem(new CMenuForwarder(LOCALE_GLCD_THEME, true, NULL, CGLCDThemes::getInstance(), NULL, CRCInput::convertDigitToKey(shortcut++))); gts->addItem(new CMenuForwarder(LOCALE_GLCD_THEME, true, NULL, CGLCDThemes::getInstance(), NULL, CRCInput::RC_red));
gts->addItem(new CMenuForwarder(LOCALE_GLCD_FONT, true, t.glcd_font, this, "select_font", CRCInput::convertDigitToKey(shortcut++))); gts->addItem(GenericMenuSeparatorLine);
gts->addItem(new CMenuForwarder(LOCALE_GLCD_FONT, true, t.glcd_font, this, "select_font", CRCInput::RC_green));
gts->addItem(new CMenuForwarder(LOCALE_GLCD_POSITION_SETTINGS, t.glcd_position_settings, NULL, this, "position_settings", CRCInput::RC_yellow));
gts->addItem(GenericMenuSeparatorLine); gts->addItem(GenericMenuSeparatorLine);
@@ -459,8 +462,6 @@ int GLCD_Menu::GLCD_Theme_Settings()
CColorChooser* bar = new CColorChooser(LOCALE_GLCD_SELECT_BAR, &t.glcd_color_bar_red, &t.glcd_color_bar_green, &t.glcd_color_bar_blue, NULL, colorSetupNotifier); CColorChooser* bar = new CColorChooser(LOCALE_GLCD_SELECT_BAR, &t.glcd_color_bar_red, &t.glcd_color_bar_green, &t.glcd_color_bar_blue, NULL, colorSetupNotifier);
gts->addItem(new CMenuDForwarder(LOCALE_GLCD_SELECT_BAR, true, NULL, bar)); gts->addItem(new CMenuDForwarder(LOCALE_GLCD_SELECT_BAR, true, NULL, bar));
gts->addItem(new CMenuForwarder(LOCALE_GLCD_POSITION_SETTINGS, t.glcd_position_settings, NULL, this, "position_settings", CRCInput::convertDigitToKey(shortcut++)));
//delete colorSetupNotifier; //delete colorSetupNotifier;
int res = gts->exec(NULL, ""); int res = gts->exec(NULL, "");
delete gts; delete gts;
@@ -470,8 +471,8 @@ int GLCD_Menu::GLCD_Theme_Settings()
int GLCD_Menu::GLCD_Theme_Position_Settings() int GLCD_Menu::GLCD_Theme_Position_Settings()
{ {
CMenuWidget *gtps = new CMenuWidget(LOCALE_GLCD_THEME_POSITION_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_GLCD_THEME_POSITION_SETTINGS); CMenuWidget *gtps = new CMenuWidget(LOCALE_GLCD_THEME_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_GLCD_THEME_POSITION_SETTINGS);
gtps->addIntroItems(); gtps->addIntroItems(LOCALE_GLCD_POSITION_SETTINGS);
SNeutrinoGlcdTheme &t = g_settings.glcd_theme; SNeutrinoGlcdTheme &t = g_settings.glcd_theme;
//sigc::slot0<void> slot_repaint = sigc::mem_fun(gtps, &CMenuWidget::paint); //we want to repaint after changed Option //sigc::slot0<void> slot_repaint = sigc::mem_fun(gtps, &CMenuWidget::paint); //we want to repaint after changed Option
@@ -592,11 +593,9 @@ int GLCD_Menu::GLCD_Menu_Select_Driver()
if (cGLCD::getInstance()->GetConfigSize() > 1) if (cGLCD::getInstance()->GetConfigSize() > 1)
{ {
CMenuWidget *m = new CMenuWidget(LOCALE_GLCD_HEAD, NEUTRINO_ICON_SETTINGS); CMenuWidget *m = new CMenuWidget(LOCALE_GLCD_HEAD, NEUTRINO_ICON_SETTINGS);
m->addIntroItems(LOCALE_GLCD_DISPLAY);
CMenuSelectorTarget * selector = new CMenuSelectorTarget(&select); CMenuSelectorTarget * selector = new CMenuSelectorTarget(&select);
// we don't show introitems, so we add a separator for a smoother view
m->addItem(GenericMenuSeparator);
CMenuForwarder* mf; CMenuForwarder* mf;
for (int i = 0; i < cGLCD::getInstance()->GetConfigSize(); i++) for (int i = 0; i < cGLCD::getInstance()->GetConfigSize(); i++)
{ {

1
src/system/locals.h
View File

@@ -995,7 +995,6 @@ typedef enum
LOCALE_GLCD_SIZE_TIME, LOCALE_GLCD_SIZE_TIME,
LOCALE_GLCD_SIZE_TIME_STANDBY, LOCALE_GLCD_SIZE_TIME_STANDBY,
LOCALE_GLCD_THEME, LOCALE_GLCD_THEME,
LOCALE_GLCD_THEME_POSITION_SETTINGS,
LOCALE_GLCD_THEME_SETTINGS, LOCALE_GLCD_THEME_SETTINGS,
LOCALE_GLCD_STANDBY_ANALOG_CLOCK, LOCALE_GLCD_STANDBY_ANALOG_CLOCK,
LOCALE_GLCD_STANDBY_DIGITAL_CLOCK, LOCALE_GLCD_STANDBY_DIGITAL_CLOCK,

1
src/system/locals_intern.h
View File

@@ -995,7 +995,6 @@ const char * locale_real_names[] =
"glcd.size_time", "glcd.size_time",
"glcd.size_time_standby", "glcd.size_time_standby",
"glcd.theme", "glcd.theme",
"glcd.theme_position_settings",
"glcd.theme_settings", "glcd.theme_settings",
"glcd.standby_analog_clock", "glcd.standby_analog_clock",
"glcd.standby_digital_clock", "glcd.standby_digital_clock",