Changed plugin icons filename for loading icons in main menu, plugin name is now used

27 files changed, 37 insertions, 4 deletions

diff --git a/HISTORY b/HISTORY
index bfc47c6..46f7c8a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -149,3 +149,5 @@ Version 0.0.7:
   separator in low letters. If no icon is found, a generic icon is used.
 - if rounded corners for menuitems are used, also epg images are drawn with
   rounded corners with the same corner radius
+- Changed plugin icons filename for loading icons in main menu, plugin name
+  is now used
diff --git a/README b/README
index 3fb86f7..a12b8eb 100644
--- a/README
+++ b/README
@@ -48,11 +48,16 @@ at startup:
 
 First copy the icons from 
 /put/your/path/toVDRsources/here/VDR/PLUGINS/src/skinnopcaity/icons/
-to the configured icon path. After that download the logopack from:
-http://www.dvbviewer.tv/forum/topic/21378-logopacks/
-unzip it and place it accordingly the settings for the channel logos path.
+to the configured icon path.
 
-if no pathes are set for the different types of images, the following default
+I recommend to use channel logos from https://github.com/3PO/Senderlogos
+To download them just change in the directory you want to place the logos
+and do a:
+git clone https://github.com/3PO/Senderlogos.git logos
+An update of the logos can then be done with a "git pull" just inside this
+directory.
+
+If no pathes are set for the different types of images, the following default
 paths are used:
 channel logos: {ResourceDirectory}/logos/
 icons:         {ResourceDirectory}/icons/
diff --git a/icons/StopRecording.png b/icons/StopRecording.png
new file mode 100644
index 0000000..fc03b63
--- /dev/null
+++ b/icons/StopRecording.png
diff --git a/icons/StopReplay.png b/icons/StopReplay.png
new file mode 100644
index 0000000..020fcf0
--- /dev/null
+++ b/icons/StopReplay.png
diff --git a/icons/Administrative Aufgaben.png b/icons/admin.png
index 17f3758..17f3758 100644
--- a/icons/Administrative Aufgaben.png
+++ b/icons/admin.png
diff --git a/icons/darkred/Administrative Aufgaben.png b/icons/darkred/admin.png
index 6df947b..6df947b 100644
--- a/icons/darkred/Administrative Aufgaben.png
+++ b/icons/darkred/admin.png
diff --git a/icons/darkred/Videotext.png b/icons/darkred/osdteletext.png
index d6556f8..d6556f8 100644
--- a/icons/darkred/Videotext.png
+++ b/icons/darkred/osdteletext.png
diff --git a/icons/darkred/Tvguide.png b/icons/darkred/tvguide.png
index c632ac6..c632ac6 100644
--- a/icons/darkred/Tvguide.png
+++ b/icons/darkred/tvguide.png
diff --git a/icons/default/Administrative Aufgaben.png b/icons/default/admin.png
index 17f3758..17f3758 100644
--- a/icons/default/Administrative Aufgaben.png
+++ b/icons/default/admin.png
diff --git a/icons/default/discpercent.png b/icons/default/discpercent.png
new file mode 100644
index 0000000..1c219c5
--- /dev/null
+++ b/icons/default/discpercent.png
diff --git a/icons/default/fwdInactive.png b/icons/default/fwdInactive.png
new file mode 100644
index 0000000..4072c18
--- /dev/null
+++ b/icons/default/fwdInactive.png
diff --git a/icons/Videotext.png b/icons/default/osdteletext.png
index 0419706..0419706 100644
--- a/icons/Videotext.png
+++ b/icons/default/osdteletext.png
diff --git a/icons/default/pauseInactive.png b/icons/default/pauseInactive.png
new file mode 100644
index 0000000..9e01f85
--- /dev/null
+++ b/icons/default/pauseInactive.png
diff --git a/icons/default/playInactive.png b/icons/default/playInactive.png
new file mode 100644
index 0000000..42a627d
--- /dev/null
+++ b/icons/default/playInactive.png
diff --git a/icons/default/rewInactive.png b/icons/default/rewInactive.png
new file mode 100644
index 0000000..a199207
--- /dev/null
+++ b/icons/default/rewInactive.png
diff --git a/icons/Tvguide.png b/icons/default/tvguide.png
index 6c756b2..6c756b2 100644
--- a/icons/Tvguide.png
+++ b/icons/default/tvguide.png
diff --git a/icons/green/Administrative Aufgaben.png b/icons/green/admin.png
index 6989268..6989268 100644
--- a/icons/green/Administrative Aufgaben.png
+++ b/icons/green/admin.png
diff --git a/icons/green/discpercent.png b/icons/green/discpercent.png
new file mode 100644
index 0000000..1c219c5
--- /dev/null
+++ b/icons/green/discpercent.png
diff --git a/icons/green/fwdInactive.png b/icons/green/fwdInactive.png
new file mode 100644
index 0000000..4072c18
--- /dev/null
+++ b/icons/green/fwdInactive.png
diff --git a/icons/green/Videotext.png b/icons/green/osdteletext.png
index 1beab83..1beab83 100644
--- a/icons/green/Videotext.png
+++ b/icons/green/osdteletext.png
diff --git a/icons/green/pauseInactive.png b/icons/green/pauseInactive.png
new file mode 100644
index 0000000..9e01f85
--- /dev/null
+++ b/icons/green/pauseInactive.png
diff --git a/icons/green/playInactive.png b/icons/green/playInactive.png
new file mode 100644
index 0000000..42a627d
--- /dev/null
+++ b/icons/green/playInactive.png
diff --git a/icons/green/rewInactive.png b/icons/green/rewInactive.png
new file mode 100644
index 0000000..a199207
--- /dev/null
+++ b/icons/green/rewInactive.png
diff --git a/icons/green/Tvguide.png b/icons/green/tvguide.png
index 6ed25dc..6ed25dc 100644
--- a/icons/green/Tvguide.png
+++ b/icons/green/tvguide.png
diff --git a/icons/default/Videotext.png b/icons/osdteletext.png
index 0419706..0419706 100644
--- a/icons/default/Videotext.png
+++ b/icons/osdteletext.png
diff --git a/icons/default/Tvguide.png b/icons/tvguide.png
index 6c756b2..6c756b2 100644
--- a/icons/default/Tvguide.png
+++ b/icons/tvguide.png
diff --git a/menuitem.c b/menuitem.c
index f0124fc..7ccf1ac 100644
--- a/menuitem.c
+++ b/menuitem.c
@@ -204,11 +204,37 @@ std::string cNopacityMainMenuItem::items[16] = { "Schedule", "Channels", "Timers
 
 cString cNopacityMainMenuItem::GetIconName() {
     std::string element = *menuEntry;
+    //check for standard menu entries
     for (int i=0; i<16; i++) {
         std::string s = trVDR(items[i].c_str());
         if (s == element)
             return items[i].c_str();
     }
+    //check for special main menu entries "stop recording", "stop replay"
+    std::string stopRecording = skipspace(trVDR(" Stop recording "));
+    std::string stopReplay = skipspace(trVDR(" Stop replaying"));
+    try {
+        if (element.substr(0, stopRecording.size()) == stopRecording)
+            return "StopRecording";
+        if (element.substr(0, stopReplay.size()) == stopReplay)
+            return "StopReplay";
+    } catch (...) {}
+    //check for Plugins
+    for (int i = 0; ; i++) {
+        cPlugin *p = cPluginManager::GetPlugin(i);
+        if (p) {
+            const char *mainMenuEntry = p->MainMenuEntry();
+            if (mainMenuEntry) {
+                std::string plugMainEntry = mainMenuEntry;
+                try {
+                    if (element.substr(0, plugMainEntry.size()) == plugMainEntry) {
+                        return p->Name();
+                    }
+                } catch (...) {}
+            } 
+        } else
+            break;
+    }
     return menuEntry;
 }