diff options
| author | svntcreutz <svntcreutz@cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f> | 2007-08-19 23:19:00 +0000 |
|---|---|---|
| committer | svntcreutz <svntcreutz@cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f> | 2007-08-19 23:19:00 +0000 |
| commit | 7ee95418c543dd4f1c53facf937a043eb8dfc5f4 (patch) | |
| tree | 9b789fcd8ca55d00b057a3eea041fa17ec85ea8b /src | |
| parent | a703868bfb6822a111648d0167cd3a4de62b22ee (diff) | |
| download | vdr-plugin-menuorg-7ee95418c543dd4f1c53facf937a043eb8dfc5f4.tar.gz vdr-plugin-menuorg-7ee95418c543dd4f1c53facf937a043eb8dfc5f4.tar.bz2 | |
reverted command stuff changes in dtd and added it in _dtd const
git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/submenu/trunk@5840 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f
Diffstat (limited to 'src')
| -rw-r--r-- | src/menuconfiguration.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/menuconfiguration.cpp b/src/menuconfiguration.cpp index 11f0820..b95c330 100644 --- a/src/menuconfiguration.cpp +++ b/src/menuconfiguration.cpp @@ -33,13 +33,18 @@ using namespace xmlpp; using namespace std; const string MenuConfiguration::_dtd = - "<!ELEMENT menus ((menu | system | plugin)+)>\n" + "<!ELEMENT menus ((menu | system | plugin | command)+)>\n" "<!ELEMENT menu ((menu | system | plugin)+)>\n" "<!ATTLIST menu name CDATA #REQUIRED>\n" "<!ELEMENT system EMPTY>\n" "<!ATTLIST system name CDATA #REQUIRED>\n" "<!ELEMENT plugin EMPTY>\n" - "<!ATTLIST plugin name CDATA #REQUIRED>\n"; + "<!ATTLIST plugin name CDATA #REQUIRED>\n" + "<!ELEMENT command EMPTY>\n" + "<!ATTLIST command\n" + " name CDATA #REQUIRED\n" + " execute CDATA #REQUIRED\n" + " confirm (yes|no) #IMPLIED>"; MenuNode* MenuConfiguration::LoadMenu(string menuFileName) { @@ -61,7 +66,7 @@ MenuNode* MenuConfiguration::LoadMenu(string menuFileName) const Element* rootElement = parser.get_document()->get_root_node(); ParseElement(rootElement, menuRoot); - + AddUnconfiguredPlugins(menuRoot); } catch(const std::exception& ex) |