Fixed Bug 1484

HISTORY

@@ -90,3 +90,4 @@ Version 1.1.0
   if "close tvguide on channel switch" is configured
 - fixed wrong font for clock in horizontal view
 - Added feature to jump to a specific channel with number keys
+- Fixed Bug 1484

channeljump.c

@@ -7,23 +7,23 @@
 #include "channeljump.h"
 
 cChannelJump::cChannelJump(cChannelGroups *channelGroups) {
-	this->channelGroups = channelGroups;
+    this->channelGroups = channelGroups;
-	pixmapText = NULL;
+    pixmapText = NULL;
-	channel = 0;
+    channel = 0;
 	if (!tvguideConfig.hideLastGroup) {
-		maxChannels = Channels.MaxNumber();
+        maxChannels = Channels.MaxNumber();
 	} else {
-		maxChannels = channelGroups->GetLastValidChannel();
+        maxChannels = channelGroups->GetLastValidChannel();
-	}
+    }
-	timeout = Setup.ChannelEntryTimeout;
+    timeout = Setup.ChannelEntryTimeout;
-	startTime = cTimeMs::Now();
+    startTime = cTimeMs::Now();
-	SetPixmaps();
+    SetPixmaps();
-	Draw();
+    Draw();
 }
 
 cChannelJump::~cChannelJump(void) {
-	osdManager.releasePixmap(pixmapBack);
+    osdManager.releasePixmap(pixmapBack);
-	osdManager.releasePixmap(pixmapText);
+    osdManager.releasePixmap(pixmapText);
 }
 
 void cChannelJump::SetPixmaps(void) {
@@ -37,7 +37,7 @@ void cChannelJump::SetPixmaps(void) {
 
 void cChannelJump::Draw(void) {
 	if (tvguideConfig.style == eStyleGraphical) {
-		drawBackgroundGraphical(bgChannelJump);
+        drawBackgroundGraphical(bgChannelJump);
 	} else {
         pixmap->Fill(theme.Color(clrBackground));
         drawBorder();
@@ -47,9 +47,9 @@ void cChannelJump::Draw(void) {
 }
 
 void cChannelJump::DrawText(void) {
-	pixmapText->Fill(clrTransparent);
+    pixmapText->Fill(clrTransparent);
 
-	cString header = cString::sprintf("%s:", tr("Channel"));
+    cString header = cString::sprintf("%s:", tr("Channel"));
 
 	const cFont *font = fontManager.FontMessageBox;
 	const cFont *fontHeader = fontManager.FontMessageBoxLarge;

po/ca_ES.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-tvguide 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-12-23 09:03+0100\n"
+"POT-Creation-Date: 2013-12-24 11:13+0100\n"
 "PO-Revision-Date: 2013-09-21 17:49+0200\n"
 "Last-Translator: My friend <Sampep> Thanks David <Gabychan> <gbonich@gmail.com>\n"
 "Language-Team: \n"
@@ -432,6 +432,9 @@ msgstr ""
 msgid "Theme"
 msgstr "Plantilla"
 
+msgid "Time to display in minutes"
+msgstr "Temps a mostrar en minuts"
+
 msgid "Rounded Corners"
 msgstr "Cantells rodons"
 
@@ -450,9 +453,6 @@ msgstr ""
 msgid "Hide last Channel Group"
 msgstr "Amaga el darrer grup de canals"
 
-msgid "Time to display in minutes"
-msgstr "Temps a mostrar en minuts"
-
 msgid "Big Step (Keys 1 / 3) in hours"
 msgstr "Salt (Botons 1 / 3) en hores"
 

po/de_DE.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-tvguide 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-12-23 09:03+0100\n"
+"POT-Creation-Date: 2013-12-24 11:13+0100\n"
 "PO-Revision-Date: 2012-08-25 17:49+0200\n"
 "Last-Translator: Horst\n"
 "Language-Team: \n"
@@ -429,6 +429,9 @@ msgstr "Entsprechendes nOpacity Theme benutzen"
 msgid "Theme"
 msgstr "Theme"
 
+msgid "Time to display in minutes"
+msgstr "Angezeigte Zeitspanne in Minuten"
+
 msgid "Rounded Corners"
 msgstr "Abgerundete Ecken"
 
@@ -447,9 +450,6 @@ msgstr "Funktion der Nummerntasten"
 msgid "Hide last Channel Group"
 msgstr "Letzte Kanalgruppe verstecken"
 
-msgid "Time to display in minutes"
-msgstr "Angezeigte Zeitspanne in Minuten"
-
 msgid "Big Step (Keys 1 / 3) in hours"
 msgstr "Großer Sprung (Tasten 1 / 3) in Stunden"
 

po/ru_RU.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-tvguide 1.0.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-12-23 09:03+0100\n"
+"POT-Creation-Date: 2013-12-24 11:13+0100\n"
 "PO-Revision-Date: 2013-09-25 17:49+0400\n"
 "Last-Translator: AmiD, ilya\n"
 "Language-Team: Russia-Cherepovets(wm.amid@gmail.com)\n"
@@ -429,6 +429,9 @@ msgstr ""
 msgid "Theme"
 msgstr "Тема"
 
+msgid "Time to display in minutes"
+msgstr "Время показа в минутах"
+
 msgid "Rounded Corners"
 msgstr "Закруглять углы"
 
@@ -447,9 +450,6 @@ msgstr ""
 msgid "Hide last Channel Group"
 msgstr "Скрывать последнюю группу каналов"
 
-msgid "Time to display in minutes"
-msgstr "Время показа в минутах"
-
 msgid "Big Step (Keys 1 / 3) in hours"
 msgstr "Прыжок (Кнопки 1 / 3) в часах"
 

po/sk_SK.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-tvguide 1.1.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-12-23 09:03+0100\n"
+"POT-Creation-Date: 2013-12-24 11:13+0100\n"
 "PO-Revision-Date: 2013-09-15 00:12+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: \n"
@@ -429,6 +429,9 @@ msgstr ""
 msgid "Theme"
 msgstr "Téma"
 
+msgid "Time to display in minutes"
+msgstr "Zobrazený èas v minútach"
+
 msgid "Rounded Corners"
 msgstr "Zaoblené rohy"
 
@@ -447,9 +450,6 @@ msgstr ""
 msgid "Hide last Channel Group"
 msgstr "Skry» poslednú skupinu kanálov"
 
-msgid "Time to display in minutes"
-msgstr "Zobrazený èas v minútach"
-
 msgid "Big Step (Keys 1 / 3) in hours"
 msgstr "Veµké skoky (tlaèidlá 1 / 3) v hodinách"
 

tvguideosd.c

@@ -434,7 +434,10 @@ void cTvGuideOsd::processKeyGreen() {
     if (prev) {
         readChannels(prev);
         if (columns.Count() > 0) {
-            drawGridsChannelJump(currentCol);
+            if (tvguideConfig.channelJumpMode == eGroupJump)
+                drawGridsChannelJump();
+            else
+                drawGridsChannelJump(currentCol);
         }
         osdManager.flush();
     }
@@ -471,7 +474,10 @@ void cTvGuideOsd::processKeyYellow() {
     if (next) {
         readChannels(next);
         if (columns.Count() > 0) {
-            drawGridsChannelJump(currentCol);
+            if (tvguideConfig.channelJumpMode == eGroupJump)
+                drawGridsChannelJump();
+            else
+                drawGridsChannelJump(currentCol);
         }
         osdManager.flush();
     }