Size of channel logos is now configureable in setup to better fit in postion

7 files changed, 48 insertions, 6 deletions

diff --git a/config.c b/config.c
index 38e11c7..16c43c9 100644
--- a/config.c
+++ b/config.c
@@ -110,6 +110,7 @@ void cNopacityConfig::LoadDefaults(void) {
     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>("logoTimerScale", 100));
     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));
@@ -119,6 +120,7 @@ void cNopacityConfig::LoadDefaults(void) {
     conf.insert(std::pair<std::string, int>("numRecordingsMenuItems", 10));
     conf.insert(std::pair<std::string, int>("menuHeaderLogoWidth", 160));
     conf.insert(std::pair<std::string, int>("menuHeaderLogoHeight", 70));
+    conf.insert(std::pair<std::string, int>("logoMenuScale", 100));
     conf.insert(std::pair<std::string, int>("epgImageWidth", 210));
     conf.insert(std::pair<std::string, int>("epgImageHeight", 160));
     conf.insert(std::pair<std::string, int>("epgImageWidthLarge", 525));
@@ -168,6 +170,7 @@ void cNopacityConfig::LoadDefaults(void) {
     conf.insert(std::pair<std::string, int>("channelFadeTime", 300));
     conf.insert(std::pair<std::string, int>("channelFadeOutTime", 300));
     conf.insert(std::pair<std::string, int>("channelBackgroundTransparency", 0));
+    conf.insert(std::pair<std::string, int>("logoScale", 100));
     conf.insert(std::pair<std::string, int>("channelUseLogoBackground", 1));
     conf.insert(std::pair<std::string, int>("logoPosition", 1));
     conf.insert(std::pair<std::string, int>("logoVerticalAlignment", 1));
diff --git a/imagecache.c b/imagecache.c
index e9caf6e..b0b08dc 100644
--- a/imagecache.c
+++ b/imagecache.c
@@ -378,16 +378,16 @@ cPoint cImageCache::LogoSize(eCacheType type) {
     int width, height;
     switch (type) {
         case ctLogo:
-            width = geoManager->channelLogoWidth;
-            height = geoManager->channelLogoHeight;
+            width = geoManager->channelLogoWidth * config.GetValue("logoScale") / 100;
+            height = geoManager->channelLogoHeight * config.GetValue("logoScale") / 100;
             break;
         case ctLogoMenuItem:
-            width = geoManager->menuLogoWidth;
-            height = geoManager->menuLogoHeight;
+            width = geoManager->menuLogoWidth * config.GetValue("logoMenuScale") / 100;
+            height = geoManager->menuLogoHeight * config.GetValue("logoMenuScale") / 100;
             break;
         case ctLogoTimer:
-            width = geoManager->menuTimersLogoWidth;
-            height = geoManager->menuTimersLogoHeight;
+            width = geoManager->menuTimersLogoWidth * config.GetValue("logoTimerScale") / 100;
+            height = geoManager->menuTimersLogoHeight * config.GetValue("logoTimerScale") / 100;
             break;
         default:
             width = 1;
diff --git a/po/ca_ES.po b/po/ca_ES.po
index d5237ab..46a1006 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -410,6 +410,9 @@ msgstr "Amplada dels timers (% amplada OSD)"
 msgid "Width of Channel Logos (Percent of Timer Width)"
 msgstr "Ample dels Logos Canal (% Amplada temporitzador)"
 
+msgid "Size of the Timer Channel Logo in Percent"
+msgstr ""
+
 msgid "Adjust Font Size - Title"
 msgstr "Ajusta mida de la Font - Títol"
 
@@ -422,6 +425,9 @@ msgstr "Amplada logo capçalera"
 msgid "Header Logo Height"
 msgstr "Alçada logo capçalera"
 
+msgid "Size of the Menu Channel Logo in Percent"
+msgstr ""
+
 msgid "Adjust Font Size - Menu Items"
 msgstr "Ajusta mida de la font - Elements de menú"
 
@@ -605,6 +611,9 @@ msgstr "Amplada Original Logo del canal"
 msgid "Channel Logo original Height"
 msgstr "Alçada Original Logo del canal"
 
+msgid "Size of the Channel Logo in Percent"
+msgstr ""
+
 msgid "Kind of time display for current schedule"
 msgstr "Tipus de visualització per la programació actual"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 33ed671..15357c7 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -407,6 +407,9 @@ msgstr "Breite der Timer (% der OSD Breite)"
 msgid "Width of Channel Logos (Percent of Timer Width)"
 msgstr "Channel Logo Breite (% der Timer Breite)"
 
+msgid "Size of the Timer Channel Logo in Percent"
+msgstr "Größe des Timer Kanal Logos in %"
+
 msgid "Adjust Font Size - Title"
 msgstr "Schriftgröße anpassen - Titel"
 
@@ -419,6 +422,9 @@ msgstr "Header Logo Breite"
 msgid "Header Logo Height"
 msgstr "Header Logo Höhe"
 
+msgid "Size of the Menu Channel Logo in Percent"
+msgstr "Größe des Menü Kanal Logos in %"
+
 msgid "Adjust Font Size - Menu Items"
 msgstr "Schriftgröße anpassen - Menüelemente"
 
@@ -602,6 +608,9 @@ msgstr "Kanallogo original Breite"
 msgid "Channel Logo original Height"
 msgstr "Kanallogo original Höhe"
 
+msgid "Size of the Channel Logo in Percent"
+msgstr "Größe des Kanal Logo in %"
+
 msgid "Kind of time display for current schedule"
 msgstr "Art der Zeitanzeige für die laufende Sendung"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 77d872a..8cf07c5 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -410,6 +410,9 @@ msgstr "Larghezza di Timer (% larghezza OSD)"
 msgid "Width of Channel Logos (Percent of Timer Width)"
 msgstr ""
 
+msgid "Size of the Timer Channel Logo in Percent"
+msgstr ""
+
 msgid "Adjust Font Size - Title"
 msgstr "Adatta dim. caratteri - Titolo"
 
@@ -422,6 +425,9 @@ msgstr "Larghezza logo intestazione"
 msgid "Header Logo Height"
 msgstr "Altezza logo intestazione"
 
+msgid "Size of the Menu Channel Logo in Percent"
+msgstr ""
+
 msgid "Adjust Font Size - Menu Items"
 msgstr "Adatta dim. caratteri - Voci menu"
 
@@ -605,6 +611,9 @@ msgstr ""
 msgid "Channel Logo original Height"
 msgstr ""
 
+msgid "Size of the Channel Logo in Percent"
+msgstr ""
+
 msgid "Kind of time display for current schedule"
 msgstr ""
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index d2a26d9..c973809 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -407,6 +407,9 @@ msgstr "©írka zobrazeného plánu nahrávania (Percento s OSD ¹írky)"
 msgid "Width of Channel Logos (Percent of Timer Width)"
 msgstr "©írka loga kanálov (Percento z ¹írky plánu)"
 
+msgid "Size of the Timer Channel Logo in Percent"
+msgstr ""
+
 msgid "Adjust Font Size - Title"
 msgstr "Nastavenie veµkosti písma - Názov"
 
@@ -419,6 +422,9 @@ msgstr "©írka loga hlavièky"
 msgid "Header Logo Height"
 msgstr "Vý¹ka loga hlavièky"
 
+msgid "Size of the Menu Channel Logo in Percent"
+msgstr ""
+
 msgid "Adjust Font Size - Menu Items"
 msgstr "Nastavenie veµkosti písma - Polo¾ky menu"
 
@@ -602,6 +608,9 @@ msgstr "Pôvodná ¹írka loga kanála"
 msgid "Channel Logo original Height"
 msgstr "Pôvodná vý¹ka loga kanála"
 
+msgid "Size of the Channel Logo in Percent"
+msgstr ""
+
 msgid "Kind of time display for current schedule"
 msgstr "Druh zobrazenia èasu pre aktuálnu reláciu"
 
diff --git a/setup.c b/setup.c
index 309048a..49b79a8 100644
--- a/setup.c
+++ b/setup.c
@@ -228,12 +228,14 @@ void cNopacitySetupMenuDisplayMain::Set(void) {
         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("Size of the Timer Channel Logo in Percent")), tmpConf->GetValueRef("logoTimerScale"), 50, 100));
         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));
     }
     Add(new cMenuEditBoolItem(tr("Show Timer Conflicts"), tmpConf->GetValueRef("checkTimerConflict")));
     Add(new cMenuEditIntItem(tr("Header Logo Width"), tmpConf->GetValueRef("menuHeaderLogoWidth"), 30, 500));
     Add(new cMenuEditIntItem(tr("Header Logo Height"), tmpConf->GetValueRef("menuHeaderLogoHeight"), 30, 500));
+    Add(new cMenuEditIntItem(tr("Size of the Menu Channel Logo in Percent"), tmpConf->GetValueRef("logoMenuScale"), 50, 100));
     Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Items"), tmpConf->GetValueRef("fontMenuitemLarge"), -20, 20));
 
     SetCurrent(Get(currentItem));
@@ -425,6 +427,7 @@ void cNopacitySetupChannelDisplay::Set(void) {
     if (tmpConf->GetValue("logoPosition")) {
         Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Channel Logo original Width")), tmpConf->GetValueRef("logoWidthOriginal"), 30, 500));
         Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Channel Logo original Height")), tmpConf->GetValueRef("logoHeightOriginal"), 30, 500));
+        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Size of the Channel Logo in Percent")), tmpConf->GetValueRef("logoScale"), 50, 100));
         Add(new cMenuEditBoolItem(cString::sprintf("%s%s", *spacer, tr("Use Channel Logo background")), tmpConf->GetValueRef("channelUseLogoBackground")));
     }
     Add(new cMenuEditStraItem(tr("Kind of time display for current schedule"), tmpConf->GetValueRef("progressCurrentSchedule"), 2, progressStyleCurrentSchedule));