summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--HISTORY1
-rw-r--r--channeljump.c30
-rw-r--r--po/ca_ES.po8
-rwxr-xr-xpo/de_DE.po8
-rw-r--r--po/ru_RU.po8
-rw-r--r--po/sk_SK.po8
-rw-r--r--tvguideosd.c10
7 files changed, 40 insertions, 33 deletions
diff --git a/HISTORY b/HISTORY
index 476b9d0..daa9294 100644
--- a/HISTORY
+++ b/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
diff --git a/channeljump.c b/channeljump.c
index b23698e..58fa77f 100644
--- a/channeljump.c
+++ b/channeljump.c
@@ -7,23 +7,23 @@
#include "channeljump.h"
cChannelJump::cChannelJump(cChannelGroups *channelGroups) {
- this->channelGroups = channelGroups;
- pixmapText = NULL;
- channel = 0;
+ this->channelGroups = channelGroups;
+ pixmapText = NULL;
+ channel = 0;
if (!tvguideConfig.hideLastGroup) {
- maxChannels = Channels.MaxNumber();
+ maxChannels = Channels.MaxNumber();
} else {
- maxChannels = channelGroups->GetLastValidChannel();
- }
- timeout = Setup.ChannelEntryTimeout;
- startTime = cTimeMs::Now();
- SetPixmaps();
- Draw();
+ maxChannels = channelGroups->GetLastValidChannel();
+ }
+ timeout = Setup.ChannelEntryTimeout;
+ startTime = cTimeMs::Now();
+ SetPixmaps();
+ Draw();
}
cChannelJump::~cChannelJump(void) {
- osdManager.releasePixmap(pixmapBack);
- osdManager.releasePixmap(pixmapText);
+ osdManager.releasePixmap(pixmapBack);
+ 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;
diff --git a/po/ca_ES.po b/po/ca_ES.po
index a3ad868..eaa45da 100644
--- a/po/ca_ES.po
+++ b/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"
diff --git a/po/de_DE.po b/po/de_DE.po
index 84b1f97..5de6868 100755
--- a/po/de_DE.po
+++ b/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"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 574d4bf..e8de1eb 100644
--- a/po/ru_RU.po
+++ b/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) в часах"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index a42f286..e5e7cd9 100644
--- a/po/sk_SK.po
+++ b/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 "Tma"
+msgid "Time to display in minutes"
+msgstr "Zobrazen as v mintach"
+
msgid "Rounded Corners"
msgstr "Zaoblen rohy"
@@ -447,9 +450,6 @@ msgstr ""
msgid "Hide last Channel Group"
msgstr "Skry posledn skupinu kanlov"
-msgid "Time to display in minutes"
-msgstr "Zobrazen as v mintach"
-
msgid "Big Step (Keys 1 / 3) in hours"
msgstr "Vek skoky (tlaidl 1 / 3) v hodinch"
diff --git a/tvguideosd.c b/tvguideosd.c
index e1a5c34..64ca63a 100644
--- a/tvguideosd.c
+++ b/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();
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-07 07:42:56 +0000