summaryrefslogtreecommitdiff
path: root/src/submenuprovider.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/submenuprovider.cpp')
-rw-r--r--src/submenuprovider.cpp40
1 files changed, 14 insertions, 26 deletions
diff --git a/src/submenuprovider.cpp b/src/submenuprovider.cpp
index 4ea1401..9844abc 100644
--- a/src/submenuprovider.cpp
+++ b/src/submenuprovider.cpp
@@ -8,33 +8,16 @@ SubMenuProvider::SubMenuProvider()
{
//CreateTestMenus();
_oXmlMenu.LoadXmlMenu();
- _currentMenu = _oXmlMenu.GetMenuTree();
-}
-/*
-void SubMenuProvider::CreateTestMenus()
-{
- MenuNode* subMenu1 =_rootMenuNode.AddChild(new SubMenuItem("Custom menu 1"));
- subMenu1->AddChild(new VdrMenuItem(tr("Schedule"), osSchedule));
- subMenu1->AddChild(new VdrMenuItem(tr("Channels"), osChannels));
- MenuNode* subMenu1_1 = subMenu1->AddChild(new SubMenuItem("Custom menu 1.1"));
- subMenu1_1->AddChild(new VdrMenuItem(tr("Timers"), osTimers));
- subMenu1_1->AddChild(new VdrMenuItem(tr("Recordings"), osRecordings));
- MenuNode* subMenu2 =_rootMenuNode.AddChild(new SubMenuItem("Custom menu 2"));
- //plugins
- int i=0;
- while (cPlugin *p = cPluginManager::GetPlugin(i))
- {
- if (const char *item = p->MainMenuEntry())
- {
- subMenu2->AddChild(new PluginMenuItem(item, i));
- }
- i++;
- }
- _rootMenuNode.AddChild(new VdrMenuItem(tr("Setup"), osSetup));
- if (Commands.Count())
- _rootMenuNode.AddChild(new VdrMenuItem(tr("Commands"), osCommands));
+ if(_oXmlMenu.getErrorStatus() == false)
+ {
+ _currentMenu = _oXmlMenu.GetMenuTree();
+ _someError=false;
+ }
+ else
+ {
+ _someError=true;
+ }
}
-*/
MainMenuItemsList* SubMenuProvider::MainMenuItems()
{
ResetMainMenuItemsList();
@@ -89,3 +72,8 @@ bool SubMenuProvider::LeaveSubMenu()
return false;
}
}
+
+bool SubMenuProvider::getSomeError()
+{
+ return _someError;
+}