From 52f51e7f27e17179899cd0dc918f20de8de905b8 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Mon, 9 Dec 2013 23:12:23 +0100 Subject: [PATCH] - infoclock: cleanup (remove unneeded stuff) --- data/locale/deutsch.locale | 1 - data/locale/english.locale | 1 - src/gui/osd_setup.cpp | 7 ------- src/system/locals.h | 1 - src/system/locals_intern.h | 1 - 5 files changed, 11 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 07348386e..05f7b95f8 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -256,7 +256,6 @@ ci.reset_standby Reset nach Standby ci.settings Zugangskontrolle ci.timeout CAM antwortet nicht ci.waiting Warte auf CAM-Antwort -clock_size Info Uhr clock_size_height Höhe der Anzeige clock_switch_off Uhr ausblenden clock_switch_on Uhr einblenden diff --git a/data/locale/english.locale b/data/locale/english.locale index 03da9eb02..c0c479050 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -256,7 +256,6 @@ ci.reset_standby Reset after standby ci.settings Conditional access ci.timeout Timeout waiting CI menu ready ci.waiting Waiting for CI answer -clock_size Info clock clock_size_height Display height clock_switch_off Clock off clock_switch_on Clock on diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index ba8496b62..775c543ef 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -804,13 +804,6 @@ void COsdSetup::showOsdFontSizeSetup(CMenuWidget *menu_fonts) fontSettings->addItem(mf); w_index++; } -#if 0 - // size of info clock - fontSettings->addItem(GenericMenuSeparatorLine); - CMenuOptionNumberChooser* mn = new CMenuOptionNumberChooser(LOCALE_CLOCK_SIZE, &g_settings.infoClockFontSize, true, 30, 120); - mn->setHint("", LOCALE_MENU_HINT_CLOCK_SIZE); - fontSettings->addItem(mn); -#endif } //osd timeouts diff --git a/src/system/locals.h b/src/system/locals.h index 8677c2965..172dc346c 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -283,7 +283,6 @@ typedef enum LOCALE_CI_SETTINGS, LOCALE_CI_TIMEOUT, LOCALE_CI_WAITING, - LOCALE_CLOCK_SIZE, LOCALE_CLOCK_SIZE_HEIGHT, LOCALE_CLOCK_SWITCH_OFF, LOCALE_CLOCK_SWITCH_ON, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 71f95daab..0c4131a04 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -283,7 +283,6 @@ const char * locale_real_names[] = "ci.settings", "ci.timeout", "ci.waiting", - "clock_size", "clock_size_height", "clock_switch_off", "clock_switch_on",