From fb8daec3e1a20a1f6bfdf54833eaaed7c3a15f33 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 10 Dec 2013 02:20:40 +0100 Subject: [PATCH] osd-setup: add option to switch clock on or off Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/25b1b3587211e05e9d3abf9a8605347bcad1db12 Author: vanhofen Date: 2013-12-10 (Tue, 10 Dec 2013) Origin message was: ------------------ - osd-setup: add option to switch clock on or off --- data/locale/deutsch.locale | 1 + data/locale/english.locale | 1 + src/gui/osd_setup.cpp | 6 ++++++ src/system/locals.h | 1 + src/system/locals_intern.h | 1 + 5 files changed, 10 insertions(+) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 05f7b95f8..bcc3522e3 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -811,6 +811,7 @@ menu.hint_channellist_foot Definiert, welche Informationen im unteren Sendungsfe menu.hint_channellist_setup Wählen Sie die Anzeigeoptionen für die Kanalliste menu.hint_channels Kanalliste öffnen menu.hint_ci Conditional-Access-Menü zum Einrichten Ihres CI-Moduls oder der eingebetteten Conax-Karte +menu.hint_clock_mode Schalten Sie die Uhr ein oder aus menu.hint_clock_size Stellen Sie die Größe der Info Uhr ein. menu.hint_colors Konfigurieren Sie die Menü-Farben menu.hint_content_back Ändern Sie die Hintergrundfarbe für den Fensterinhalt diff --git a/data/locale/english.locale b/data/locale/english.locale index c0c479050..91497394d 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -811,6 +811,7 @@ menu.hint_channellist_foot Show additional information\nin bottom box menu.hint_channellist_setup Configure channel list GUI options menu.hint_channels Open channel list menu.hint_ci Conditional access menu\nto setup your CI CAM or embeded Conax card +menu.hint_clock_mode Switch clock on or off menu.hint_clock_size Set the size of the info clock. menu.hint_colors Configure GUI colors menu.hint_content_back Change GUI window background color diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 775c543ef..a294d58d8 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -1006,6 +1006,12 @@ void COsdSetup::showOsdInfoclockSetup(CMenuWidget *menu_infoclock) { menu_infoclock->addIntroItems(LOCALE_MISCSETTINGS_INFOCLOCK); + CMenuOptionChooser *mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOCLOCK, &g_settings.mode_clock, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED); + mc->setHint("", LOCALE_MENU_HINT_CLOCK_MODE); + menu_infoclock->addItem(mc); + + menu_infoclock->addItem(GenericMenuSeparatorLine); + // size of info clock CMenuOptionNumberChooser* mn = new CMenuOptionNumberChooser(LOCALE_CLOCK_SIZE_HEIGHT, &g_settings.infoClockFontSize, true, 30, 120); mn->setHint("", LOCALE_MENU_HINT_CLOCK_SIZE); diff --git a/src/system/locals.h b/src/system/locals.h index 172dc346c..00081fbb1 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -838,6 +838,7 @@ typedef enum LOCALE_MENU_HINT_CHANNELLIST_SETUP, LOCALE_MENU_HINT_CHANNELS, LOCALE_MENU_HINT_CI, + LOCALE_MENU_HINT_CLOCK_MODE, LOCALE_MENU_HINT_CLOCK_SIZE, LOCALE_MENU_HINT_COLORS, LOCALE_MENU_HINT_CONTENT_BACK, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 0c4131a04..e739247ea 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -838,6 +838,7 @@ const char * locale_real_names[] = "menu.hint_channellist_setup", "menu.hint_channels", "menu.hint_ci", + "menu.hint_clock_mode", "menu.hint_clock_size", "menu.hint_colors", "menu.hint_content_back",