nome renameing and add the menu setup osd to the main menu

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

3 files changed, 6 insertions, 5 deletions

diff --git a/src/menuorg.cpp b/src/menuorg.cpp
index ed6d169..f63c072 100644
--- a/src/menuorg.cpp
+++ b/src/menuorg.cpp
@@ -30,6 +30,7 @@
 #include <getopt.h>
 #include "version.h"
 #include "menuorg.h"
+#include "menusetup.h"
 #include "menuconfiguration.h"
 #include "mainmenuitemsprovider.h"
 #include "i18n.h"
@@ -122,7 +123,7 @@ bool MenuOrgPlugin::Initialize(void)
 cOsdObject *MenuOrgPlugin::MainMenuAction(void)
 {
     // Perform the action when selected from the main VDR menu.
-    return NULL;
+    return new cMenuSetup(*_menuConfiguration, 1);
 }
 
 cMenuSetupPage *MenuOrgPlugin::SetupMenu(void)
diff --git a/src/menusetup.cpp b/src/menusetup.cpp
index dbce3ea..906e6ed 100644
--- a/src/menusetup.cpp
+++ b/src/menusetup.cpp
@@ -35,10 +35,10 @@ cMenuSetup::cMenuSetup(MenuConfiguration& menuConfiguration, int displayMode)
 :cOsdMenu(tr("Menu Setup")),_menuConfiguration(menuConfiguration)
 {
     _displayMode = displayMode;
-    DrawMenu(_menuConfiguration.Configuration(), 0);
+    CreateMenuItems(_menuConfiguration.Configuration(), 0);
 }
 
-void cMenuSetup::DrawMenu(const Element* menuRoot, int iCount)
+void cMenuSetup::CreateMenuItems(const Element* menuRoot, int iCount)
 {
     int cur=Current();
 
@@ -64,7 +64,7 @@ void cMenuSetup::DrawMenu(const Element* menuRoot, int iCount)
             {
                 name = "+" + name;
                 Add(new cOsdItem(name.c_str()),true);
-                DrawMenu(childElement, iCount+1);
+                CreateMenuItems(childElement, iCount+1);
             }
             else
             {
diff --git a/src/menusetup.h b/src/menusetup.h
index 85b2cf7..979ee63 100644
--- a/src/menusetup.h
+++ b/src/menusetup.h
@@ -42,7 +42,7 @@ class cMenuSetup : public cOsdMenu
 
     private:
         void DrawButton(void);
-        void DrawMenu(const xmlpp::Element* menuRoot, int iCount);
+        void CreateMenuItems(const xmlpp::Element* menuRoot, int iCount);
 };
 
 #endif