size of channel logos in main menu timers display configurable as percent of timer width

8 files changed, 21 insertions, 65 deletions

diff --git a/HISTORY b/HISTORY
index 7146764..8fef899 100644
--- a/HISTORY
+++ b/HISTORY
@@ -358,3 +358,5 @@ Version 0.1.4
   in displaymenu header (headerback.png, header_mirroredback.png)
 - fixed timer display in main menu so that setting "small without logo"
   uses correct height
+- size of channel logos in main menu timers display configurable as
+  percent of timer width
diff --git a/config.c b/config.c
index d9ff605..fda1aca 100644
--- a/config.c
+++ b/config.c
@@ -93,6 +93,7 @@ void cNopacityConfig::LoadDefaults(void) {
     conf.insert(std::pair<std::string, int>("discUsageStyle", 0));
     conf.insert(std::pair<std::string, int>("showTimers", 1));
     conf.insert(std::pair<std::string, int>("numberTimers", 10));
+    conf.insert(std::pair<std::string, int>("timersLogoWidth", 60));    
     conf.insert(std::pair<std::string, int>("checkTimerConflict", 1));
     conf.insert(std::pair<std::string, int>("headerHeight", 7));
     conf.insert(std::pair<std::string, int>("footerHeight", 7));
diff --git a/geometrymanager.c b/geometrymanager.c
index 776632f..5d0cddf 100644
--- a/geometrymanager.c
+++ b/geometrymanager.c
@@ -98,7 +98,7 @@ void cGeometryManager::SetDisplayMenuSizes() {
 
     menuDiskUsageWidth = menuDiskUsageHeight = osdWidth  * config.GetValue("menuSizeDiskUsage") / 100;
     menuTimersWidth = osdWidth  * config.GetValue("menuWidthRightItems") / 100;
-    cSize timersLogoSize = ScaleToFit(menuTimersWidth - 8 * config.GetValue("spaceMenu"),
+    cSize timersLogoSize = ScaleToFit(menuTimersWidth * config.GetValue("timersLogoWidth") / 100,
                                 1000,
                                 config.GetValue("logoWidthOriginal"),
                                 config.GetValue("logoHeightOriginal"));
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 4eabef5..c14f3b1 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: skinnopacity 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-11-07 17:08+0100\n"
+"POT-Creation-Date: 2013-11-09 08:50+0100\n"
 "PO-Revision-Date: 2013-03-19 22:56+0100\n"
 "Last-Translator: Gabychan <gbonich@gmail.com>\n"
 "Language-Team: \n"
@@ -266,6 +266,9 @@ msgstr "Nombre màxim de timers"
 msgid "Width of Timers (Percent of OSD Width)"
 msgstr "Amplada dels timers (% amplada OSD)"
 
+msgid "Width of Channel Logos (Percent of Timer Width)"
+msgstr ""
+
 msgid "Adjust Font Size - Title"
 msgstr "Ajusta mida de la Font - Títol"
 
@@ -550,18 +553,3 @@ msgstr "conflicte"
 
 msgid "conflicts"
 msgstr "conflictes"
-
-#~ msgid "Channel Logo Width"
-#~ msgstr "Amplada logo canal"
-
-#~ msgid "Channel Logo Height"
-#~ msgstr "Alçada logo canal"
-
-#~ msgid "Header Icon Size (Square Header Menu Icons)"
-#~ msgstr "Mida icona capçalera (Icones del Quadre)"
-
-#~ msgid "Folder Icon Size"
-#~ msgstr "Mida Carpeta Icones"
-
-#~ msgid "Icon Size (Square)"
-#~ msgstr "Mida icones (Quadrat)"
diff --git a/po/de_DE.po b/po/de_DE.po
index 4fe3823..629bb87 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: skinnopacity 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-11-07 17:08+0100\n"
+"POT-Creation-Date: 2013-11-09 08:50+0100\n"
 "PO-Revision-Date: 2012-11-11 17:49+0200\n"
 "Last-Translator: louis\n"
 "Language-Team: \n"
@@ -263,6 +263,9 @@ msgstr "Maximale Timer Anzahl"
 msgid "Width of Timers (Percent of OSD Width)"
 msgstr "Breite der Timer (% der OSD Breite)"
 
+msgid "Width of Channel Logos (Percent of Timer Width)"
+msgstr "Channel Logo Breite (% der Timer Breite)"
+
 msgid "Adjust Font Size - Title"
 msgstr "Schriftgröße anpassen - Titel"
 
@@ -547,18 +550,3 @@ msgstr "Konflikt"
 
 msgid "conflicts"
 msgstr "Konflikte"
-
-#~ msgid "Channel Logo Width"
-#~ msgstr "Breite der Kanallogos"
-
-#~ msgid "Channel Logo Height"
-#~ msgstr "Höhe der Kanallogos"
-
-#~ msgid "Header Icon Size (Square Header Menu Icons)"
-#~ msgstr "Größe der quadratischen Headericons"
-
-#~ msgid "Folder Icon Size"
-#~ msgstr "Order Icon Größe"
-
-#~ msgid "Icon Size (Square)"
-#~ msgstr "Icon Größe (quadratisch)"
diff --git a/po/it_IT.po b/po/it_IT.po
index b5bcdbc..cf5ef71 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: skinnopacity 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-11-07 17:08+0100\n"
+"POT-Creation-Date: 2013-11-09 08:50+0100\n"
 "PO-Revision-Date: 2013-03-19 22:56+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: \n"
@@ -266,6 +266,9 @@ msgstr ""
 msgid "Width of Timers (Percent of OSD Width)"
 msgstr "Larghezza di Timer (% larghezza OSD)"
 
+msgid "Width of Channel Logos (Percent of Timer Width)"
+msgstr ""
+
 msgid "Adjust Font Size - Title"
 msgstr "Adatta dim. caratteri - Titolo"
 
@@ -550,18 +553,3 @@ msgstr "conflitto"
 
 msgid "conflicts"
 msgstr "conflitti"
-
-#~ msgid "Channel Logo Width"
-#~ msgstr "Larghezza logo canale"
-
-#~ msgid "Channel Logo Height"
-#~ msgstr "Altezza logo canale"
-
-#~ msgid "Header Icon Size (Square Header Menu Icons)"
-#~ msgstr "Dim. icona intestazione (icone menu intestazione quadrato)"
-
-#~ msgid "Folder Icon Size"
-#~ msgstr "Dim. icona cartella"
-
-#~ msgid "Icon Size (Square)"
-#~ msgstr "Dim. icona (quadrato)"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index aa7b225..68400d2 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-skinnopacity\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-11-07 17:08+0100\n"
+"POT-Creation-Date: 2013-11-09 08:50+0100\n"
 "PO-Revision-Date: 2013-09-16 19:34+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: \n"
@@ -263,6 +263,9 @@ msgstr "Maximálny poèet zobrazených plánov"
 msgid "Width of Timers (Percent of OSD Width)"
 msgstr "©írka zobrazeného plánu nahrávania (Percento s OSD ¹írky)"
 
+msgid "Width of Channel Logos (Percent of Timer Width)"
+msgstr ""
+
 msgid "Adjust Font Size - Title"
 msgstr "Nastavenie veµkosti písma - Názov"
 
@@ -547,18 +550,3 @@ msgstr "konflikt"
 
 msgid "conflicts"
 msgstr "konflikty"
-
-#~ msgid "Channel Logo Width"
-#~ msgstr "©írka loga kanálu"
-
-#~ msgid "Channel Logo Height"
-#~ msgstr "Vý¹ka loga kanálu"
-
-#~ msgid "Header Icon Size (Square Header Menu Icons)"
-#~ msgstr "Veµkos» ikony hlavièky (ikona hlavièky do ¹tvorca)"
-
-#~ msgid "Folder Icon Size"
-#~ msgstr "Veµkos» ikony prieèinku"
-
-#~ msgid "Icon Size (Square)"
-#~ msgstr "Veµkos» ikony (do ¹tvorca)"
diff --git a/setup.c b/setup.c
index 82561bb..1cb4d4b 100644
--- a/setup.c
+++ b/setup.c
@@ -205,6 +205,7 @@ void cNopacitySetupMenuDisplayMain::Set(void) {
     if (tmpConf->GetValue("showTimers")) {
         Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Maximum number of Timers")), tmpConf->GetValueRef("numberTimers"), 1, 10));
         Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Width of Timers (Percent of OSD Width)")), tmpConf->GetValueRef("menuWidthRightItems"), 5, 30));
+        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Width of Channel Logos (Percent of Timer Width)")), tmpConf->GetValueRef("timersLogoWidth"), 20, 98));
         Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Adjust Font Size - Header")), tmpConf->GetValueRef("fontTimersHead"), -20, 20));
         Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Adjust Font Size - Title")), tmpConf->GetValueRef("fontTimers"), -20, 20));
     }