intermediate commit

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

1 files changed, 10 insertions, 2 deletions

diff --git a/src/pluginsetup.cpp b/src/pluginsetup.cpp
index cb4461e..54d2a72 100644
--- a/src/pluginsetup.cpp
+++ b/src/pluginsetup.cpp
@@ -25,6 +25,8 @@
 #include "menuorg.h"
 #include "pluginsetup.h"
 #include "menusetup.h"
+#include "RecursiveMenuSetup.h"
+#include "menuconfiguration.h"
 
 PluginSetup::PluginSetup(PluginConfiguration& pluginConfiguration, MenuConfiguration& menuConfiguration)
     :_pluginConfiguration(pluginConfiguration), _menuConfiguration(menuConfiguration)
@@ -55,8 +57,14 @@ eOSState PluginSetup::ProcessKey(eKeys Key)
     switch(state)
     {
         case osUser1:
-            return AddSubMenu(new cMenuOrgSetup(_menuConfiguration, _pluginConfiguration._menuSetupStyle));
-            break;
+        	if (_pluginConfiguration.MenuSetupStyle() == 0 )
+        	{
+        		return AddSubMenu(new cMenuOrgSetup(_menuConfiguration, _pluginConfiguration._menuSetupStyle));
+        	}
+        	else
+        	{
+        		return AddSubMenu(new RecursiveMenuSetup(*_menuConfiguration.MenuTree()));
+        	}
 
         case osContinue:
             if(NORMALKEY(Key)==kUp || NORMALKEY(Key)==kDown)