diff options
| -rw-r--r-- | TODO | 1 | ||||
| -rw-r--r-- | menuorg.dtd | 2 | ||||
| -rw-r--r-- | src/menuconfiguration.cpp | 14 | ||||
| -rw-r--r-- | src/menuorgsetup.cpp | 2 |
4 files changed, 14 insertions, 5 deletions
@@ -3,5 +3,4 @@ Some Stuff that whe would integrade in future version: - Setup OSD for managing the submenu - reload the config file when opening mainmenu (only when menu configuration has been changed - checking timestamp of xml!) -- alternate titles for plugins - Enable / Disable in OSD-Setup diff --git a/menuorg.dtd b/menuorg.dtd index 8a019d1..296b62b 100644 --- a/menuorg.dtd +++ b/menuorg.dtd @@ -26,10 +26,12 @@ <!ELEMENT system EMPTY> <!ATTLIST system name CDATA #REQUIRED + title CDATA #IMPLIED > <!ELEMENT plugin EMPTY> <!ATTLIST plugin name CDATA #REQUIRED + title CDATA #IMPLIED > <!ELEMENT command EMPTY> <!ATTLIST plugin 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; |