summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--HISTORY1
-rw-r--r--config.c2
-rw-r--r--config.h1
-rw-r--r--displaychannel.c15
-rw-r--r--displaychannel.h1
-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.c2
9 files changed, 34 insertions, 3 deletions
diff --git a/HISTORY b/HISTORY
index 6ad3cc2..0387e84 100644
--- a/HISTORY
+++ b/HISTORY
@@ -217,3 +217,4 @@ Version 0.1.2
- Additional information in channels menu configurable: choice between
transponder information and current schedule
- Added optional dedicated status icons in channel display
+- Added optional display of channel source information in channel display
diff --git a/config.c b/config.c
index 811f3d5..ecd579d 100644
--- a/config.c
+++ b/config.c
@@ -24,6 +24,7 @@ cNopacityConfig::cNopacityConfig() {
symbolStyle = 0;
roundedCornersChannel = 1;
displaySignalStrength = 1;
+ displaySourceInfo = 1;
displayPrevNextChannelGroup = 1;
fontChannelHeaderSize = 0;
fontChannelDateSize = 0;
@@ -307,6 +308,7 @@ bool cNopacityConfig::SetupParse(const char *Name, const char *Value) {
else if (strcmp(Name, "symbolStyle") == 0) symbolStyle = atoi(Value);
else if (strcmp(Name, "roundedCornersChannel") == 0) roundedCornersChannel = atoi(Value);
else if (strcmp(Name, "displaySignalStrength") == 0) displaySignalStrength = atoi(Value);
+ else if (strcmp(Name, "displaySourceInfo") == 0) displaySourceInfo = atoi(Value);
else if (strcmp(Name, "displayPrevNextChannelGroup") == 0) displayPrevNextChannelGroup = atoi(Value);
else if (strcmp(Name, "fontChannelHeaderSize") == 0) fontChannelHeaderSize = atoi(Value);
else if (strcmp(Name, "fontChannelDateSize") == 0) fontChannelDateSize = atoi(Value);
diff --git a/config.h b/config.h
index a96d75b..ef3b752 100644
--- a/config.h
+++ b/config.h
@@ -49,6 +49,7 @@ class cNopacityConfig {
int symbolStyle;
int roundedCornersChannel;
int displaySignalStrength;
+ int displaySourceInfo;
int displayPrevNextChannelGroup;
int fontChannelHeaderSize;
int fontChannelDateSize;
diff --git a/displaychannel.c b/displaychannel.c
index 919ebb0..979d1ea 100644
--- a/displaychannel.c
+++ b/displaychannel.c
@@ -109,6 +109,7 @@ void cNopacityDisplayChannel::SetGeometry(void) {
streamInfoY = channelInfoHeight + progressBarHeight + epgInfoHeight;
iconSize = config.statusIconSize;
iconsWidth = 5*iconSize;
+ signalX = 0;
}
void cNopacityDisplayChannel::CreatePixmaps(void) {
@@ -480,6 +481,18 @@ void cNopacityDisplayChannel::DrawSignal(void) {
}
}
+void cNopacityDisplayChannel::DrawSourceInfo(const cChannel *Channel) {
+ const cSource *source = Sources.Get(Channel->Source());
+ cString channelInfo = "";
+ if (source)
+ channelInfo = cString::sprintf("%s - %s", *cSource::ToString(source->Code()), source->Description());
+ int x = signalX + 20;
+ if (config.displaySignalStrength)
+ x += signalWidth;
+ pixmapFooter->DrawText(cPoint(x, (streamInfoHeight - fontDate->Height())/2), channelInfo, Theme.Color(clrChannelHead), clrTransparent, fontDate);
+
+}
+
void cNopacityDisplayChannel::SetChannel(const cChannel *Channel, int Number) {
if (!doOutput)
return;
@@ -519,6 +532,8 @@ void cNopacityDisplayChannel::SetChannel(const cChannel *Channel, int Number) {
} else {
DrawIconsSingle(Channel);
}
+ if (config.displaySourceInfo)
+ DrawSourceInfo(Channel);
}
cString channelString = cString::sprintf("%s %s", *ChannelNumber, *ChannelName);
pixmapChannelInfo->DrawText(cPoint(channelInfoHeight/2, (channelInfoHeight-fontHeader->Height())/2), channelString, Theme.Color(clrChannelHead), clrTransparent, fontHeader);
diff --git a/displaychannel.h b/displaychannel.h
index d255900..547dfde 100644
--- a/displaychannel.h
+++ b/displaychannel.h
@@ -79,6 +79,7 @@ private:
void DrawScreenResolution(void);
void DrawSignalMeter(void);
void DrawSignal(void);
+ void DrawSourceInfo(const cChannel *Channel);
void DrawChannelGroups(const cChannel *Channel, cString ChannelName);
cString GetChannelSep(const cChannel *channel, bool prev);
public:
diff --git a/po/de_DE.po b/po/de_DE.po
index 09fd2e6..830b20c 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-05-10 11:09+0200\n"
+"POT-Creation-Date: 2013-05-10 12:52+0200\n"
"PO-Revision-Date: 2012-11-11 17:49+0200\n"
"Last-Translator: louis\n"
"Language-Team: \n"
@@ -395,6 +395,9 @@ msgstr "Art der Zeitanzeige für die laufende Sendung"
msgid "Display Signal Strength & Quality"
msgstr "Signalstärke- und Qualität anzeigen"
+msgid "Display Channel Source information"
+msgstr "Quellinformationen für Kanal anzeigen"
+
msgid "Display previous and next Channel Group"
msgstr "Vorherige und nächste Kanalgruppe anzeigen"
diff --git a/po/it_IT.po b/po/it_IT.po
index 45b1422..ac658e4 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-05-10 11:09+0200\n"
+"POT-Creation-Date: 2013-05-10 12:52+0200\n"
"PO-Revision-Date: 2013-03-19 22:56+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: \n"
@@ -398,6 +398,9 @@ msgstr ""
msgid "Display Signal Strength & Quality"
msgstr "Mostra qualità e intensità segnale"
+msgid "Display Channel Source information"
+msgstr ""
+
msgid "Display previous and next Channel Group"
msgstr ""
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 3daa603..cc6f77b 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-05-10 11:09+0200\n"
+"POT-Creation-Date: 2013-05-10 12:52+0200\n"
"PO-Revision-Date: 2013-03-12 15:59+0100\n"
"Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
"Language-Team: \n"
@@ -398,6 +398,9 @@ msgstr ""
msgid "Display Signal Strength & Quality"
msgstr "Zobrazi» silu a kvalitu signálu"
+msgid "Display Channel Source information"
+msgstr ""
+
msgid "Display previous and next Channel Group"
msgstr ""
diff --git a/setup.c b/setup.c
index 99210be..c155ded 100644
--- a/setup.c
+++ b/setup.c
@@ -83,6 +83,7 @@ void cNopacitySetup::Store(void) {
SetupStore("symbolStyle", config.symbolStyle);
SetupStore("roundedCornersChannel", config.roundedCornersChannel);
SetupStore("displaySignalStrength", config.displaySignalStrength);
+ SetupStore("displaySourceInfo", config.displaySourceInfo);
SetupStore("displayPrevNextChannelGroup", config.displayPrevNextChannelGroup);
SetupStore("channelFadeTime", config.channelFadeTime);
SetupStore("fontChannelHeaderSize", config.fontChannelHeaderSize);
@@ -487,6 +488,7 @@ void cNopacitySetupChannelDisplay::Set(void) {
}
Add(new cMenuEditStraItem(tr("Kind of time display for current schedule"), &tmpNopacityConfig->progressCurrentSchedule, 2, progressStyleCurrentSchedule));
Add(new cMenuEditBoolItem(tr("Display Signal Strength & Quality"), &tmpNopacityConfig->displaySignalStrength));
+ Add(new cMenuEditBoolItem(tr("Display Channel Source information"), &tmpNopacityConfig->displaySourceInfo));
Add(new cMenuEditBoolItem(tr("Display previous and next Channel Group"), &tmpNopacityConfig->displayPrevNextChannelGroup));
Add(new cMenuEditIntItem(tr("Screen Resolution Icon Size"), &tmpNopacityConfig->resolutionIconSize, 30, 200));
Add(new cMenuEditIntItem(tr("Status Icons Size"), &tmpNopacityConfig->statusIconSize, 30, 150));
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-13 00:58:39 +0000