Changed a lot !!!

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

1 files changed, 23 insertions, 21 deletions

diff --git a/src/RecursiveMenuSetup.h b/src/RecursiveMenuSetup.h
index b09d6e2..8817ed4 100644
--- a/src/RecursiveMenuSetup.h
+++ b/src/RecursiveMenuSetup.h
@@ -24,32 +24,34 @@
 #define ___RECURSIVEMENUSETUP_H_
 
 #include <vdr/menu.h>
-#include "imenunodeprocessor.h"
+#include "IMenuNodeProcessor.h"
 
+class MenuConfigurationRepository;
 class MenuNode;
 
 class RecursiveMenuSetup: public cOsdMenu
 {
-	private:
-		MenuNode& _rootMenu;
-		bool _moving;
-
-	public:
-		RecursiveMenuSetup(MenuNode& rootMenu);
-	   	~RecursiveMenuSetup();
-
-	   	// cOsdMenu
-	   	eOSState ProcessKey(eKeys Key);
-
-	private:
-		void CreateMenuItems();
-		void ShowHelp();
-		void StartMoving();
-		void StopMoving();
-		eOSState MoveCurrentItem(bool moveUp);
-		eOSState ShowEditMenuForSelectedItem();
-		eOSState ShowSubOrEditMenuForSelectedItem();
-		MenuNode* SelectedItem();
+    private:
+        MenuConfigurationRepository* _menuConfigurationRepository;
+        SubMenuNode* _menuConfiguration;
+        SubMenuNode* _currentRootMenuNode;
+        bool _moving;
+
+    public:
+        RecursiveMenuSetup(MenuConfigurationRepository* menuConfigurationRepository, SubMenuNode* rootMenuNode = NULL);
+        ~RecursiveMenuSetup();
+
+           // cOsdMenu
+           eOSState ProcessKey(eKeys Key);
+
+    private:
+        void CreateMenuItems();
+        void ShowHelp();
+        void StartMoving();
+        void StopMoving();
+        eOSState MoveCurrentItem(bool moveUp);
+        eOSState ShowEditMenuForSelectedItem(bool openSubmenuInsteadOfEditing);
+        MenuNode* SelectedItem();
 };
 
 #endif