From ae81d6bd575ea768cfe062b88423edc4ab1a6054 Mon Sep 17 00:00:00 2001
From: svntcreutz <svntcreutz@cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f>
Date: Sun, 26 Aug 2007 00:48:54 +0000
Subject: alternate titles for plugins implimented

git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/menuorg/trunk@5995 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f
---
 src/menuconfiguration.cpp | 14 +++++++++++---
 src/menuorgsetup.cpp      |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/menuconfiguration.cpp b/src/menuconfiguration.cpp
index b9c01b4..4845f44 100644
--- a/src/menuconfiguration.cpp
+++ b/src/menuconfiguration.cpp
@@ -39,9 +39,13 @@ const string MenuConfiguration::_dtd =
   "<!ELEMENT menu ((menu | system | plugin | command)+)>\n"
   "<!ATTLIST menu name CDATA #REQUIRED>\n"
   "<!ELEMENT system EMPTY>\n"
-  "<!ATTLIST system name CDATA #REQUIRED>\n"
+  "<!ATTLIST system\n"
+  " name CDATA #REQUIRED\n"
+  " title CDATA #IMPLIED>\n"
   "<!ELEMENT plugin EMPTY>\n"
-  "<!ATTLIST plugin name CDATA #REQUIRED>\n"
+  "<!ATTLIST plugin\n"
+  " name CDATA #REQUIRED\n"
+  " title CDATA #IMPLIED>\n"
   "<!ELEMENT command EMPTY>\n"
   "<!ATTLIST command\n"
   " name CDATA #REQUIRED\n"
@@ -104,10 +108,14 @@ void MenuConfiguration::ParseElement(const Element* element, MenuNode* menuNode)
             }
             else if (type == "system")
             {
+                const xmlpp::Attribute* titleAttribute = childElement->get_attribute("title");
+                name = titleAttribute ? (string) UnicodeToLocaleOrIso8859(titleAttribute->get_value()) : name;
                 AddSystemMenuNode(name, menuNode);
             }
             else if (type == "plugin")
             {
+                const xmlpp::Attribute* titleAttribute = childElement->get_attribute("title");
+                name = titleAttribute ? (string) UnicodeToLocaleOrIso8859(titleAttribute->get_value()) : name;
                 AddPluginMenuNode(name, menuNode);
             }
             else if (type == "command")
@@ -115,7 +123,7 @@ void MenuConfiguration::ParseElement(const Element* element, MenuNode* menuNode)
                 string execute = childElement->get_attribute("execute")->get_value();
                 const xmlpp::Attribute* confirmAttribute = childElement->get_attribute("confirm");
                 bool confirm = confirmAttribute ? (confirmAttribute->get_value() == "yes") : false;
-                    AddCommandMenuNode(name, execute, confirm, menuNode);
+                AddCommandMenuNode(name, execute, confirm, menuNode);
             }
         }
     }
diff --git a/src/menuorgsetup.cpp b/src/menuorgsetup.cpp
index bcf76cc..1628f90 100644
--- a/src/menuorgsetup.cpp
+++ b/src/menuorgsetup.cpp
@@ -31,7 +31,7 @@ cMenuOrgPluginSetup::cMenuOrgPluginSetup(int* pluginIsActive, int* showLostPlugi
     _pluginIsActive = pluginIsActive;
     _showLostPlugins = showLostPlugins;
 
-    // make temporary copy the values
+    // make a temporary copy of the values
     _newpluginIsActive = *pluginIsActive;
     _newshowLostPlugins = *showLostPlugins;
 
-- 
cgit v1.2.3