some menu changes

git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/menuorg/trunk@6100 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f

3 files changed, 26 insertions, 10 deletions

diff --git a/src/menuitemsetup.cpp b/src/menuitemsetup.cpp
index bc4851d..6177e0a 100644
--- a/src/menuitemsetup.cpp
+++ b/src/menuitemsetup.cpp
@@ -32,13 +32,34 @@ cMenuItemSetup::cMenuItemSetup(void)
     itemTypeText[3] = "Command";
 
     Add(new cMenuEditStraItem(tr("Item Type"),&_itemType, 4, itemTypeText));
-    // TODO: add osd items for the selectet item type
+
+    switch(_itemType)
+    {
+        case 0:
+            // Add listItem of valid System Items
+            // Add textItem for title attribute
+            Add()
+            break;
+
+        case 1:
+            // Add listItem of unused plugins or a submenu with the items
+            // Add textItem for title attribute
+            break;
+
+        case 2:
+            // Add textItem for name attribute
+            break;
+
+        case 3:
+            // Add textItem for name attribute
+            // Add textItem for command attribute
+            // Add boolItem for confirm attribute
+            break;
+    }
 }
 
 eOSState cMenuItemSetup::ProcessKey(eKeys Key)
 {
-    dsyslog("menuorg: cMenuSetupItemSetup::ProcessKey called");
-    std::cerr << "menuorg: cMenuSetupItemSetup::ProcessKey called" << std::endl;
     eOSState state = cOsdMenu::ProcessKey(Key);
     return state;
 }
diff --git a/src/menusetup.cpp b/src/menusetup.cpp
index 6d87a8c..5fedd3a 100644
--- a/src/menusetup.cpp
+++ b/src/menusetup.cpp
@@ -85,9 +85,6 @@ void cMenuOrgSetup::CreateMenuItems(const Element* menuRoot, int iCount)
 
 eOSState cMenuOrgSetup::ProcessKey(eKeys Key)
 {
-    dsyslog("menuorg: cMenuSetup::ProcessKey called");
-    std::cerr << "menuorg: cMenuSetup::ProcessKey called" << std::endl;
-
     eOSState state = cOsdMenu::ProcessKey(Key);
 
     if(HasSubMenu())
diff --git a/src/pluginsetup.cpp b/src/pluginsetup.cpp
index 6609f76..96477aa 100644
--- a/src/pluginsetup.cpp
+++ b/src/pluginsetup.cpp
@@ -52,11 +52,9 @@ void PluginSetup::Store(void)
 
 eOSState PluginSetup::ProcessKey(eKeys Key)
 {
-    dsyslog("menuorg: PluginSetup::ProcessKey called");
-    std::cerr << "menuorg: PluginSetup::ProcessKey called" << std::endl;
-    bool HadSubMenu = HasSubMenu();
     eOSState state = cOsdMenu::ProcessKey(Key);
-    if (HasSubMenu() || HadSubMenu)
+
+    if (HasSubMenu())
     {
         return state;
     }