summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--HISTORY1
-rw-r--r--po/ca_ES.po5
-rw-r--r--po/de_DE.po5
-rw-r--r--po/it_IT.po5
-rw-r--r--po/sk_SK.po5
-rw-r--r--setup.c5
-rw-r--r--setup.h1
-rw-r--r--timers.c5
8 files changed, 25 insertions, 7 deletions
diff --git a/HISTORY b/HISTORY
index abcfd2f..8436085 100644
--- a/HISTORY
+++ b/HISTORY
@@ -287,3 +287,4 @@ Version 0.1.4
- fixed nasty font pixelation with non blending themes for timer display in
main menu
- optimized some theme colors in displaychannel and displaymessage
+- display of channel logo in main menu timer display configurable
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 54b1159..c01ea10 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: 2013-09-16 11:10+0200\n"
+"POT-Creation-Date: 2013-09-18 11:22+0200\n"
"PO-Revision-Date: 2013-03-19 22:56+0100\n"
"Last-Translator: Gabychan <gbonich@gmail.com>\n"
"Language-Team: \n"
@@ -209,6 +209,9 @@ msgstr "temps lliure en hores"
msgid "free space in GB"
msgstr "espai lliure en GB"
+msgid "small without logo"
+msgstr ""
+
msgid "Use narrow main menu"
msgstr "Utilitza menú principal limitat"
diff --git a/po/de_DE.po b/po/de_DE.po
index 082aff5..222a960 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: 2013-09-16 11:10+0200\n"
+"POT-Creation-Date: 2013-09-18 11:22+0200\n"
"PO-Revision-Date: 2012-11-11 17:49+0200\n"
"Last-Translator: louis\n"
"Language-Team: \n"
@@ -206,6 +206,9 @@ msgstr "freie Zeit in Stunden"
msgid "free space in GB"
msgstr "freier Platz in GB"
+msgid "small without logo"
+msgstr "klein ohne Logo"
+
msgid "Use narrow main menu"
msgstr "Schmales Hauptmenü verwenden"
diff --git a/po/it_IT.po b/po/it_IT.po
index 8091e45..3770871 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: 2013-09-16 11:10+0200\n"
+"POT-Creation-Date: 2013-09-18 11:22+0200\n"
"PO-Revision-Date: 2013-03-19 22:56+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: \n"
@@ -209,6 +209,9 @@ msgstr ""
msgid "free space in GB"
msgstr ""
+msgid "small without logo"
+msgstr ""
+
msgid "Use narrow main menu"
msgstr "Usa menu principale ridotto"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index c1412bf..8d69fa4 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vdr-skinnopacity 0.0.6\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-09-16 11:10+0200\n"
+"POT-Creation-Date: 2013-09-18 11:22+0200\n"
"PO-Revision-Date: 2013-03-12 15:59+0100\n"
"Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
"Language-Team: \n"
@@ -209,6 +209,9 @@ msgstr ""
msgid "free space in GB"
msgstr ""
+msgid "small without logo"
+msgstr ""
+
msgid "Use narrow main menu"
msgstr "Úzke hlavné menu"
diff --git a/setup.c b/setup.c
index 4d91f5f..4ab89ab 100644
--- a/setup.c
+++ b/setup.c
@@ -307,6 +307,9 @@ cNopacitySetupMenuDisplayMain::cNopacitySetupMenuDisplayMain(cNopacityConfig* da
titleStyle[2] = tr("no title");
discUsageStyle[0] = tr("free time in hours");
discUsageStyle[1] = tr("free space in GB");
+ showTimers[0] = trVDR("no");
+ showTimers[1] = trVDR("yes");
+ showTimers[2] = tr("small without logo");
Set();
}
@@ -331,7 +334,7 @@ void cNopacitySetupMenuDisplayMain::Set(void) {
Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Adjust Font Size - free")), &tmpNopacityConfig->fontDiskUsage, -20, 20));
Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Adjust Font Size - percent")), &tmpNopacityConfig->fontDiskUsagePercent, -20, 20));
}
- Add(new cMenuEditBoolItem(tr("Display Timers"), &tmpNopacityConfig->showTimers));
+ Add(new cMenuEditStraItem(tr("Display Timers"), &tmpNopacityConfig->showTimers, 3, showTimers));
if (tmpNopacityConfig->showTimers) {
Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Maximum number of Timers")), &tmpNopacityConfig->numberTimers, 1, 10));
Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Width of Timers (Percent of OSD Width)")), &tmpNopacityConfig->menuWidthRightItems, 5, 30));
diff --git a/setup.h b/setup.h
index 33f4f35..42d0820 100644
--- a/setup.h
+++ b/setup.h
@@ -41,6 +41,7 @@ class cNopacitySetupMenuDisplayMain : public cMenuSetupSubMenu {
protected:
const char *titleStyle[3];
const char *discUsageStyle[2];
+ const char *showTimers[3];
void Set(void);
public:
cNopacitySetupMenuDisplayMain(cNopacityConfig *data);
diff --git a/timers.c b/timers.c
index b261d78..e2627de 100644
--- a/timers.c
+++ b/timers.c
@@ -168,14 +168,15 @@ void cNopacityTimer::Render(void) {
void cNopacityTimer::DrawLogo(void) {
pixmapLogo->Fill(clrTransparent);
+ int showTimerLogo = (config.showTimers < 2) ? 1 : 0;
int logoWidth = config.timersLogoWidth;
int logoHeight = config.timersLogoHeight;
const cChannel *Channel = timer->Channel();
if (Channel && Channel->Name()) {
cImageLoader imgLoader;
- if (imgLoader.LoadLogo(Channel->Name(), logoWidth, logoHeight)) {
+ if (showTimerLogo && imgLoader.LoadLogo(Channel->Name(), logoWidth, logoHeight)) {
pixmapLogo->DrawImage(cPoint((width - logoWidth)/2, 1), imgLoader.GetImage());
- } else if (imgLoader.LoadLogo(*(Channel->GetChannelID().ToString()), logoWidth, logoHeight)) {
+ } else if (showTimerLogo && imgLoader.LoadLogo(*(Channel->GetChannelID().ToString()), logoWidth, logoHeight)) {
pixmapLogo->DrawImage(cPoint((width - logoWidth)/2, 1), imgLoader.GetImage());
} else {
cTextWrapper channel;
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-05 14:04:54 +0000