fixed some spaces and MenuOrgPlugin::MainMenuAction

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

4 files changed, 19 insertions, 7 deletions

diff --git a/src/MenuConfigurationRepository.cpp b/src/MenuConfigurationRepository.cpp
index 8c21905..6567361 100644
--- a/src/MenuConfigurationRepository.cpp
+++ b/src/MenuConfigurationRepository.cpp
@@ -87,7 +87,7 @@ SubMenuNode* MenuConfigurationRepository::Load()
             validator.parse_memory(_dtd);
 
             Document *document = _parser.get_document();
-            validator.validate( document );
+            validator.validate(document);
 
             if (document)
             {
@@ -102,7 +102,7 @@ SubMenuNode* MenuConfigurationRepository::Load()
         {
             cerr << "menuorg: Exception caught when parsing xml configuration: " << ex.what();
             esyslog("Exception caught when parsing xml configuration. See stderr output for details.");
-        }        
+        }
     }
     return _cachedMenuConfiguration;
 }
@@ -132,7 +132,7 @@ void MenuConfigurationRepository::CreateMenuTree(const Element* menuRoot, SubMen
 {
     Node::NodeList children = menuRoot->get_children();
     for (Node::NodeList::iterator i = children.begin(); i != children.end(); i++)
-    {   
+    {
         const Element* childElement = dynamic_cast<const Element*>(*i);
 
         if (childElement)
diff --git a/src/MenuOrgPlugin.cpp b/src/MenuOrgPlugin.cpp
index 038fe4e..e7115ff 100644
--- a/src/MenuOrgPlugin.cpp
+++ b/src/MenuOrgPlugin.cpp
@@ -31,6 +31,7 @@
 #include "version.h"
 #include "MenuOrgPlugin.h"
 #include "FlatMenuSetup.h"
+#include "RecursiveMenuSetup.h"
 #include "MenuConfigurationRepository.h"
 #include "MainMenuItemsProvider.h"
 #include "i18n.h"
@@ -124,7 +125,15 @@ bool MenuOrgPlugin::Initialize(void)
 
 cOsdObject *MenuOrgPlugin::MainMenuAction(void)
 {
-    return new cMenuOrgSetup(*_menuConfigurationRepository, _pluginConfiguration.MenuSetupStyle());
+    if (_pluginConfiguration.MenuSetupStyle() == 0)
+    {
+        return new RecursiveMenuSetup(_menuConfigurationRepository);
+
+    }
+    else
+    {
+        return new cMenuOrgSetup(*_menuConfigurationRepository, _pluginConfiguration.MenuSetupStyle());
+    }
 }
 
 cMenuSetupPage *MenuOrgPlugin::SetupMenu(void)
diff --git a/src/MenuSetupItemsFactory.cpp b/src/MenuSetupItemsFactory.cpp
index 6d608f7..f8a17f5 100644
--- a/src/MenuSetupItemsFactory.cpp
+++ b/src/MenuSetupItemsFactory.cpp
@@ -47,7 +47,7 @@ void MenuSetupItemsFactory::SetupItems(SubMenuNode& rootMenu)
 void MenuSetupItemsFactory::ProcessSystemMenuNode(SystemMenuNode* node)
 {
     string text = "(S) " + node->State().Name();
-    _osdMenu->Add(new cOsdItem(text.c_str()));      
+    _osdMenu->Add(new cOsdItem(text.c_str()));
 }
 
 void MenuSetupItemsFactory::ProcessPluginMenuNode(PluginMenuNode* node)
diff --git a/src/PluginSetup.cpp b/src/PluginSetup.cpp
index a82a3c1..95cb5bc 100644
--- a/src/PluginSetup.cpp
+++ b/src/PluginSetup.cpp
@@ -38,10 +38,13 @@ void PluginSetup::Store(void)
 {
     SetupStore(PluginConfiguration::SetupName::CustomMenuActive,
       _pluginConfiguration._customMenuActive = _newCustomMenuActive);
+
     SetupStore(PluginConfiguration::SetupName::UnconfiguredPluginsIncluded,
       _pluginConfiguration._unconfiguredPluginsIncluded = _newUnconfiguredPluginsIncluded);
+
     SetupStore(PluginConfiguration::SetupName::HideMainMenuEntry,
       _pluginConfiguration._hideMainMenuEntry = _newHideMainMenuEntry);
+
     SetupStore(PluginConfiguration::SetupName::MenuSetupStyle,
       _pluginConfiguration._menuSetupStyle = _newMenuSetupStyle);
 }
@@ -59,11 +62,11 @@ eOSState PluginSetup::ProcessKey(eKeys Key)
         case osUser1:
             if (_pluginConfiguration.MenuSetupStyle() == 0 )
             {
-                return AddSubMenu(new cMenuOrgSetup(_menuConfiguration, _pluginConfiguration._menuSetupStyle));
+                return AddSubMenu(new RecursiveMenuSetup(&_menuConfiguration));
             }
             else
             {
-                return AddSubMenu(new RecursiveMenuSetup(&_menuConfiguration));
+                return AddSubMenu(new cMenuOrgSetup(_menuConfiguration, _pluginConfiguration._menuSetupStyle));
             }
 
         case osContinue: