Maximum number of timers in main menu configurable

10 files changed, 21 insertions, 3 deletions

diff --git a/HISTORY b/HISTORY
index cf39490..8e78627 100644
--- a/HISTORY
+++ b/HISTORY
@@ -162,3 +162,6 @@ Version 0.1.0:
 Version 0.1.1
 - graphical progress bar if default menu item style for schedules is used 
   for epgsearchs What's on now
+- Main menu title style configurable
+- Maximum number of timers in main menu configurable
+- Added alternative main menu header icons (thanks @BooStar)
diff --git a/config.c b/config.c
index 34924d8..696682b 100644
--- a/config.c
+++ b/config.c
@@ -91,6 +91,7 @@ cNopacityConfig::cNopacityConfig() {
     menuSizeDiskUsage = 12;
     showDiscUsage = 1;
     showTimers = 1;
+    numberTimers = 10;
     checkTimerConflict = 1;
     headerHeight = 7;
     footerHeight = 7;
@@ -274,6 +275,7 @@ bool cNopacityConfig::SetupParse(const char *Name, const char *Value) {
     else if (strcmp(Name, "menuHeightInfoWindow") == 0)    menuHeightInfoWindow = atoi(Value);
     else if (strcmp(Name, "showDiscUsage") == 0)           showDiscUsage = atoi(Value);
     else if (strcmp(Name, "showTimers") == 0)              showTimers = atoi(Value);
+    else if (strcmp(Name, "numberTimers") == 0)            numberTimers = atoi(Value);
     else if (strcmp(Name, "checkTimerConflict") == 0)      checkTimerConflict = atoi(Value);
     else if (strcmp(Name, "headerHeight") == 0)            headerHeight = atoi(Value);
     else if (strcmp(Name, "footerHeight") == 0)            footerHeight = atoi(Value);
diff --git a/config.h b/config.h
index 53d25ea..e17097a 100644
--- a/config.h
+++ b/config.h
@@ -117,6 +117,7 @@ class cNopacityConfig {
         int menuSizeDiskUsage;

         int showDiscUsage;

         int showTimers;

+        int numberTimers;

         int checkTimerConflict;

         int headerHeight;

         int footerHeight;

diff --git a/displaymenu.c b/displaymenu.c
index 9606162..8637231 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -124,6 +124,7 @@ void cNopacityDisplayMenu::DrawTimers(bool timersChanged, int numConflicts) {
                 currentHeight += t->GetHeight() + menuView->spaceMenu;
                 timers.Add(t);
             }
+            int numTimersDisplayed = 0;
             for (int i = 0; i < numTimers; i++) {
                 if (const cTimer *Timer = SortedTimers[i]) {
                     if (Timer->HasFlags(tfActive)) {
@@ -134,6 +135,9 @@ void cNopacityDisplayMenu::DrawTimers(bool timersChanged, int numConflicts) {
                         currentHeight += t->GetHeight() + menuView->spaceMenu;
                         if (currentHeight < maxTimersHeight) {
                             timers.Add(t);
+                        numTimersDisplayed++;
+                        if (numTimersDisplayed == config.numberTimers)
+                            break;
                         } else {
                             delete t;
                             break;
diff --git a/icons/vdrlogo_vdr_blue.png b/icons/vdrlogo_vdr_blue.png
new file mode 100644
index 0000000..5574685
--- /dev/null
+++ b/icons/vdrlogo_vdr_blue.png
diff --git a/icons/vdrlogo_vdr_grey.png b/icons/vdrlogo_vdr_grey.png
new file mode 100644
index 0000000..44c7896
--- /dev/null
+++ b/icons/vdrlogo_vdr_grey.png
diff --git a/icons/vdrlogo_vdr_red.png b/icons/vdrlogo_vdr_red.png
new file mode 100644
index 0000000..7d6d3d5
--- /dev/null
+++ b/icons/vdrlogo_vdr_red.png
diff --git a/po/de_DE.po b/po/de_DE.po
index 8e3b963..f6c28ee 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-03-16 11:47+0100\n"
+"POT-Creation-Date: 2013-03-16 11:52+0100\n"
 "PO-Revision-Date: 2012-11-11 17:49+0200\n"
 "Last-Translator: louis\n"
 "Language-Team: \n"
@@ -192,7 +192,7 @@ msgid "Icon Size (Square)"
 msgstr "Icon Größe (quadratisch)"
 
 msgid "Main menu title style"
-msgstr ""
+msgstr "Titel Stil im Hauptmenü"
 
 msgid "Display Disk Usage"
 msgstr "Festplattenstatus anzeigen"
@@ -209,6 +209,9 @@ msgstr "Schriftgröße anpassen - Prozent"
 msgid "Display Timers"
 msgstr "Timer anzeigen"
 
+msgid "Maximum number of Timers"
+msgstr "Maximale Timer Anzahl"
+
 msgid "Width of Timers (Percent of OSD Width)"
 msgstr "Breite der Timer (Proz. der OSD Breite)"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 3c03964..a480a84 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-03-16 11:47+0100\n"
+"POT-Creation-Date: 2013-03-16 11:52+0100\n"
 "PO-Revision-Date: 2013-03-12 15:59+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: \n"
@@ -212,6 +212,9 @@ msgstr "Nastavenie veµkos»i písma - percento"
 msgid "Display Timers"
 msgstr "Zobrazené plány nahrávania"
 
+msgid "Maximum number of Timers"
+msgstr ""
+
 msgid "Width of Timers (Percent of OSD Width)"
 msgstr "©írka zobrazeného plánu nahrávania (Percento s OSD ¹írky)"
 
diff --git a/setup.c b/setup.c
index f8398f9..c999308 100644
--- a/setup.c
+++ b/setup.c
@@ -145,6 +145,7 @@ void cNopacitySetup::Store(void) {
     SetupStore("menuInfoScrollSpeed", config.menuInfoScrollSpeed);
     SetupStore("showDiscUsage", config.showDiscUsage);
     SetupStore("showTimers", config.showTimers);
+    SetupStore("numberTimers", config.numberTimers);
     SetupStore("checkTimerConflict", config.checkTimerConflict);
     SetupStore("headerHeight", config.headerHeight);
     SetupStore("footerHeight", config.footerHeight);
@@ -288,6 +289,7 @@ void cNopacitySetupMenuDisplayMain::Set(void) {
     }
     Add(new cMenuEditBoolItem(tr("Display Timers"), &tmpNopacityConfig->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, 100));
         Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Channel Logo Width")), &tmpNopacityConfig->timersLogoWidth, 30, 300));
         Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Channel Logo Height")), &tmpNopacityConfig->timersLogoHeight, 30, 300));