Vertical channel logo alignment configurable in displaychannel

15 files changed, 78 insertions, 10 deletions

diff --git a/HISTORY b/HISTORY
index 768bf3e..90b5f7d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -426,3 +426,7 @@ Version 1.1.2
 - scroll speed with up / down configurable (lines per click)
 - fixed bug that floating text is not shown completely
 - cleaned up and restructured setup menu
+
+Version 1.1.3
+
+- Vertical channel logo alignment configurable in displaychannel
diff --git a/conf/theme-darkredNG.conf b/conf/theme-darkredNG.conf
index fb52cfb..cdd6ee9 100644
--- a/conf/theme-darkredNG.conf
+++ b/conf/theme-darkredNG.conf
@@ -3,3 +3,4 @@ channelBackgroundTransparency = 10
 mainMenuTitleStyle = 1
 menuWidthRecordings = 40
 menuChannelLogoBackground = 0
+logoVerticalAlignment = 2
diff --git a/conf/theme-default.conf b/conf/theme-default.conf
index 49fd6f7..21cf5dd 100644
--- a/conf/theme-default.conf
+++ b/conf/theme-default.conf
@@ -2,3 +2,4 @@ displayType = 2
 channelBackgroundTransparency = 20
 mainMenuTitleStyle = 1
 menuWidthRecordings = 40
+logoVerticalAlignment = 2 
diff --git a/conf/theme-iceblue.conf b/conf/theme-iceblue.conf
index 42d9ab2..b2a51a2 100644
--- a/conf/theme-iceblue.conf
+++ b/conf/theme-iceblue.conf
@@ -1 +1,2 @@
 displayType = 0
+logoVerticalAlignment = 1
diff --git a/conf/theme-light.conf b/conf/theme-light.conf
index c11cc9c..2338b4b 100644
--- a/conf/theme-light.conf
+++ b/conf/theme-light.conf
@@ -1,5 +1,6 @@
 displayType = 0
 backgroundStyle = 1
+logoVerticalAlignment = 1
 discUsageStyle = 0
 displayPoster = 0
 displaySignalStrength = 0
diff --git a/config.c b/config.c
index 77df707..0cf62f1 100644
--- a/config.c
+++ b/config.c
@@ -146,6 +146,7 @@ void cNopacityConfig::LoadDefaults(void) {
     conf.insert(std::pair<std::string, int>("channelBackgroundTransparency", 0));
     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));
     conf.insert(std::pair<std::string, int>("logoWidth", 260));
     conf.insert(std::pair<std::string, int>("logoHeight", 200));
     conf.insert(std::pair<std::string, int>("logoWidthOriginal", 260));
diff --git a/displaymenu.c b/displaymenu.c
index 9c5dfeb..31737e5 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -746,4 +746,4 @@ void cNopacityDisplayMenu::Action(void) {
         if ((int)(Now - Start) > FadeTime)
             break;
     }
-}
\ No newline at end of file
+}
diff --git a/geometrymanager.c b/geometrymanager.c
index c82b7b2..0c0b938 100644
--- a/geometrymanager.c
+++ b/geometrymanager.c
@@ -137,11 +137,16 @@ void cGeometryManager::SetDisplayChannelSizes(void) {
     channelLogoHeight = logoSize.Height();
     channelLogoX = (channelLogoWidthTotal - channelLogoWidth) / 2;
 
-    if (config.GetValue("displayType") == dtGraphical) {
-        channelLogoY = (channelTop + channelHeaderHeight)
-                        + (channelHeight - channelHeaderHeight - channelLogoHeight)/2;
-    } else {
-        channelLogoY = channelTop + (channelHeight - channelLogoHeight)/2;
+    switch (config.GetValue("logoVerticalAlignment")) {
+        case lvTop:
+            channelLogoY = channelTop + (channelHeight - channelHeaderHeight - channelLogoHeight)/2;
+            break;
+        case lvMiddle:
+            channelLogoY = channelTop + (channelHeight - channelLogoHeight)/2;
+            break;
+        case lvBottom:
+            channelLogoY = (channelTop + channelHeaderHeight) + (channelHeight - channelHeaderHeight - channelLogoHeight)/2;
+            break;
     }
 
     switch (config.GetValue("logoPosition")) {
diff --git a/geometrymanager.h b/geometrymanager.h
index f553dfd..9d0c387 100644
--- a/geometrymanager.h
+++ b/geometrymanager.h
@@ -2,6 +2,7 @@
 #define __NOPACITY_GEOMETRYMANAGER_H
 
 enum eLogoPosition {lpNone = 0, lpLeft, lpRight};
+enum eLogoVerticalPosition {lvTop = 0, lvMiddle, lvBottom};
 enum eBackgroundStyle {bsTrans = 0, bsFull};
 
 class cGeometryManager {
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 6fbb658..d2c04ca 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: 2014-04-27 15:27+0200\n"
+"POT-Creation-Date: 2014-05-24 15:11+0200\n"
 "PO-Revision-Date: 2013-03-19 22:56+0100\n"
 "Last-Translator: Gabychan <gbonich@gmail.com>\n"
 "Language-Team: \n"
@@ -509,6 +509,15 @@ msgstr "Amplada total OSD"
 msgid "do not display"
 msgstr "no mostrar"
 
+msgid "top"
+msgstr ""
+
+msgid "middle"
+msgstr ""
+
+msgid "bottom"
+msgstr ""
+
 msgid "show elapsed time"
 msgstr "mostra temps transcorregut"
 
@@ -533,6 +542,9 @@ msgstr "Estil del Fons"
 msgid "Rounded Corners"
 msgstr "Cantells rodons"
 
+msgid "Vertical Channel Logo Alignment"
+msgstr ""
+
 msgid "Channel Logo Position"
 msgstr "PosiciĂł Logo Canal"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 0042455..350c532 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: 2014-04-27 15:27+0200\n"
+"POT-Creation-Date: 2014-05-24 15:11+0200\n"
 "PO-Revision-Date: 2012-11-11 17:49+0200\n"
 "Last-Translator: louis\n"
 "Language-Team: \n"
@@ -506,6 +506,15 @@ msgstr "volle OSD Breite"
 msgid "do not display"
 msgstr "nicht anzeigen"
 
+msgid "top"
+msgstr "oben"
+
+msgid "middle"
+msgstr "mittig"
+
+msgid "bottom"
+msgstr "unten"
+
 msgid "show elapsed time"
 msgstr "vergangene Zeit anzeigen"
 
@@ -530,6 +539,9 @@ msgstr "Hintergrund Stil"
 msgid "Rounded Corners"
 msgstr "Abgerundete Ecken"
 
+msgid "Vertical Channel Logo Alignment"
+msgstr "Vertikale Ausrichtung des Kanallogos"
+
 msgid "Channel Logo Position"
 msgstr "Kanallogo Position"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 9e602f5..54ec2ac 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: 2014-04-27 15:27+0200\n"
+"POT-Creation-Date: 2014-05-24 15:11+0200\n"
 "PO-Revision-Date: 2013-03-19 22:56+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: \n"
@@ -509,6 +509,15 @@ msgstr ""
 msgid "do not display"
 msgstr "non mostrare"
 
+msgid "top"
+msgstr ""
+
+msgid "middle"
+msgstr ""
+
+msgid "bottom"
+msgstr ""
+
 msgid "show elapsed time"
 msgstr ""
 
@@ -533,6 +542,9 @@ msgstr ""
 msgid "Rounded Corners"
 msgstr ""
 
+msgid "Vertical Channel Logo Alignment"
+msgstr ""
+
 msgid "Channel Logo Position"
 msgstr "Posizione logo canale"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index dc93035..0c77330 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: 2014-04-27 15:27+0200\n"
+"POT-Creation-Date: 2014-05-24 15:11+0200\n"
 "PO-Revision-Date: 2013-11-11 20:52+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: \n"
@@ -506,6 +506,15 @@ msgstr "celá OSD ąírka"
 msgid "do not display"
 msgstr "nezobrazova»"
 
+msgid "top"
+msgstr ""
+
+msgid "middle"
+msgstr ""
+
+msgid "bottom"
+msgstr ""
+
 msgid "show elapsed time"
 msgstr "zobrazi» uplynulý čas"
 
@@ -530,6 +539,9 @@ msgstr "©týl pozadia"
 msgid "Rounded Corners"
 msgstr "Zaoblené rohy"
 
+msgid "Vertical Channel Logo Alignment"
+msgstr ""
+
 msgid "Channel Logo Position"
 msgstr "Pozícia loga kanálu"
 
diff --git a/setup.c b/setup.c
index d05be4e..169e698 100644
--- a/setup.c
+++ b/setup.c
@@ -375,6 +375,9 @@ cNopacitySetupChannelDisplay::cNopacitySetupChannelDisplay(cNopacityConfig* data
     logoPos[0] = tr("do not display");
     logoPos[1] = tr("left");
     logoPos[2] = tr("right");
+    logoVerticalPos[0] = tr("top");
+    logoVerticalPos[1] = tr("middle");
+    logoVerticalPos[2] = tr("bottom");
     progressStyleCurrentSchedule[0] = tr("show elapsed time");
     progressStyleCurrentSchedule[1] = tr("show remaining time");
     Set();
@@ -392,6 +395,7 @@ void cNopacitySetupChannelDisplay::Set(void) {
         Add(new cMenuEditStraItem(tr("Background Style"), tmpConf->GetValueRef("backgroundStyle"), 2, bgStyle));
         Add(new cMenuEditBoolItem(tr("Rounded Corners"), tmpConf->GetValueRef("roundedCornersChannel")));
     }
+    Add(new cMenuEditStraItem(tr("Vertical Channel Logo Alignment"), tmpConf->GetValueRef("logoVerticalAlignment"), 3, logoVerticalPos));
     Add(new cMenuEditStraItem(tr("Channel Logo Position"), tmpConf->GetValueRef("logoPosition"), 3, logoPos));
     if (tmpConf->GetValue("logoPosition")) {
         Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Channel Logo original Width")), tmpConf->GetValueRef("logoWidthOriginal"), 30, 500));
diff --git a/setup.h b/setup.h
index 081f716..e4da4e1 100644
--- a/setup.h
+++ b/setup.h
@@ -97,6 +97,7 @@ class cNopacitySetupDetailedView : public cMenuSetupSubMenu {
 class cNopacitySetupChannelDisplay : public cMenuSetupSubMenu {
     protected:
         const char *logoPos[3];
+        const char *logoVerticalPos[3];
         const char *progressStyleCurrentSchedule[2];
         const char *bgStyle[2];
         void Set(void);