From eb8fbeba27db8d3c88d321ee60c3ac503b85db2c Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 9 Sep 2012 14:37:15 +0200 Subject: [PATCH] Implemented the setup options "OSD/Color key [0123]" --- CONTRIBUTORS | 3 +++ HISTORY | 8 +++++++- MANUAL | 8 ++++++++ config.c | 14 +++++++++++++- config.h | 3 ++- menu.c | 11 ++++++++++- po/ar.po | 14 +++++++++++++- po/ca_ES.po | 14 +++++++++++++- po/cs_CZ.po | 14 +++++++++++++- po/da_DK.po | 14 +++++++++++++- po/de_DE.po | 14 +++++++++++++- po/el_GR.po | 14 +++++++++++++- po/es_ES.po | 14 +++++++++++++- po/et_EE.po | 14 +++++++++++++- po/fi_FI.po | 14 +++++++++++++- po/fr_FR.po | 14 +++++++++++++- po/hr_HR.po | 14 +++++++++++++- po/hu_HU.po | 14 +++++++++++++- po/it_IT.po | 14 +++++++++++++- po/lt_LT.po | 14 +++++++++++++- po/mk_MK.po | 14 +++++++++++++- po/nl_NL.po | 14 +++++++++++++- po/nn_NO.po | 14 +++++++++++++- po/pl_PL.po | 14 +++++++++++++- po/pt_PT.po | 14 +++++++++++++- po/ro_RO.po | 14 +++++++++++++- po/ru_RU.po | 14 +++++++++++++- po/sk_SK.po | 14 +++++++++++++- po/sl_SI.po | 14 +++++++++++++- po/sr_SR.po | 14 +++++++++++++- po/sv_SE.po | 14 +++++++++++++- po/tr_TR.po | 14 +++++++++++++- po/uk_UA.po | 14 +++++++++++++- po/zh_CN.po | 14 +++++++++++++- skinclassic.c | 13 ++++++++----- skinlcars.c | 30 +++++++++++++++++------------- skinsttng.c | 13 ++++++++----- 37 files changed, 440 insertions(+), 55 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index f603691e..515c3e13 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2936,3 +2936,6 @@ Mehdi Karamnejad Dennis Bendlin for a patch that implements FHS support + +Oliver Schinagl + for a patch that was used to implement the setup options "OSD/Color key [0123]" diff --git a/HISTORY b/HISTORY index 4f87b59e..6dfb7176 100644 --- a/HISTORY +++ b/HISTORY @@ -7191,7 +7191,7 @@ Video Disk Recorder Revision History turn on adding the source character to channel names whenever they are displayed (suggested by Ludi Kaleni). -2012-09-07: Version 1.7.30 +2012-09-09: Version 1.7.30 - Fixed sorting recordings in the top level video directory. - Fixed handling control characters in SI data in case of UTF-8 encoded strings @@ -7228,3 +7228,9 @@ Video Disk Recorder Revision History of the index file). - Fixed sluggish response when manipulating editing marks while a cutting thread is running (reported by Torsten Lang). +- The new setup options "OSD/Color key [0123]" can be used to adjust the sequence + of the color buttons displayed in the menus to that of the color keys on your + remote control (based on a patch from Oliver Schinagl). + Authors of plugins that implement skins may want to adapt their SetButtons() + function in order to make use of this new feature. See, for instance, the function + cSkinClassicDisplayMenu::SetButtons() in skinclassic.c for details. diff --git a/MANUAL b/MANUAL index 5d3c9a53..56a304df 100644 --- a/MANUAL +++ b/MANUAL @@ -601,6 +601,14 @@ Version 1.6 characters in a text input field. You may want to set this to "no" if you are using an actual keyboard to control VDR. + Color key 0 = 0 By default, VDR assumes that the sequence of the color + Color key 1 = 1 keys on the remote control is red-green-yellow-blue. If + Color key 2 = 2 your remote control has these keys in a different sequence, + Color key 3 = 3 you can adjust these parameters to reorder the corresponding + color buttons in the menus accordingly. Note that this does + not change the functionality of the individual keys; it only + changes the sequence in which the color buttons are displayed. + EPG: EPG scan timeout = 5 The time (in hours) of user inactivity after which the diff --git a/config.c b/config.c index 56454dfa..3fb4d6dc 100644 --- a/config.c +++ b/config.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.c 2.26 2012/06/17 12:27:07 kls Exp $ + * $Id: config.c 2.27 2012/09/09 12:58:23 kls Exp $ */ #include "config.h" @@ -418,6 +418,10 @@ cSetup::cSetup(void) RecordingDirs = 1; FoldersInTimerMenu = 1; NumberKeysForChars = 1; + ColorKey0 = 0; + ColorKey1 = 1; + ColorKey2 = 2; + ColorKey3 = 3; VideoDisplayFormat = 1; VideoFormat = 0; UpdateChannels = 5; @@ -614,6 +618,10 @@ bool cSetup::Parse(const char *Name, const char *Value) else if (!strcasecmp(Name, "RecordingDirs")) RecordingDirs = atoi(Value); else if (!strcasecmp(Name, "FoldersInTimerMenu")) FoldersInTimerMenu = atoi(Value); else if (!strcasecmp(Name, "NumberKeysForChars")) NumberKeysForChars = atoi(Value); + else if (!strcasecmp(Name, "ColorKey0")) ColorKey0 = atoi(Value); + else if (!strcasecmp(Name, "ColorKey1")) ColorKey1 = atoi(Value); + else if (!strcasecmp(Name, "ColorKey2")) ColorKey2 = atoi(Value); + else if (!strcasecmp(Name, "ColorKey3")) ColorKey3 = atoi(Value); else if (!strcasecmp(Name, "VideoDisplayFormat")) VideoDisplayFormat = atoi(Value); else if (!strcasecmp(Name, "VideoFormat")) VideoFormat = atoi(Value); else if (!strcasecmp(Name, "UpdateChannels")) UpdateChannels = atoi(Value); @@ -713,6 +721,10 @@ bool cSetup::Save(void) Store("RecordingDirs", RecordingDirs); Store("FoldersInTimerMenu", FoldersInTimerMenu); Store("NumberKeysForChars", NumberKeysForChars); + Store("ColorKey0", ColorKey0); + Store("ColorKey1", ColorKey1); + Store("ColorKey2", ColorKey2); + Store("ColorKey3", ColorKey3); Store("VideoDisplayFormat", VideoDisplayFormat); Store("VideoFormat", VideoFormat); Store("UpdateChannels", UpdateChannels); diff --git a/config.h b/config.h index b4428215..a58b75c7 100644 --- a/config.h +++ b/config.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 2.50 2012/07/15 10:51:56 kls Exp $ + * $Id: config.h 2.51 2012/09/09 12:57:33 kls Exp $ */ #ifndef __CONFIG_H @@ -288,6 +288,7 @@ public: int RecordingDirs; int FoldersInTimerMenu; int NumberKeysForChars; + int ColorKey0, ColorKey1, ColorKey2, ColorKey3; int VideoDisplayFormat; int VideoFormat; int UpdateChannels; diff --git a/menu.c b/menu.c index b3744637..1b9346c3 100644 --- a/menu.c +++ b/menu.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: menu.c 2.59 2012/09/09 09:19:15 kls Exp $ + * $Id: menu.c 2.60 2012/09/09 12:23:00 kls Exp $ */ #include "menu.h" @@ -2510,6 +2510,7 @@ void cMenuSetupBase::Store(void) class cMenuSetupOSD : public cMenuSetupBase { private: const char *useSmallFontTexts[3]; + const char *keyColorTexts[4]; int osdLanguageIndex; int numSkins; int originalSkinIndex; @@ -2560,6 +2561,10 @@ void cMenuSetupOSD::Set(void) useSmallFontTexts[0] = tr("never"); useSmallFontTexts[1] = tr("skin dependent"); useSmallFontTexts[2] = tr("always"); + keyColorTexts[0] = tr("Key$Red"); + keyColorTexts[1] = tr("Key$Green"); + keyColorTexts[2] = tr("Key$Yellow"); + keyColorTexts[3] = tr("Key$Blue"); Clear(); SetSection(tr("OSD")); Add(new cMenuEditStraItem(tr("Setup.OSD$Language"), &osdLanguageIndex, I18nNumLanguagesWithLocale(), &I18nLanguages()->At(0))); @@ -2589,6 +2594,10 @@ void cMenuSetupOSD::Set(void) Add(new cMenuEditBoolItem(tr("Setup.OSD$Recording directories"), &data.RecordingDirs)); Add(new cMenuEditBoolItem(tr("Setup.OSD$Folders in timer menu"), &data.FoldersInTimerMenu)); Add(new cMenuEditBoolItem(tr("Setup.OSD$Number keys for characters"), &data.NumberKeysForChars)); + Add(new cMenuEditStraItem(tr("Setup.OSD$Color key 0"), &data.ColorKey0, 4, keyColorTexts)); + Add(new cMenuEditStraItem(tr("Setup.OSD$Color key 1"), &data.ColorKey1, 4, keyColorTexts)); + Add(new cMenuEditStraItem(tr("Setup.OSD$Color key 2"), &data.ColorKey2, 4, keyColorTexts)); + Add(new cMenuEditStraItem(tr("Setup.OSD$Color key 3"), &data.ColorKey3, 4, keyColorTexts)); SetCurrent(Get(current)); Display(); } diff --git a/po/ar.po b/po/ar.po index ddfc50a6..8347285e 100644 --- a/po/ar.po +++ b/po/ar.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 13:59+0200\n" +"POT-Creation-Date: 2012-09-09 15:20+0200\n" "PO-Revision-Date: 2008-10-16 11:16-0400\n" "Last-Translator: Osama Alrawab \n" "Language-Team: Arabic \n" @@ -870,6 +870,18 @@ msgstr "مدة معلومات القناة" msgid "Setup.OSD$Number keys for characters" msgstr "زر اغلاق القاائمة" +msgid "Setup.OSD$Color key 0" +msgstr "" + +msgid "Setup.OSD$Color key 1" +msgstr "" + +msgid "Setup.OSD$Color key 2" +msgstr "" + +msgid "Setup.OSD$Color key 3" +msgstr "" + msgid "EPG" msgstr "الدليل الالكتونى للقنوات" diff --git a/po/ca_ES.po b/po/ca_ES.po index ce13921c..ce863deb 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 13:59+0200\n" +"POT-Creation-Date: 2012-09-09 15:20+0200\n" "PO-Revision-Date: 2008-03-02 19:02+0100\n" "Last-Translator: Luca Olivetti \n" "Language-Team: Catalan \n" @@ -852,6 +852,18 @@ msgstr "" msgid "Setup.OSD$Number keys for characters" msgstr "" +msgid "Setup.OSD$Color key 0" +msgstr "" + +msgid "Setup.OSD$Color key 1" +msgstr "" + +msgid "Setup.OSD$Color key 2" +msgstr "" + +msgid "Setup.OSD$Color key 3" +msgstr "" + msgid "EPG" msgstr "Guia de Programes" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 96193613..96f6b146 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.7.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 13:59+0200\n" +"POT-Creation-Date: 2012-09-09 15:20+0200\n" "PO-Revision-Date: 2010-05-06 11:00+0200\n" "Last-Translator: Radek Šťastný \n" "Language-Team: Czech \n" @@ -851,6 +851,18 @@ msgstr "Složky v menu časovače" msgid "Setup.OSD$Number keys for characters" msgstr "" +msgid "Setup.OSD$Color key 0" +msgstr "" + +msgid "Setup.OSD$Color key 1" +msgstr "" + +msgid "Setup.OSD$Color key 2" +msgstr "" + +msgid "Setup.OSD$Color key 3" +msgstr "" + msgid "EPG" msgstr "EPG" diff --git a/po/da_DK.po b/po/da_DK.po index 5a463b9e..3615bc74 100644 --- a/po/da_DK.po +++ b/po/da_DK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 13:59+0200\n" +"POT-Creation-Date: 2012-09-09 15:20+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Mogens Elneff \n" "Language-Team: Danish \n" @@ -849,6 +849,18 @@ msgstr "" msgid "Setup.OSD$Number keys for characters" msgstr "" +msgid "Setup.OSD$Color key 0" +msgstr "" + +msgid "Setup.OSD$Color key 1" +msgstr "" + +msgid "Setup.OSD$Color key 2" +msgstr "" + +msgid "Setup.OSD$Color key 3" +msgstr "" + msgid "EPG" msgstr "EPG" diff --git a/po/de_DE.po b/po/de_DE.po index 20a54765..aaa92ea2 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 13:59+0200\n" +"POT-Creation-Date: 2012-09-09 15:20+0200\n" "PO-Revision-Date: 2010-01-16 16:46+0100\n" "Last-Translator: Klaus Schmidinger \n" "Language-Team: German \n" @@ -849,6 +849,18 @@ msgstr "Verzeichnisse im Timer-Men msgid "Setup.OSD$Number keys for characters" msgstr "Nummerntasten fr Zeichen" +msgid "Setup.OSD$Color key 0" +msgstr "Farbtaste 0" + +msgid "Setup.OSD$Color key 1" +msgstr "Farbtaste 1" + +msgid "Setup.OSD$Color key 2" +msgstr "Farbtaste 2" + +msgid "Setup.OSD$Color key 3" +msgstr "Farbtaste 3" + msgid "EPG" msgstr "EPG" diff --git a/po/el_GR.po b/po/el_GR.po index d27af7e5..42bd8be2 100644 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 13:59+0200\n" +"POT-Creation-Date: 2012-09-09 15:20+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Dimitrios Dimitrakos \n" "Language-Team: Greek \n" @@ -849,6 +849,18 @@ msgstr "" msgid "Setup.OSD$Number keys for characters" msgstr "" +msgid "Setup.OSD$Color key 0" +msgstr "" + +msgid "Setup.OSD$Color key 1" +msgstr "" + +msgid "Setup.OSD$Color key 2" +msgstr "" + +msgid "Setup.OSD$Color key 3" +msgstr "" + msgid "EPG" msgstr " " diff --git a/po/es_ES.po b/po/es_ES.po index f38ce2f1..2bda405b 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 13:59+0200\n" +"POT-Creation-Date: 2012-09-09 15:20+0200\n" "PO-Revision-Date: 2008-03-02 19:02+0100\n" "Last-Translator: Luca Olivetti \n" "Language-Team: Spanish \n" @@ -850,6 +850,18 @@ msgstr "" msgid "Setup.OSD$Number keys for characters" msgstr "" +msgid "Setup.OSD$Color key 0" +msgstr "" + +msgid "Setup.OSD$Color key 1" +msgstr "" + +msgid "Setup.OSD$Color key 2" +msgstr "" + +msgid "Setup.OSD$Color key 3" +msgstr "" + msgid "EPG" msgstr "Gua de Programacin" diff --git a/po/et_EE.po b/po/et_EE.po index b136d37e..ddf9a80f 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 13:59+0200\n" +"POT-Creation-Date: 2012-09-09 15:20+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Arthur Konovalov \n" "Language-Team: Estonian \n" @@ -849,6 +849,18 @@ msgstr "Kaustad taimeri menüüs" msgid "Setup.OSD$Number keys for characters" msgstr "Teksti sisestamine numbriklahvidega" +msgid "Setup.OSD$Color key 0" +msgstr "" + +msgid "Setup.OSD$Color key 1" +msgstr "" + +msgid "Setup.OSD$Color key 2" +msgstr "" + +msgid "Setup.OSD$Color key 3" +msgstr "" + msgid "EPG" msgstr "EPG" diff --git a/po/fi_FI.po b/po/fi_FI.po index 818c05da..11a74ada 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 13:59+0200\n" +"POT-Creation-Date: 2012-09-09 15:20+0200\n" "PO-Revision-Date: 2007-08-15 15:52+0200\n" "Last-Translator: Rolf Ahrenberg \n" "Language-Team: Finnish \n" @@ -852,6 +852,18 @@ msgstr "Näytä kansiot ajastinvalikossa" msgid "Setup.OSD$Number keys for characters" msgstr "Käytä numeronäppäimiä tekstisyötteessä" +msgid "Setup.OSD$Color key 0" +msgstr "" + +msgid "Setup.OSD$Color key 1" +msgstr "" + +msgid "Setup.OSD$Color key 2" +msgstr "" + +msgid "Setup.OSD$Color key 3" +msgstr "" + msgid "EPG" msgstr "Ohjelmaopas" diff --git a/po/fr_FR.po b/po/fr_FR.po index 451cf565..5d65eaa1 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 13:59+0200\n" +"POT-Creation-Date: 2012-09-09 15:20+0200\n" "PO-Revision-Date: 2008-02-27 18:14+0100\n" "Last-Translator: Jean-Claude Repetto \n" "Language-Team: French \n" @@ -855,6 +855,18 @@ msgstr "" msgid "Setup.OSD$Number keys for characters" msgstr "" +msgid "Setup.OSD$Color key 0" +msgstr "" + +msgid "Setup.OSD$Color key 1" +msgstr "" + +msgid "Setup.OSD$Color key 2" +msgstr "" + +msgid "Setup.OSD$Color key 3" +msgstr "" + msgid "EPG" msgstr "Guide des programmes" diff --git a/po/hr_HR.po b/po/hr_HR.po index 6fddf87a..b7b8983a 100644 --- a/po/hr_HR.po +++ b/po/hr_HR.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 13:59+0200\n" +"POT-Creation-Date: 2012-09-09 15:20+0200\n" "PO-Revision-Date: 2008-03-17 19:00+0100\n" "Last-Translator: Adrian Caval \n" "Language-Team: Croatian \n" @@ -851,6 +851,18 @@ msgstr "" msgid "Setup.OSD$Number keys for characters" msgstr "" +msgid "Setup.OSD$Color key 0" +msgstr "" + +msgid "Setup.OSD$Color key 1" +msgstr "" + +msgid "Setup.OSD$Color key 2" +msgstr "" + +msgid "Setup.OSD$Color key 3" +msgstr "" + msgid "EPG" msgstr "EPG (elektronski programski vodi)" diff --git a/po/hu_HU.po b/po/hu_HU.po index 71047a3b..58cf9ce2 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 13:59+0200\n" +"POT-Creation-Date: 2012-09-09 15:20+0200\n" "PO-Revision-Date: 2012-01-02 11:54+0200\n" "Last-Translator: Istvn Fley \n" "Language-Team: Hungarian \n" @@ -852,6 +852,18 @@ msgstr "K msgid "Setup.OSD$Number keys for characters" msgstr "Szmgombok a betkn" +msgid "Setup.OSD$Color key 0" +msgstr "" + +msgid "Setup.OSD$Color key 1" +msgstr "" + +msgid "Setup.OSD$Color key 2" +msgstr "" + +msgid "Setup.OSD$Color key 3" +msgstr "" + msgid "EPG" msgstr "EPG" diff --git a/po/it_IT.po b/po/it_IT.po index 03cfbe13..59b763f6 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 13:59+0200\n" +"POT-Creation-Date: 2012-09-09 15:20+0200\n" "PO-Revision-Date: 2012-06-06 22:50+0100\n" "Last-Translator: Diego Pierotto \n" "Language-Team: Italian \n" @@ -856,6 +856,18 @@ msgstr "Cartelle nel menu timer" msgid "Setup.OSD$Number keys for characters" msgstr "Tasti numerici per i caratteri" +msgid "Setup.OSD$Color key 0" +msgstr "" + +msgid "Setup.OSD$Color key 1" +msgstr "" + +msgid "Setup.OSD$Color key 2" +msgstr "" + +msgid "Setup.OSD$Color key 3" +msgstr "" + msgid "EPG" msgstr "Guida programmi EPG" diff --git a/po/lt_LT.po b/po/lt_LT.po index 98b8a687..d9bf213f 100644 --- a/po/lt_LT.po +++ b/po/lt_LT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.7.16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 13:59+0200\n" +"POT-Creation-Date: 2012-09-09 15:20+0200\n" "PO-Revision-Date: 2010-10-30 11:55+0200\n" "Last-Translator: Valdemaras Pipiras \n" "Language-Team: Lithuanian \n" @@ -849,6 +849,18 @@ msgstr "Katalogai esantys laikmačių meniu" msgid "Setup.OSD$Number keys for characters" msgstr "Skaičių mygtukai simboliams" +msgid "Setup.OSD$Color key 0" +msgstr "" + +msgid "Setup.OSD$Color key 1" +msgstr "" + +msgid "Setup.OSD$Color key 2" +msgstr "" + +msgid "Setup.OSD$Color key 3" +msgstr "" + msgid "EPG" msgstr "Elektroninis programų gidas (EPG)" diff --git a/po/mk_MK.po b/po/mk_MK.po index a767aca3..46d9419c 100644 --- a/po/mk_MK.po +++ b/po/mk_MK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR-1.7.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 13:59+0200\n" +"POT-Creation-Date: 2012-09-09 15:20+0200\n" "PO-Revision-Date: 2010-03-11 00:54+0100\n" "Last-Translator: Dimitar Petrovski \n" "Language-Team: Macedonian \n" @@ -850,6 +850,18 @@ msgstr "Директориуми во менито за тајмер" msgid "Setup.OSD$Number keys for characters" msgstr "" +msgid "Setup.OSD$Color key 0" +msgstr "" + +msgid "Setup.OSD$Color key 1" +msgstr "" + +msgid "Setup.OSD$Color key 2" +msgstr "" + +msgid "Setup.OSD$Color key 3" +msgstr "" + msgid "EPG" msgstr "EPG (електронски водич на програми)" diff --git a/po/nl_NL.po b/po/nl_NL.po index a312fdc0..df75d23d 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 13:59+0200\n" +"POT-Creation-Date: 2012-09-09 15:20+0200\n" "PO-Revision-Date: 2008-02-26 17:20+0100\n" "Last-Translator: Johan Schuring \n" "Language-Team: Dutch \n" @@ -853,6 +853,18 @@ msgstr "" msgid "Setup.OSD$Number keys for characters" msgstr "" +msgid "Setup.OSD$Color key 0" +msgstr "" + +msgid "Setup.OSD$Color key 1" +msgstr "" + +msgid "Setup.OSD$Color key 2" +msgstr "" + +msgid "Setup.OSD$Color key 3" +msgstr "" + msgid "EPG" msgstr "EPG" diff --git a/po/nn_NO.po b/po/nn_NO.po index 2612be24..f221214d 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 13:59+0200\n" +"POT-Creation-Date: 2012-09-09 15:20+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Truls Slevigen \n" "Language-Team: Norwegian Nynorsk \n" @@ -850,6 +850,18 @@ msgstr "" msgid "Setup.OSD$Number keys for characters" msgstr "" +msgid "Setup.OSD$Color key 0" +msgstr "" + +msgid "Setup.OSD$Color key 1" +msgstr "" + +msgid "Setup.OSD$Color key 2" +msgstr "" + +msgid "Setup.OSD$Color key 3" +msgstr "" + msgid "EPG" msgstr "Programoversikt" diff --git a/po/pl_PL.po b/po/pl_PL.po index 166b35b2..19133898 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 13:59+0200\n" +"POT-Creation-Date: 2012-09-09 15:20+0200\n" "PO-Revision-Date: 2008-03-09 12:59+0100\n" "Last-Translator: Michael Rakowski \n" "Language-Team: Polish \n" @@ -850,6 +850,18 @@ msgstr "" msgid "Setup.OSD$Number keys for characters" msgstr "" +msgid "Setup.OSD$Color key 0" +msgstr "" + +msgid "Setup.OSD$Color key 1" +msgstr "" + +msgid "Setup.OSD$Color key 2" +msgstr "" + +msgid "Setup.OSD$Color key 3" +msgstr "" + msgid "EPG" msgstr "EPG" diff --git a/po/pt_PT.po b/po/pt_PT.po index da11c078..11fdb4c0 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.7.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 13:59+0200\n" +"POT-Creation-Date: 2012-09-09 15:20+0200\n" "PO-Revision-Date: 2010-03-28 22:49+0100\n" "Last-Translator: Cris Silva \n" "Language-Team: Portuguese \n" @@ -850,6 +850,18 @@ msgstr "Pastas no menu de grava msgid "Setup.OSD$Number keys for characters" msgstr "Teclas numricas para caracteres" +msgid "Setup.OSD$Color key 0" +msgstr "" + +msgid "Setup.OSD$Color key 1" +msgstr "" + +msgid "Setup.OSD$Color key 2" +msgstr "" + +msgid "Setup.OSD$Color key 3" +msgstr "" + msgid "EPG" msgstr "Guia de Programao" diff --git a/po/ro_RO.po b/po/ro_RO.po index 3f6d1e15..40571e55 100644 --- a/po/ro_RO.po +++ b/po/ro_RO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.7.12\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 13:59+0200\n" +"POT-Creation-Date: 2012-09-09 15:20+0200\n" "PO-Revision-Date: 2011-03-10 23:52+0100\n" "Last-Translator: Lucian Muresan \n" "Language-Team: Romanian \n" @@ -852,6 +852,18 @@ msgstr "Directoare msgid "Setup.OSD$Number keys for characters" msgstr "Caractere pe tastele numerice" +msgid "Setup.OSD$Color key 0" +msgstr "" + +msgid "Setup.OSD$Color key 1" +msgstr "" + +msgid "Setup.OSD$Color key 2" +msgstr "" + +msgid "Setup.OSD$Color key 3" +msgstr "" + msgid "EPG" msgstr "EPG" diff --git a/po/ru_RU.po b/po/ru_RU.po index 4ed78010..f159d1ef 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 13:59+0200\n" +"POT-Creation-Date: 2012-09-09 15:20+0200\n" "PO-Revision-Date: 2008-12-15 14:37+0100\n" "Last-Translator: Oleg Roitburd \n" "Language-Team: Russian \n" @@ -850,6 +850,18 @@ msgstr "" msgid "Setup.OSD$Number keys for characters" msgstr "" +msgid "Setup.OSD$Color key 0" +msgstr "" + +msgid "Setup.OSD$Color key 1" +msgstr "" + +msgid "Setup.OSD$Color key 2" +msgstr "" + +msgid "Setup.OSD$Color key 3" +msgstr "" + msgid "EPG" msgstr "" diff --git a/po/sk_SK.po b/po/sk_SK.po index 069fd55c..fc75998f 100644 --- a/po/sk_SK.po +++ b/po/sk_SK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.7.16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 13:59+0200\n" +"POT-Creation-Date: 2012-09-09 15:20+0200\n" "PO-Revision-Date: 2011-02-15 16:29+0100\n" "Last-Translator: Milan Hrala \n" "Language-Team: Slovak \n" @@ -849,6 +849,18 @@ msgstr "Zlo msgid "Setup.OSD$Number keys for characters" msgstr "seln tlaidl pre znaky" +msgid "Setup.OSD$Color key 0" +msgstr "" + +msgid "Setup.OSD$Color key 1" +msgstr "" + +msgid "Setup.OSD$Color key 2" +msgstr "" + +msgid "Setup.OSD$Color key 3" +msgstr "" + msgid "EPG" msgstr "EPG" diff --git a/po/sl_SI.po b/po/sl_SI.po index 5bb6b9b1..95a45dfe 100644 --- a/po/sl_SI.po +++ b/po/sl_SI.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 13:59+0200\n" +"POT-Creation-Date: 2012-09-09 15:20+0200\n" "PO-Revision-Date: 2008-02-28 19:44+0100\n" "Last-Translator: Matjaz Thaler \n" "Language-Team: Slovenian \n" @@ -850,6 +850,18 @@ msgstr "" msgid "Setup.OSD$Number keys for characters" msgstr "" +msgid "Setup.OSD$Color key 0" +msgstr "" + +msgid "Setup.OSD$Color key 1" +msgstr "" + +msgid "Setup.OSD$Color key 2" +msgstr "" + +msgid "Setup.OSD$Color key 3" +msgstr "" + msgid "EPG" msgstr "Programski vodnik" diff --git a/po/sr_SR.po b/po/sr_SR.po index 4be71c53..0e6f9cd6 100644 --- a/po/sr_SR.po +++ b/po/sr_SR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.7.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 13:59+0200\n" +"POT-Creation-Date: 2012-09-09 15:20+0200\n" "PO-Revision-Date: 2011-01-09 15:57+0100\n" "Last-Translator: Milan Cvijanovi \n" "Language-Team: Serbian \n" @@ -867,6 +867,18 @@ msgstr "Direktoriji u tajmer meni-ju " msgid "Setup.OSD$Number keys for characters" msgstr "Number keys for characters" +msgid "Setup.OSD$Color key 0" +msgstr "" + +msgid "Setup.OSD$Color key 1" +msgstr "" + +msgid "Setup.OSD$Color key 2" +msgstr "" + +msgid "Setup.OSD$Color key 3" +msgstr "" + msgid "EPG" msgstr "EPG (TV Raspored)" diff --git a/po/sv_SE.po b/po/sv_SE.po index 4e998933..aa66721c 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 13:59+0200\n" +"POT-Creation-Date: 2012-09-09 15:20+0200\n" "PO-Revision-Date: 2008-03-12 18:25+0100\n" "Last-Translator: Magnus Andersson \n" "Language-Team: Swedish \n" @@ -852,6 +852,18 @@ msgstr "" msgid "Setup.OSD$Number keys for characters" msgstr "" +msgid "Setup.OSD$Color key 0" +msgstr "" + +msgid "Setup.OSD$Color key 1" +msgstr "" + +msgid "Setup.OSD$Color key 2" +msgstr "" + +msgid "Setup.OSD$Color key 3" +msgstr "" + msgid "EPG" msgstr "EPG" diff --git a/po/tr_TR.po b/po/tr_TR.po index d38761a4..e4acde3f 100644 --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 13:59+0200\n" +"POT-Creation-Date: 2012-09-09 15:20+0200\n" "PO-Revision-Date: 2008-02-28 00:33+0100\n" "Last-Translator: Oktay Yolgeen \n" "Language-Team: Turkish \n" @@ -849,6 +849,18 @@ msgstr "" msgid "Setup.OSD$Number keys for characters" msgstr "" +msgid "Setup.OSD$Color key 0" +msgstr "" + +msgid "Setup.OSD$Color key 1" +msgstr "" + +msgid "Setup.OSD$Color key 2" +msgstr "" + +msgid "Setup.OSD$Color key 3" +msgstr "" + msgid "EPG" msgstr "EPG" diff --git a/po/uk_UA.po b/po/uk_UA.po index 5ec4a0b5..62b5fc64 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.7.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 13:59+0200\n" +"POT-Creation-Date: 2012-09-09 15:20+0200\n" "PO-Revision-Date: 2010-04-25 16:35+0200\n" "Last-Translator: Yarema aka Knedlyk \n" "Language-Team: Ukrainian \n" @@ -849,6 +849,18 @@ msgstr "Каталоги в меню таймера" msgid "Setup.OSD$Number keys for characters" msgstr "" +msgid "Setup.OSD$Color key 0" +msgstr "" + +msgid "Setup.OSD$Color key 1" +msgstr "" + +msgid "Setup.OSD$Color key 2" +msgstr "" + +msgid "Setup.OSD$Color key 3" +msgstr "" + msgid "EPG" msgstr "Телегід (EPG)" diff --git a/po/zh_CN.po b/po/zh_CN.po index 0c1e18b4..2277a940 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 13:59+0200\n" +"POT-Creation-Date: 2012-09-09 15:20+0200\n" "PO-Revision-Date: 2009-09-23 23:50+0800\n" "Last-Translator: Nan Feng \n" "Language-Team: Chinese (simplified) \n" @@ -852,6 +852,18 @@ msgstr "" msgid "Setup.OSD$Number keys for characters" msgstr "" +msgid "Setup.OSD$Color key 0" +msgstr "" + +msgid "Setup.OSD$Color key 1" +msgstr "" + +msgid "Setup.OSD$Color key 2" +msgstr "" + +msgid "Setup.OSD$Color key 3" +msgstr "" + msgid "EPG" msgstr "电子节目单设置" diff --git a/skinclassic.c b/skinclassic.c index 64944ded..9aac095c 100644 --- a/skinclassic.c +++ b/skinclassic.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: skinclassic.c 2.7 2012/04/23 08:48:03 kls Exp $ + * $Id: skinclassic.c 2.8 2012/09/09 11:39:06 kls Exp $ */ #include "skinclassic.h" @@ -291,16 +291,19 @@ void cSkinClassicDisplayMenu::SetTitle(const char *Title) void cSkinClassicDisplayMenu::SetButtons(const char *Red, const char *Green, const char *Yellow, const char *Blue) { const cFont *font = cFont::GetFont(fontOsd); + const char *lutText[] = { Red, Green, Yellow, Blue }; + tColor lutFg[] = { clrButtonRedFg, clrButtonGreenFg, clrButtonYellowFg, clrButtonBlueFg }; + tColor lutBg[] = { clrButtonRedBg, clrButtonGreenBg, clrButtonYellowBg, clrButtonBlueBg }; int w = x3 - x0; int t0 = x0; int t1 = x0 + w / 4; int t2 = x0 + w / 2; int t3 = x3 - w / 4; int t4 = x3; - osd->DrawText(t0, y4, Red, Theme.Color(clrButtonRedFg), Red ? Theme.Color(clrButtonRedBg) : Theme.Color(clrBackground), font, t1 - t0, 0, taCenter); - osd->DrawText(t1, y4, Green, Theme.Color(clrButtonGreenFg), Green ? Theme.Color(clrButtonGreenBg) : Theme.Color(clrBackground), font, t2 - t1, 0, taCenter); - osd->DrawText(t2, y4, Yellow, Theme.Color(clrButtonYellowFg), Yellow ? Theme.Color(clrButtonYellowBg) : Theme.Color(clrBackground), font, t3 - t2, 0, taCenter); - osd->DrawText(t3, y4, Blue, Theme.Color(clrButtonBlueFg), Blue ? Theme.Color(clrButtonBlueBg) : Theme.Color(clrBackground), font, t4 - t3, 0, taCenter); + osd->DrawText(t0, y4, lutText[Setup.ColorKey0], Theme.Color(lutFg[Setup.ColorKey0]), lutText[Setup.ColorKey0] ? Theme.Color(lutBg[Setup.ColorKey0]) : Theme.Color(clrBackground), font, t1 - t0, 0, taCenter); + osd->DrawText(t1, y4, lutText[Setup.ColorKey1], Theme.Color(lutFg[Setup.ColorKey1]), lutText[Setup.ColorKey1] ? Theme.Color(lutBg[Setup.ColorKey1]) : Theme.Color(clrBackground), font, t2 - t1, 0, taCenter); + osd->DrawText(t2, y4, lutText[Setup.ColorKey2], Theme.Color(lutFg[Setup.ColorKey2]), lutText[Setup.ColorKey2] ? Theme.Color(lutBg[Setup.ColorKey2]) : Theme.Color(clrBackground), font, t3 - t2, 0, taCenter); + osd->DrawText(t3, y4, lutText[Setup.ColorKey3], Theme.Color(lutFg[Setup.ColorKey3]), lutText[Setup.ColorKey3] ? Theme.Color(lutBg[Setup.ColorKey3]) : Theme.Color(clrBackground), font, t4 - t3, 0, taCenter); } void cSkinClassicDisplayMenu::SetMessage(eMessageType Type, const char *Text) diff --git a/skinlcars.c b/skinlcars.c index 5937efe6..39d03747 100644 --- a/skinlcars.c +++ b/skinlcars.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: skinlcars.c 2.13 2012/06/13 13:27:31 kls Exp $ + * $Id: skinlcars.c 2.14 2012/09/09 12:16:50 kls Exp $ */ // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures, @@ -975,10 +975,11 @@ void cSkinLCARSDisplayMenu::DrawMenuFrame(void) osd->DrawEllipse (xa08 + lineHeight / 2, yb14, xa09 - 1, yb15 - 1, frameColor, 5); osd->DrawText(xa00, yb10, "VDR", Theme.Color(clrMenuFrameFg), frameColor, tallFont, xa02 - xa00, yb11 - yb10, taTop | taRight | taBorder); // Color buttons: - osd->DrawRectangle(xb00, yb14, xb01 - 1, yb15 - 1, Theme.Color(clrButtonRedBg)); - osd->DrawRectangle(xb04, yb14, xb05 - 1, yb15 - 1, Theme.Color(clrButtonGreenBg)); - osd->DrawRectangle(xb08, yb14, xb09 - 1, yb15 - 1, Theme.Color(clrButtonYellowBg)); - osd->DrawRectangle(xb12, yb14, xb13 - 1, yb15 - 1, Theme.Color(clrButtonBlueBg)); + tColor lutBg[] = { clrButtonRedBg, clrButtonGreenBg, clrButtonYellowBg, clrButtonBlueBg }; + osd->DrawRectangle(xb00, yb14, xb01 - 1, yb15 - 1, Theme.Color(lutBg[Setup.ColorKey0])); + osd->DrawRectangle(xb04, yb14, xb05 - 1, yb15 - 1, Theme.Color(lutBg[Setup.ColorKey1])); + osd->DrawRectangle(xb08, yb14, xb09 - 1, yb15 - 1, Theme.Color(lutBg[Setup.ColorKey2])); + osd->DrawRectangle(xb12, yb14, xb13 - 1, yb15 - 1, Theme.Color(lutBg[Setup.ColorKey3])); } void cSkinLCARSDisplayMenu::DrawDate(void) @@ -1458,19 +1459,22 @@ void cSkinLCARSDisplayMenu::SetTitle(const char *Title) void cSkinLCARSDisplayMenu::SetButtons(const char *Red, const char *Green, const char *Yellow, const char *Blue) { + const char *lutText[] = { Red, Green, Yellow, Blue }; + tColor lutFg[] = { clrButtonRedFg, clrButtonGreenFg, clrButtonYellowFg, clrButtonBlueFg }; + tColor lutBg[] = { clrButtonRedBg, clrButtonGreenBg, clrButtonYellowBg, clrButtonBlueBg }; const cFont *font = cFont::GetFont(fontSml); if (MenuCategory() == mcMain) { - DrawMainButton(Red, xd00, xd01, xd02, xd03, yd02, yd03, Theme.Color(clrButtonRedFg), Theme.Color(clrButtonRedBg), font); - DrawMainButton(Green, xd04, xd05, xd06, xd07, yd02, yd03, Theme.Color(clrButtonGreenFg), Theme.Color(clrButtonGreenBg), font); - DrawMainButton(Yellow, xd00, xd01, xd02, xd03, yd04, yd05, Theme.Color(clrButtonYellowFg), Theme.Color(clrButtonYellowBg), font); - DrawMainButton(Blue, xd04, xd05, xd06, xd07, yd04, yd05, Theme.Color(clrButtonBlueFg), Theme.Color(clrButtonBlueBg), font); + DrawMainButton(lutText[Setup.ColorKey0], xd00, xd01, xd02, xd03, yd02, yd03, Theme.Color(lutFg[Setup.ColorKey0]), Theme.Color(lutBg[Setup.ColorKey0]), font); + DrawMainButton(lutText[Setup.ColorKey1], xd04, xd05, xd06, xd07, yd02, yd03, Theme.Color(lutFg[Setup.ColorKey1]), Theme.Color(lutBg[Setup.ColorKey1]), font); + DrawMainButton(lutText[Setup.ColorKey2], xd00, xd01, xd02, xd03, yd04, yd05, Theme.Color(lutFg[Setup.ColorKey2]), Theme.Color(lutBg[Setup.ColorKey2]), font); + DrawMainButton(lutText[Setup.ColorKey3], xd04, xd05, xd06, xd07, yd04, yd05, Theme.Color(lutFg[Setup.ColorKey3]), Theme.Color(lutBg[Setup.ColorKey3]), font); } else { int h = yb15 - yb14; - osd->DrawText(xb02, yb14, Red, Theme.Color(clrButtonRedFg), Theme.Color(clrButtonRedBg), font, xb03 - xb02, h, taLeft | taBorder); - osd->DrawText(xb06, yb14, Green, Theme.Color(clrButtonGreenFg), Theme.Color(clrButtonGreenBg), font, xb07 - xb06, h, taLeft | taBorder); - osd->DrawText(xb10, yb14, Yellow, Theme.Color(clrButtonYellowFg), Theme.Color(clrButtonYellowBg), font, xb11 - xb10, h, taLeft | taBorder); - osd->DrawText(xb14, yb14, Blue, Theme.Color(clrButtonBlueFg), Theme.Color(clrButtonBlueBg), font, xb15 - xb14, h, taLeft | taBorder); + osd->DrawText(xb02, yb14, lutText[Setup.ColorKey0], Theme.Color(lutFg[Setup.ColorKey0]), Theme.Color(lutBg[Setup.ColorKey0]), font, xb03 - xb02, h, taLeft | taBorder); + osd->DrawText(xb06, yb14, lutText[Setup.ColorKey1], Theme.Color(lutFg[Setup.ColorKey1]), Theme.Color(lutBg[Setup.ColorKey1]), font, xb07 - xb06, h, taLeft | taBorder); + osd->DrawText(xb10, yb14, lutText[Setup.ColorKey2], Theme.Color(lutFg[Setup.ColorKey2]), Theme.Color(lutBg[Setup.ColorKey2]), font, xb11 - xb10, h, taLeft | taBorder); + osd->DrawText(xb14, yb14, lutText[Setup.ColorKey3], Theme.Color(lutFg[Setup.ColorKey3]), Theme.Color(lutBg[Setup.ColorKey3]), font, xb15 - xb14, h, taLeft | taBorder); } } diff --git a/skinsttng.c b/skinsttng.c index d9855388..94f54083 100644 --- a/skinsttng.c +++ b/skinsttng.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: skinsttng.c 2.15 2012/04/23 08:39:11 kls Exp $ + * $Id: skinsttng.c 2.16 2012/09/09 11:39:06 kls Exp $ */ // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures @@ -571,6 +571,9 @@ void cSkinSTTNGDisplayMenu::SetTitle(const char *Title) void cSkinSTTNGDisplayMenu::SetButtons(const char *Red, const char *Green, const char *Yellow, const char *Blue) { + const char *lutText[] = { Red, Green, Yellow, Blue }; + tColor lutFg[] = { clrButtonRedFg, clrButtonGreenFg, clrButtonYellowFg, clrButtonBlueFg }; + tColor lutBg[] = { clrButtonRedBg, clrButtonGreenBg, clrButtonYellowBg, clrButtonBlueBg }; cString date = DayDateTime(); const cFont *font = cFont::GetFont(fontSml); int d = 2 * Gap; @@ -585,10 +588,10 @@ void cSkinSTTNGDisplayMenu::SetButtons(const char *Red, const char *Green, const osd->DrawRectangle(t1 + d2, y6, t2 - d2, y7 - 1, clrBlack); osd->DrawRectangle(t2 + d2, y6, t3 - d2, y7 - 1, clrBlack); osd->DrawRectangle(t3 + d2, y6, t4 - d2, y7 - 1, clrBlack); - osd->DrawText(t0 + d, y6, Red, Theme.Color(clrButtonRedFg), Theme.Color(clrButtonRedBg), font, t1 - t0 - 2 * d, 0, taCenter); - osd->DrawText(t1 + d, y6, Green, Theme.Color(clrButtonGreenFg), Theme.Color(clrButtonGreenBg), font, t2 - t1 - 2 * d, 0, taCenter); - osd->DrawText(t2 + d, y6, Yellow, Theme.Color(clrButtonYellowFg), Theme.Color(clrButtonYellowBg), font, t3 - t2 - 2 * d, 0, taCenter); - osd->DrawText(t3 + d, y6, Blue, Theme.Color(clrButtonBlueFg), Theme.Color(clrButtonBlueBg), font, t4 - t3 - 2 * d, 0, taCenter); + osd->DrawText(t0 + d, y6, lutText[Setup.ColorKey0], Theme.Color(lutFg[Setup.ColorKey0]), Theme.Color(lutBg[Setup.ColorKey0]), font, t1 - t0 - 2 * d, 0, taCenter); + osd->DrawText(t1 + d, y6, lutText[Setup.ColorKey1], Theme.Color(lutFg[Setup.ColorKey1]), Theme.Color(lutBg[Setup.ColorKey1]), font, t2 - t1 - 2 * d, 0, taCenter); + osd->DrawText(t2 + d, y6, lutText[Setup.ColorKey2], Theme.Color(lutFg[Setup.ColorKey2]), Theme.Color(lutBg[Setup.ColorKey2]), font, t3 - t2 - 2 * d, 0, taCenter); + osd->DrawText(t3 + d, y6, lutText[Setup.ColorKey3], Theme.Color(lutFg[Setup.ColorKey3]), Theme.Color(lutBg[Setup.ColorKey3]), font, t4 - t3 - 2 * d, 0, taCenter); } void cSkinSTTNGDisplayMenu::SetMessage(eMessageType Type, const char *Text)