From 5add845c880a421d3f8c4624476c6941c2b5e551 Mon Sep 17 00:00:00 2001 From: svntcreutz Date: Sat, 28 Jul 2007 00:03:36 +0000 Subject: rename *.cc to *.cpp and fix the sources.mk git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/submenu/trunk@5662 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f --- src/menunode.cc | 37 --------------------- src/menunode.cpp | 37 +++++++++++++++++++++ src/pluginmenuitem.cc | 14 -------- src/pluginmenuitem.cpp | 14 ++++++++ src/submenuitem.cc | 6 ---- src/submenuitem.cpp | 6 ++++ src/submenuprovider.cc | 86 ------------------------------------------------- src/submenuprovider.cpp | 86 +++++++++++++++++++++++++++++++++++++++++++++++++ src/vdrmenuitem.cc | 14 -------- src/vdrmenuitem.cpp | 14 ++++++++ 10 files changed, 157 insertions(+), 157 deletions(-) delete mode 100644 src/menunode.cc create mode 100644 src/menunode.cpp delete mode 100644 src/pluginmenuitem.cc create mode 100644 src/pluginmenuitem.cpp delete mode 100644 src/submenuitem.cc create mode 100644 src/submenuitem.cpp delete mode 100644 src/submenuprovider.cc create mode 100644 src/submenuprovider.cpp delete mode 100644 src/vdrmenuitem.cc create mode 100644 src/vdrmenuitem.cpp (limited to 'src') diff --git a/src/menunode.cc b/src/menunode.cc deleted file mode 100644 index ab862e6..0000000 --- a/src/menunode.cc +++ /dev/null @@ -1,37 +0,0 @@ -#include "menunode.h" - -MenuNode::~MenuNode() -{ - while (!_childs.empty()) - { - delete _childs.back(); - _childs.pop_back(); - } -} - -MenuNode* MenuNode::Parent() -{ - return _parent; -} - -MenuNodeList& MenuNode::Childs() -{ - return _childs; -} - -MenuNode* MenuNode::AddChild(MenuNode* child) -{ - _childs.push_back(child); - child->SetParent(this); - return child; -} - -void MenuNode::SetParent(MenuNode* parent) -{ - _parent = parent; -} - -SubMenuPatch::MainMenuItem* MenuNode::CreateMainMenuItem() -{ - return NULL; -} diff --git a/src/menunode.cpp b/src/menunode.cpp new file mode 100644 index 0000000..ab862e6 --- /dev/null +++ b/src/menunode.cpp @@ -0,0 +1,37 @@ +#include "menunode.h" + +MenuNode::~MenuNode() +{ + while (!_childs.empty()) + { + delete _childs.back(); + _childs.pop_back(); + } +} + +MenuNode* MenuNode::Parent() +{ + return _parent; +} + +MenuNodeList& MenuNode::Childs() +{ + return _childs; +} + +MenuNode* MenuNode::AddChild(MenuNode* child) +{ + _childs.push_back(child); + child->SetParent(this); + return child; +} + +void MenuNode::SetParent(MenuNode* parent) +{ + _parent = parent; +} + +SubMenuPatch::MainMenuItem* MenuNode::CreateMainMenuItem() +{ + return NULL; +} diff --git a/src/pluginmenuitem.cc b/src/pluginmenuitem.cc deleted file mode 100644 index d44d747..0000000 --- a/src/pluginmenuitem.cc +++ /dev/null @@ -1,14 +0,0 @@ -#include "pluginmenuitem.h" -#include - -PluginMenuItem::PluginMenuItem(const char* pluginMainMenuEntry, int pluginIndex) -{ - _pluginMainMenuEntry = pluginMainMenuEntry; - _pluginIndex = pluginIndex; -} - -SubMenuPatch::MainMenuItem* PluginMenuItem::CreateMainMenuItem() -{ - return SubMenuPatch::MainMenuItem::CreatePluginMenuItem( - _pluginMainMenuEntry, _pluginIndex); -} diff --git a/src/pluginmenuitem.cpp b/src/pluginmenuitem.cpp new file mode 100644 index 0000000..d44d747 --- /dev/null +++ b/src/pluginmenuitem.cpp @@ -0,0 +1,14 @@ +#include "pluginmenuitem.h" +#include + +PluginMenuItem::PluginMenuItem(const char* pluginMainMenuEntry, int pluginIndex) +{ + _pluginMainMenuEntry = pluginMainMenuEntry; + _pluginIndex = pluginIndex; +} + +SubMenuPatch::MainMenuItem* PluginMenuItem::CreateMainMenuItem() +{ + return SubMenuPatch::MainMenuItem::CreatePluginMenuItem( + _pluginMainMenuEntry, _pluginIndex); +} diff --git a/src/submenuitem.cc b/src/submenuitem.cc deleted file mode 100644 index eca013f..0000000 --- a/src/submenuitem.cc +++ /dev/null @@ -1,6 +0,0 @@ -#include "submenuitem.h" - -SubMenuItem::SubMenuItem(std::string itemText) - :VdrMenuItem(itemText, osUser1) -{ -} diff --git a/src/submenuitem.cpp b/src/submenuitem.cpp new file mode 100644 index 0000000..eca013f --- /dev/null +++ b/src/submenuitem.cpp @@ -0,0 +1,6 @@ +#include "submenuitem.h" + +SubMenuItem::SubMenuItem(std::string itemText) + :VdrMenuItem(itemText, osUser1) +{ +} diff --git a/src/submenuprovider.cc b/src/submenuprovider.cc deleted file mode 100644 index 872927c..0000000 --- a/src/submenuprovider.cc +++ /dev/null @@ -1,86 +0,0 @@ -#include "submenuprovider.h" -#include "submenuitem.h" -#include "vdrmenuitem.h" -#include "pluginmenuitem.h" -#include - -SubMenuProvider::SubMenuProvider() -{ - //CreateTestMenus(); - _oXmlMenu.loadXmlMenu(); - _currentMenu = &_oXmlMenu._rootMenuNode; -} -/* -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)); -} -*/ -MainMenuItemsList* SubMenuProvider::MainMenuItems() -{ - ResetMainMenuItemsList(); - - for (MenuNodeList::iterator i = _currentMenu->Childs().begin(); - i != _currentMenu->Childs().end(); i++) - { - _currentMainMenuItems.push_back((*i)->CreateMainMenuItem()); - } - - return &_currentMainMenuItems; -} - -void SubMenuProvider::ResetMainMenuItemsList() -{ - - for( MainMenuItemsList::iterator i = _currentMainMenuItems.begin(); - i != _currentMainMenuItems.end(); i++) - { - delete *i; - } - _currentMainMenuItems.clear(); -} - -void SubMenuProvider::EnterSubMenu(cOsdItem* item) -{ - for(unsigned int itemIndex=0; itemIndex < _currentMainMenuItems.size(); itemIndex++) - { - MainMenuItem* menuItem = _currentMainMenuItems.at(itemIndex); - if (menuItem->IsCustomMenuItem() && (menuItem->CustomMenuItem() == item)) - { - _currentMenu = _currentMenu->Childs().at(itemIndex); - break; - } - } -} - -bool SubMenuProvider::LeaveSubMenu() -{ - if (_currentMenu->Parent()) - { - _currentMenu = _currentMenu->Parent(); - return true; - } - else - { - return false; - } -} diff --git a/src/submenuprovider.cpp b/src/submenuprovider.cpp new file mode 100644 index 0000000..872927c --- /dev/null +++ b/src/submenuprovider.cpp @@ -0,0 +1,86 @@ +#include "submenuprovider.h" +#include "submenuitem.h" +#include "vdrmenuitem.h" +#include "pluginmenuitem.h" +#include + +SubMenuProvider::SubMenuProvider() +{ + //CreateTestMenus(); + _oXmlMenu.loadXmlMenu(); + _currentMenu = &_oXmlMenu._rootMenuNode; +} +/* +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)); +} +*/ +MainMenuItemsList* SubMenuProvider::MainMenuItems() +{ + ResetMainMenuItemsList(); + + for (MenuNodeList::iterator i = _currentMenu->Childs().begin(); + i != _currentMenu->Childs().end(); i++) + { + _currentMainMenuItems.push_back((*i)->CreateMainMenuItem()); + } + + return &_currentMainMenuItems; +} + +void SubMenuProvider::ResetMainMenuItemsList() +{ + + for( MainMenuItemsList::iterator i = _currentMainMenuItems.begin(); + i != _currentMainMenuItems.end(); i++) + { + delete *i; + } + _currentMainMenuItems.clear(); +} + +void SubMenuProvider::EnterSubMenu(cOsdItem* item) +{ + for(unsigned int itemIndex=0; itemIndex < _currentMainMenuItems.size(); itemIndex++) + { + MainMenuItem* menuItem = _currentMainMenuItems.at(itemIndex); + if (menuItem->IsCustomMenuItem() && (menuItem->CustomMenuItem() == item)) + { + _currentMenu = _currentMenu->Childs().at(itemIndex); + break; + } + } +} + +bool SubMenuProvider::LeaveSubMenu() +{ + if (_currentMenu->Parent()) + { + _currentMenu = _currentMenu->Parent(); + return true; + } + else + { + return false; + } +} diff --git a/src/vdrmenuitem.cc b/src/vdrmenuitem.cc deleted file mode 100644 index 1ca704d..0000000 --- a/src/vdrmenuitem.cc +++ /dev/null @@ -1,14 +0,0 @@ -#include "vdrmenuitem.h" -#include - -VdrMenuItem::VdrMenuItem(std::string itemText, eOSState itemState) -{ - _itemText = itemText; - _itemState = itemState; -} - -SubMenuPatch::MainMenuItem* VdrMenuItem::CreateMainMenuItem() -{ - return SubMenuPatch::MainMenuItem::CreateCustomMenuItem( - new cOsdItem(_itemText.c_str(), _itemState)); -} diff --git a/src/vdrmenuitem.cpp b/src/vdrmenuitem.cpp new file mode 100644 index 0000000..1ca704d --- /dev/null +++ b/src/vdrmenuitem.cpp @@ -0,0 +1,14 @@ +#include "vdrmenuitem.h" +#include + +VdrMenuItem::VdrMenuItem(std::string itemText, eOSState itemState) +{ + _itemText = itemText; + _itemState = itemState; +} + +SubMenuPatch::MainMenuItem* VdrMenuItem::CreateMainMenuItem() +{ + return SubMenuPatch::MainMenuItem::CreateCustomMenuItem( + new cOsdItem(_itemText.c_str(), _itemState)); +} -- cgit v1.2.3