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.c74
-rw-r--r--displaychannel.h3
-rw-r--r--icons/skinIcons/crypted.pngbin0 -> 19542 bytes
-rw-r--r--icons/skinIcons/dolbyoff.pngbin0 -> 14348 bytes
-rw-r--r--icons/skinIcons/dolbyon.pngbin0 -> 15126 bytes
-rw-r--r--icons/skinIcons/fta.pngbin0 -> 16836 bytes
-rw-r--r--icons/skinIcons/recoff.pngbin0 -> 15327 bytes
-rw-r--r--icons/skinIcons/recon.pngbin0 -> 19337 bytes
-rw-r--r--icons/skinIcons/stereooff.pngbin0 -> 16325 bytes
-rw-r--r--icons/skinIcons/stereoon.pngbin0 -> 20860 bytes
-rw-r--r--icons/skinIcons/txtoff.pngbin0 -> 15447 bytes
-rw-r--r--icons/skinIcons/txton.pngbin0 -> 17142 bytes
-rw-r--r--menuitem.c4
-rw-r--r--menuitem.h1
-rw-r--r--po/de_DE.po11
-rw-r--r--po/it_IT.po11
-rw-r--r--po/sk_SK.po11
-rw-r--r--setup.c4
-rw-r--r--setup.h1
22 files changed, 113 insertions, 11 deletions
diff --git a/HISTORY b/HISTORY
index c4e49c3..6ad3cc2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -216,3 +216,4 @@ Version 0.1.2
running in the background
- Additional information in channels menu configurable: choice between
transponder information and current schedule
+- Added optional dedicated status icons in channel display
diff --git a/config.c b/config.c
index bc4db13..811f3d5 100644
--- a/config.c
+++ b/config.c
@@ -21,6 +21,7 @@ cNopacityConfig::cNopacityConfig() {
logoExtension = "png";
logoBorder = 15;
backgroundStyle = 0;
+ symbolStyle = 0;
roundedCornersChannel = 1;
displaySignalStrength = 1;
displayPrevNextChannelGroup = 1;
@@ -303,6 +304,7 @@ bool cNopacityConfig::SetupParse(const char *Name, const char *Value) {
else if (strcmp(Name, "logoHeight") == 0) logoHeight = atoi(Value);
else if (strcmp(Name, "logoBorder") == 0) logoBorder = atoi(Value);
else if (strcmp(Name, "backgroundStyle") == 0) backgroundStyle = atoi(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, "displayPrevNextChannelGroup") == 0) displayPrevNextChannelGroup = atoi(Value);
diff --git a/config.h b/config.h
index 7d85944..a96d75b 100644
--- a/config.h
+++ b/config.h
@@ -46,6 +46,7 @@ class cNopacityConfig {
int logoHeight;
int logoBorder;
int backgroundStyle;
+ int symbolStyle;
int roundedCornersChannel;
int displaySignalStrength;
int displayPrevNextChannelGroup;
diff --git a/displaychannel.c b/displaychannel.c
index 77c1488..919ebb0 100644
--- a/displaychannel.c
+++ b/displaychannel.c
@@ -302,6 +302,72 @@ void cNopacityDisplayChannel::DrawIcons(const cChannel *Channel) {
pixmapStreamInfoBack->DrawRectangle(cRect(backX, backY, iconSize-10, iconSize-10), colRecording);
}
+void cNopacityDisplayChannel::DrawIconsSingle(const cChannel *Channel) {
+ isRadioChannel = ((!Channel->Vpid())&&(Channel->Apid(0)))?true:false;
+ pixmapStreamInfo->Fill(clrTransparent);
+ int iconX = 0;
+ cImageLoader imgLoader;
+
+ if (Channel->Vpid() && Channel->Tpid()) {
+ if (imgLoader.LoadIcon("skinIcons/txton", iconSize)) {
+ pixmapStreamInfo->DrawImage(cPoint(iconX, 0), imgLoader.GetImage());
+ }
+ } else {
+ if (imgLoader.LoadIcon("skinIcons/txtoff", iconSize)) {
+ pixmapStreamInfo->DrawImage(cPoint(iconX, 0), imgLoader.GetImage());
+ }
+ }
+
+ iconX += iconSize;
+
+ if (Channel->Apid(1)) {
+ if (imgLoader.LoadIcon("skinIcons/stereoon", iconSize)) {
+ pixmapStreamInfo->DrawImage(cPoint(iconX, 0), imgLoader.GetImage());
+ }
+ } else {
+ if (imgLoader.LoadIcon("skinIcons/stereooff", iconSize)) {
+ pixmapStreamInfo->DrawImage(cPoint(iconX, 0), imgLoader.GetImage());
+ }
+ }
+
+ iconX += iconSize;
+
+ if (Channel->Dpid(0)) {
+ if (imgLoader.LoadIcon("skinIcons/dolbyon", iconSize)) {
+ pixmapStreamInfo->DrawImage(cPoint(iconX, 0), imgLoader.GetImage());
+ }
+ } else {
+ if (imgLoader.LoadIcon("skinIcons/dolbyoff", iconSize)) {
+ pixmapStreamInfo->DrawImage(cPoint(iconX, 0), imgLoader.GetImage());
+ }
+ }
+
+ iconX += iconSize;
+
+ if (Channel->Ca()) {
+ if (imgLoader.LoadIcon("skinIcons/crypted", iconSize)) {
+ pixmapStreamInfo->DrawImage(cPoint(iconX, 0), imgLoader.GetImage());
+ }
+ } else {
+ if (imgLoader.LoadIcon("skinIcons/fta", iconSize)) {
+ pixmapStreamInfo->DrawImage(cPoint(iconX, 0), imgLoader.GetImage());
+ }
+ }
+
+ iconX += iconSize;
+
+ if (cRecordControls::Active()) {
+ if (imgLoader.LoadIcon("skinIcons/recon", iconSize)) {
+ pixmapStreamInfo->DrawImage(cPoint(iconX, 0), imgLoader.GetImage());
+ }
+ } else {
+ if (imgLoader.LoadIcon("skinIcons/recoff", iconSize)) {
+ pixmapStreamInfo->DrawImage(cPoint(iconX, 0), imgLoader.GetImage());
+ }
+ }
+
+}
+
void cNopacityDisplayChannel::DrawScreenResolution(void) {
int spacing = 10;
int screenWidth = 0;
@@ -447,8 +513,12 @@ void cNopacityDisplayChannel::SetChannel(const cChannel *Channel, int Number) {
if (!groupSep) {
if (withInfo) {
- DrawIconMask();
- DrawIcons(Channel);
+ if (config.symbolStyle == 0) {
+ DrawIconMask();
+ DrawIcons(Channel);
+ } else {
+ DrawIconsSingle(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 eec252a..d255900 100644
--- a/displaychannel.h
+++ b/displaychannel.h
@@ -74,7 +74,8 @@ private:
void DrawProgressBar(int Current, int Total);
tColor DrawProgressbarBackground(int left, int top, int width, int height);
void DrawIconMask(void);
- void DrawIcons(const cChannel *channel);
+ void DrawIcons(const cChannel *Channel);
+ void DrawIconsSingle(const cChannel *Channel);
void DrawScreenResolution(void);
void DrawSignalMeter(void);
void DrawSignal(void);
diff --git a/icons/skinIcons/crypted.png b/icons/skinIcons/crypted.png
new file mode 100644
index 0000000..9415299
--- /dev/null
+++ b/icons/skinIcons/crypted.png
Binary files differ
diff --git a/icons/skinIcons/dolbyoff.png b/icons/skinIcons/dolbyoff.png
new file mode 100644
index 0000000..e3b516f
--- /dev/null
+++ b/icons/skinIcons/dolbyoff.png
Binary files differ
diff --git a/icons/skinIcons/dolbyon.png b/icons/skinIcons/dolbyon.png
new file mode 100644
index 0000000..7697dcc
--- /dev/null
+++ b/icons/skinIcons/dolbyon.png
Binary files differ
diff --git a/icons/skinIcons/fta.png b/icons/skinIcons/fta.png
new file mode 100644
index 0000000..833bbaf
--- /dev/null
+++ b/icons/skinIcons/fta.png
Binary files differ
diff --git a/icons/skinIcons/recoff.png b/icons/skinIcons/recoff.png
new file mode 100644
index 0000000..ac35bf4
--- /dev/null
+++ b/icons/skinIcons/recoff.png
Binary files differ
diff --git a/icons/skinIcons/recon.png b/icons/skinIcons/recon.png
new file mode 100644
index 0000000..fe37b18
--- /dev/null
+++ b/icons/skinIcons/recon.png
Binary files differ
diff --git a/icons/skinIcons/stereooff.png b/icons/skinIcons/stereooff.png
new file mode 100644
index 0000000..a8d1ec6
--- /dev/null
+++ b/icons/skinIcons/stereooff.png
Binary files differ
diff --git a/icons/skinIcons/stereoon.png b/icons/skinIcons/stereoon.png
new file mode 100644
index 0000000..dac8469
--- /dev/null
+++ b/icons/skinIcons/stereoon.png
Binary files differ
diff --git a/icons/skinIcons/txtoff.png b/icons/skinIcons/txtoff.png
new file mode 100644
index 0000000..1cef83f
--- /dev/null
+++ b/icons/skinIcons/txtoff.png
Binary files differ
diff --git a/icons/skinIcons/txton.png b/icons/skinIcons/txton.png
new file mode 100644
index 0000000..58403a7
--- /dev/null
+++ b/icons/skinIcons/txton.png
Binary files differ
diff --git a/menuitem.c b/menuitem.c
index 5795433..9b1dfad 100644
--- a/menuitem.c
+++ b/menuitem.c
@@ -562,7 +562,6 @@ void cNopacityScheduleMenuItem::DrawRemaining(int x, int y, int width) {
cNopacityChannelMenuItem::cNopacityChannelMenuItem(cOsd *osd, const cChannel *Channel, bool sel, cRect *vidWin) : cNopacityMenuItem (osd, "", sel) {
this->Channel = Channel;
this->vidWin = vidWin;
- epgRead = false;
}
cNopacityChannelMenuItem::~cNopacityChannelMenuItem(void) {
@@ -721,9 +720,6 @@ void cNopacityChannelMenuItem::Render() {
if (selectable) { //Channels
DrawBackground();
- if (!epgRead) {
-
- }
int logoWidth = config.menuItemLogoWidth;
int logoHeight = config.menuItemLogoHeight;
if (!drawn) {
diff --git a/menuitem.h b/menuitem.h
index c2c2c9d..7d09c32 100644
--- a/menuitem.h
+++ b/menuitem.h
@@ -116,7 +116,6 @@ private:
std::string strEpgInfoFull;
std::string strTimeInfo;
cRect *vidWin;
- bool epgRead;
void SetTextFull(void);
void SetTextShort(void);
void DrawBackground(void);
diff --git a/po/de_DE.po b/po/de_DE.po
index ce5cdfc..09fd2e6 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-09 14:41+0200\n"
+"POT-Creation-Date: 2013-05-10 11:09+0200\n"
"PO-Revision-Date: 2012-11-11 17:49+0200\n"
"Last-Translator: louis\n"
"Language-Team: \n"
@@ -347,6 +347,12 @@ msgstr "Weitere EPG Bilder in der detaillierten Aufnahmeansicht anzeigen"
msgid "Folder Icon Size"
msgstr "Order Icon Größe"
+msgid "simple, one common image"
+msgstr "einfach, eine gemeinsame Graphik"
+
+msgid "complex, dedicated images"
+msgstr "aufwändig, einzelne Graphiken"
+
msgid "transparent channel logo"
msgstr "Kanallogo transparent"
@@ -398,6 +404,9 @@ msgstr "Größe des Icons zur Anzeige der Bildschirmauflösung"
msgid "Status Icons Size"
msgstr "Status Icon Größe"
+msgid "Status Icon Style"
+msgstr "Status Icon Stil"
+
msgid "Adjust Font Size - EPG Text"
msgstr "Schriftgröße anpassen - EPG Text"
diff --git a/po/it_IT.po b/po/it_IT.po
index 57a1a12..45b1422 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-09 14:41+0200\n"
+"POT-Creation-Date: 2013-05-10 11:09+0200\n"
"PO-Revision-Date: 2013-03-19 22:56+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: \n"
@@ -350,6 +350,12 @@ msgstr "Mostra immagini EPG aggiuntivo nella vista dettagli registrazione"
msgid "Folder Icon Size"
msgstr "Dim. icona cartella"
+msgid "simple, one common image"
+msgstr ""
+
+msgid "complex, dedicated images"
+msgstr ""
+
msgid "transparent channel logo"
msgstr ""
@@ -401,6 +407,9 @@ msgstr "Dim. icona risoluzione schermo"
msgid "Status Icons Size"
msgstr "Dim. icone stato"
+msgid "Status Icon Style"
+msgstr ""
+
msgid "Adjust Font Size - EPG Text"
msgstr "Adatta dim. caratteri - Testo EPG"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 79b0f14..3daa603 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-09 14:41+0200\n"
+"POT-Creation-Date: 2013-05-10 11:09+0200\n"
"PO-Revision-Date: 2013-03-12 15:59+0100\n"
"Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
"Language-Team: \n"
@@ -350,6 +350,12 @@ msgstr "Zobrazi» ïal¹ie EPG obrázky v podrobnom zobrazení nahrávky"
msgid "Folder Icon Size"
msgstr "Veµkos» ikony prieèinku"
+msgid "simple, one common image"
+msgstr ""
+
+msgid "complex, dedicated images"
+msgstr ""
+
msgid "transparent channel logo"
msgstr ""
@@ -401,6 +407,9 @@ msgstr "Veµkos» ikony rozlí¹enia obrazovky"
msgid "Status Icons Size"
msgstr "Veµkos» ikón panelu úloh"
+msgid "Status Icon Style"
+msgstr ""
+
msgid "Adjust Font Size - EPG Text"
msgstr "Nastavenie veµkos»i písma - EPG text"
diff --git a/setup.c b/setup.c
index ba4d47a..99210be 100644
--- a/setup.c
+++ b/setup.c
@@ -80,6 +80,7 @@ void cNopacitySetup::Store(void) {
SetupStore("logoHeight", config.logoHeight);
SetupStore("logoBorder", config.logoBorder);
SetupStore("backgroundStyle", config.backgroundStyle);
+ SetupStore("symbolStyle", config.symbolStyle);
SetupStore("roundedCornersChannel", config.roundedCornersChannel);
SetupStore("displaySignalStrength", config.displaySignalStrength);
SetupStore("displayPrevNextChannelGroup", config.displayPrevNextChannelGroup);
@@ -456,6 +457,8 @@ void cNopacitySetupMenuDisplayRecordings::Set(void) {
//----ChannelDisplay--------------------------------------------------------------------------------------------------------------
cNopacitySetupChannelDisplay::cNopacitySetupChannelDisplay(cNopacityConfig* data) : cMenuSetupSubMenu(tr("Channel Switching"), data) {
+ symStyle[0] = tr("simple, one common image");
+ symStyle[1] = tr("complex, dedicated images");
bgStyle[0] = tr("transparent channel logo");
bgStyle[1] = tr("full osd width");
logoPos[0] = tr("do not display");
@@ -487,6 +490,7 @@ void cNopacitySetupChannelDisplay::Set(void) {
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));
+ Add(new cMenuEditStraItem(tr("Status Icon Style"), &tmpNopacityConfig->symbolStyle, 2, symStyle));
Add(new cMenuEditIntItem(tr("Adjust Font Size - Header"), &tmpNopacityConfig->fontChannelHeaderSize, -20, 20));
Add(new cMenuEditIntItem(tr("Adjust Font Size - Date"), &tmpNopacityConfig->fontChannelDateSize, -20, 20));
Add(new cMenuEditIntItem(tr("Adjust Font Size - EPG Text"), &tmpNopacityConfig->fontEPGSize, -20, 20));
diff --git a/setup.h b/setup.h
index 657bf07..192caab 100644
--- a/setup.h
+++ b/setup.h
@@ -81,6 +81,7 @@ class cNopacitySetupChannelDisplay : public cMenuSetupSubMenu {
protected:
const char *logoPos[3];
const char *progressStyleCurrentSchedule[2];
+ const char *symStyle[2];
const char *bgStyle[2];
void Set(void);
public:
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-31 18:24:20 +0000