summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.c8
-rw-r--r--config.h2
-rw-r--r--setup.c11
-rw-r--r--tvguideosd.c8
4 files changed, 21 insertions, 8 deletions
diff --git a/config.c b/config.c
index 532d842..71895aa 100644
--- a/config.c
+++ b/config.c
@@ -10,8 +10,8 @@ cTVGuideConfig::cTVGuideConfig() {
showTimeInGrid = 1;
channelCols = 5;
channelRows = 10;
- displayTime = 160;
- displayHorizontalTime = 160;
+ displayTime = 180;
+ displayHorizontalTime = 180;
displayStatusHeader = 1;
displayChannelGroups = 1;
displayTimeBase = 1;
@@ -28,7 +28,9 @@ cTVGuideConfig::cTVGuideConfig() {
footerHeightPercent = 7;
stepMinutes = 30;
bigStepHours = 3;
+ bigStepHoursHorizontal = 3;
hugeStepHours = 24;
+ hugeStepHoursHorizontal = 24;
channelJumpMode = eNumJump;
jumpChannels = 0;
blueKeyMode = 2;
@@ -269,7 +271,9 @@ bool cTVGuideConfig::SetupParse(const char *Name, const char *Value) {
else if (strcmp(Name, "logoWidthRatio") == 0) logoWidthRatio = atoi(Value);
else if (strcmp(Name, "logoHeightRatio") == 0) logoHeightRatio = atoi(Value);
else if (strcmp(Name, "bigStepHours") == 0) bigStepHours = atoi(Value);
+ else if (strcmp(Name, "bigStepHoursHorizontal") == 0) bigStepHoursHorizontal = atoi(Value);
else if (strcmp(Name, "hugeStepHours") == 0) hugeStepHours = atoi(Value);
+ else if (strcmp(Name, "hugeStepHoursHorizontal") == 0) hugeStepHoursHorizontal = atoi(Value);
else if (strcmp(Name, "channelJumpMode") == 0) channelJumpMode = atoi(Value);
else if (strcmp(Name, "blueKeyMode") == 0) blueKeyMode = atoi(Value);
else if (strcmp(Name, "numkeyMode") == 0) numkeyMode = atoi(Value);
diff --git a/config.h b/config.h
index 045bd37..9fe9bdf 100644
--- a/config.h
+++ b/config.h
@@ -76,7 +76,9 @@ class cTVGuideConfig {
int footerHeightPercent;
int stepMinutes;
int bigStepHours;
+ int bigStepHoursHorizontal;
int hugeStepHours;
+ int hugeStepHoursHorizontal;
int channelJumpMode;
int jumpChannels;
int blueKeyMode;
diff --git a/setup.c b/setup.c
index c42eb62..c2c111c 100644
--- a/setup.c
+++ b/setup.c
@@ -80,7 +80,9 @@ void cTvguideSetup::Store(void) {
SetupStore("displayTime", config.displayTime);
SetupStore("displayHorizontalTime", config.displayHorizontalTime);
SetupStore("bigStepHours", config.bigStepHours);
+ SetupStore("bigStepHoursHorizontal", config.bigStepHoursHorizontal);
SetupStore("hugeStepHours", config.hugeStepHours);
+ SetupStore("hugeStepHoursHorizontal", config.hugeStepHoursHorizontal);
SetupStore("channelJumpMode", config.channelJumpMode);
SetupStore("blueKeyMode", config.blueKeyMode);
SetupStore("numkeyMode", config.numkeyMode);
@@ -224,8 +226,13 @@ void cMenuSetupGeneral::Set(void) {
Add(new cMenuEditBoolItem(tr("Close TVGuide after channel switch"), &tmpConfig->closeOnSwitch));
Add(new cMenuEditStraItem(tr("Functionality of numeric Keys"), &tmpConfig->numkeyMode, 2, numMode));
Add(new cMenuEditBoolItem(tr("Hide last Channel Group"), &tmpConfig->hideLastGroup));
- Add(new cMenuEditIntItem(tr("Big Step (Keys 1 / 3) in hours"), &tmpConfig->bigStepHours, 1, 12));
- Add(new cMenuEditIntItem(tr("Huge Step (Keys 4 / 6) in hours"), &tmpConfig->hugeStepHours, 13, 48));
+ if (tmpConfig->displayMode == eVertical) {
+ Add(new cMenuEditIntItem(tr("Big Step (Keys 1 / 3) in hours"), &tmpConfig->bigStepHours, 1, 12));
+ Add(new cMenuEditIntItem(tr("Huge Step (Keys 4 / 6) in hours"), &tmpConfig->hugeStepHours, 13, 48));
+ } else if (tmpConfig->displayMode == eHorizontal) {
+ Add(new cMenuEditIntItem(tr("Big Step (Keys 1 / 3) in hours"), &tmpConfig->bigStepHoursHorizontal, 1, 12));
+ Add(new cMenuEditIntItem(tr("Huge Step (Keys 4 / 6) in hours"), &tmpConfig->hugeStepHoursHorizontal, 13, 48));
+ }
Add(new cMenuEditStraItem(tr("Time Format (12h/24h)"), &tmpConfig->timeFormat, 2, timeFormatItems));
Add(new cMenuEditIntItem(tr("EPG Window Text Scrolling Speed"), &tmpConfig->detailedViewScrollStep, 1, 30));
Add(new cMenuEditBoolItem(tr("Display Reruns in detailed EPG View"), &tmpConfig->displayRerunsDetailEPGView));
diff --git a/tvguideosd.c b/tvguideosd.c
index ba2d606..3a7f7e1 100644
--- a/tvguideosd.c
+++ b/tvguideosd.c
@@ -638,19 +638,19 @@ void cTvGuideOsd::processNumKey(int numKey) {
void cTvGuideOsd::TimeJump(int mode) {
switch (mode) {
case 1: {
- timeManager->DelStep(config.bigStepHours * 60);
+ timeManager->DelStep(((config.displayMode == eVertical) ? config.bigStepHours : config.bigStepHoursHorizontal) * 60);
}
break;
case 3: {
- timeManager->AddStep(config.bigStepHours * 60);
+ timeManager->AddStep(((config.displayMode == eVertical) ? config.bigStepHours : config.bigStepHoursHorizontal) * 60);
}
break;
case 4: {
- timeManager->DelStep(config.hugeStepHours * 60);
+ timeManager->DelStep(((config.displayMode == eVertical) ? config.hugeStepHours : config.hugeStepHoursHorizontal) * 60);
}
break;
case 6: {
- timeManager->AddStep(config.hugeStepHours * 60);
+ timeManager->AddStep(((config.displayMode == eVertical) ? config.hugeStepHours : config.hugeStepHoursHorizontal) * 60);
}
break;
case 7: {