From 0975e97519401a2d5a76c04795453d5650798ba4 Mon Sep 17 00:00:00 2001
From: kamel5 <vdr.kamel5 (at) gmx (dot) net>
Date: Tue, 9 Apr 2019 13:31:42 +0200
Subject: Different setup parameter for displayTime in horizontal and vertical
 mode

---
 config.c          | 2 ++
 config.h          | 1 +
 geometrymanager.c | 2 +-
 setup.c           | 7 ++++++-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/config.c b/config.c
index 1d9d8e7..198f82a 100644
--- a/config.c
+++ b/config.c
@@ -10,6 +10,7 @@ cTvguideConfig::cTvguideConfig() {
     channelCols = 5;
     channelRows = 10;
     displayTime = 160;
+    displayHorizontalTime = 160;
     displayStatusHeader = 1;
     displayChannelGroups = 1;
     displayTimeBase = 1;
@@ -257,6 +258,7 @@ bool cTvguideConfig::SetupParse(const char *Name, const char *Value) {
     else if (strcmp(Name, "channelCols") == 0)              channelCols = atoi(Value);
     else if (strcmp(Name, "channelRows") == 0)              channelRows = atoi(Value);
     else if (strcmp(Name, "displayTime") == 0)              displayTime = atoi(Value);
+    else if (strcmp(Name, "displayHorizontalTime") == 0)    displayHorizontalTime = atoi(Value);
     else if (strcmp(Name, "hideChannelLogos") == 0)         hideChannelLogos = atoi(Value);
     else if (strcmp(Name, "logoExtension") == 0)            logoExtension = atoi(Value);
     else if (strcmp(Name, "logoWidthRatio") == 0)           logoWidthRatio = atoi(Value);
diff --git a/config.h b/config.h
index 5579b65..062ee9b 100644
--- a/config.h
+++ b/config.h
@@ -58,6 +58,7 @@ class cTvguideConfig {
         int channelRows;
         int numGrids;
         int displayTime;
+        int displayHorizontalTime;
         int displayStatusHeader;
         int displayChannelGroups;
         int displayTimeBase;
diff --git a/geometrymanager.c b/geometrymanager.c
index 72befa4..b8779a1 100644
--- a/geometrymanager.c
+++ b/geometrymanager.c
@@ -49,7 +49,7 @@ bool cGeometryManager::SetGeometry(int osdWidth, int osdHeight, bool force) {
     } else if (tvguideConfig.displayMode == eHorizontal) {
         colWidth = 0;
         rowHeight = (osdHeight - statusHeaderHeight - timeLineHeight - footerHeight) / tvguideConfig.channelRows;
-        minutePixel = (osdWidth - channelHeaderWidth - channelGroupsWidth) / tvguideConfig.displayTime;
+        minutePixel = (osdWidth - channelHeaderWidth - channelGroupsWidth) / tvguideConfig.displayHorizontalTime;
         channelLogoWidth = channelHeaderWidth;
         channelLogoHeight = rowHeight;
         logoWidth = channelLogoHeight * tvguideConfig.logoWidthRatio / tvguideConfig.logoHeightRatio;
diff --git a/setup.c b/setup.c
index bfc9f3f..e040b8e 100644
--- a/setup.c
+++ b/setup.c
@@ -77,6 +77,7 @@ void cTvguideSetup::Store(void) {
     SetupStore("channelCols", tvguideConfig.channelCols);
     SetupStore("channelRows", tvguideConfig.channelRows);
     SetupStore("displayTime", tvguideConfig.displayTime);
+    SetupStore("displayHorizontalTime", tvguideConfig.displayHorizontalTime);
     SetupStore("bigStepHours", tvguideConfig.bigStepHours);
     SetupStore("hugeStepHours", tvguideConfig.hugeStepHours);
     SetupStore("channelJumpMode", tvguideConfig.channelJumpMode);
@@ -209,7 +210,11 @@ void cMenuSetupGeneral::Set(void) {
         if (themes.NumThemes())
             Add(new cMenuEditStraItem(cString::sprintf("%s%s", *indent, tr("Theme")), &tmpTvguideConfig->themeIndex, themes.NumThemes(), themes.Descriptions()));
     }
-    Add(new cMenuEditIntItem(tr("Time to display in minutes"), &tmpTvguideConfig->displayTime, 60, 320));
+    if (tmpTvguideConfig->displayMode == eVertical) {
+        Add(new cMenuEditIntItem(tr("Time to display in minutes"), &tmpTvguideConfig->displayTime, 60, 320));
+    } else if (tmpTvguideConfig->displayMode == eHorizontal) {
+        Add(new cMenuEditIntItem(tr("Time to display in minutes"), &tmpTvguideConfig->displayHorizontalTime, 60, 320));
+    }
     Add(new cMenuEditBoolItem(tr("Rounded Corners"), &tmpTvguideConfig->roundedCorners));
     
     Add(new cMenuEditStraItem(tr("Channel Jump Mode (Keys Green / Yellow)"), &tmpTvguideConfig->channelJumpMode, 2,  jumpMode));
-- 
cgit v1.2.3