diff options
| -rw-r--r-- | HISTORY | 5 | ||||
| -rw-r--r-- | po/menuorg.pot | 2 | ||||
| -rw-r--r-- | sources.mk | 1 | ||||
| -rw-r--r-- | src/MenuItemDefinition.cpp | 5 | ||||
| -rw-r--r-- | src/MenuItemDefinition.h | 1 | ||||
| -rw-r--r-- | src/MenuItemDefinitionFactory.cpp | 3 | ||||
| -rw-r--r-- | src/SeparatorItemDefinition.cpp | 34 | ||||
| -rw-r--r-- | src/SeparatorItemDefinition.h | 36 | ||||
| -rw-r--r-- | src/Version.h | 2 | ||||
| -rw-r--r-- | vdr-patch/vdr-menuorg-0.4.2.diff (renamed from vdr-patch/vdr-menuorg-0.4.diff) | 13 |
10 files changed, 93 insertions, 9 deletions
@@ -41,3 +41,8 @@ VDR Plugin 'menuorg' Revision History 2008-03-24: Version 0.4.1 - Fixed small bug caused by hidden menu entries + +2008-03-25: Version 0.4.2 + +- Separator items now don't have a hotkey (number) in the OSD menu anymore + (requires the patch to be updated once more) diff --git a/po/menuorg.pot b/po/menuorg.pot index 1818593..ae12cf2 100644 --- a/po/menuorg.pot +++ b/po/menuorg.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: <vdr@e-tobi.net>\n" -"POT-Creation-Date: 2008-03-24 23:33+0100\n" +"POT-Creation-Date: 2008-03-25 19:30+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -12,6 +12,7 @@ SRCS = \ src/PluginItemDefinition.cpp \ src/PluginMenuNode.cpp \ src/PluginSetup.cpp \ + src/SeparatorItemDefinition.cpp \ src/SubMenuNode.cpp \ src/SystemMenuNode.cpp \ src/OsdLineItem.cpp \ diff --git a/src/MenuItemDefinition.cpp b/src/MenuItemDefinition.cpp index 7e6c527..0f14071 100644 --- a/src/MenuItemDefinition.cpp +++ b/src/MenuItemDefinition.cpp @@ -33,3 +33,8 @@ MenuNode* MenuItemDefinition::AssignedMenuNode() { return _menuNode; } + +bool MenuItemDefinition::IsSeparatorItem() +{ + return false; +} diff --git a/src/MenuItemDefinition.h b/src/MenuItemDefinition.h index 5c19f08..5fc0c12 100644 --- a/src/MenuItemDefinition.h +++ b/src/MenuItemDefinition.h @@ -37,6 +37,7 @@ class MenuItemDefinition: public IMenuItemDefinition public: MenuItemDefinition(MenuNode* menuNode); MenuNode* AssignedMenuNode(); + virtual bool IsSeparatorItem(); }; diff --git a/src/MenuItemDefinitionFactory.cpp b/src/MenuItemDefinitionFactory.cpp index 85a61bf..e2819de 100644 --- a/src/MenuItemDefinitionFactory.cpp +++ b/src/MenuItemDefinitionFactory.cpp @@ -29,6 +29,7 @@ #include "SeparatorMenuNode.h" #include "OsdItemDefinition.h" #include "PluginItemDefinition.h" +#include "SeparatorItemDefinition.h" #include "OsdLineItem.h" #include <string> @@ -68,5 +69,5 @@ void MenuItemDefinitionFactory::ProcessCommandMenuNode(CommandMenuNode* node) void MenuItemDefinitionFactory::ProcessSeparatorMenuNode(SeparatorMenuNode* node) { - _createdMenuItemDefinition = new OsdItemDefinition(node, new cOsdSeparatorItem(node->DisplayText().c_str()), false); + _createdMenuItemDefinition = new SeparatorItemDefinition(node, new cOsdSeparatorItem(node->DisplayText().c_str())); } diff --git a/src/SeparatorItemDefinition.cpp b/src/SeparatorItemDefinition.cpp new file mode 100644 index 0000000..bdc1de2 --- /dev/null +++ b/src/SeparatorItemDefinition.cpp @@ -0,0 +1,34 @@ +/* + * vdr-menuorg - A plugin for the Linux Video Disk Recorder + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * $Id: OsdItemDefinition.cpp 7083 2008-03-24 22:32:17Z svntobi $ + * + */ + +#include "SeparatorItemDefinition.h" + +SeparatorItemDefinition::SeparatorItemDefinition(MenuNode* menuNode, cOsdItem* osdItem) + :OsdItemDefinition(menuNode, osdItem, false) +{ +} + +bool SeparatorItemDefinition::IsSeparatorItem() +{ + return true; +} diff --git a/src/SeparatorItemDefinition.h b/src/SeparatorItemDefinition.h new file mode 100644 index 0000000..e93c27d --- /dev/null +++ b/src/SeparatorItemDefinition.h @@ -0,0 +1,36 @@ +/* + * vdr-menuorg - A plugin for the Linux Video Disk Recorder + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * $Id$ + * + */ + +#ifndef ___SEPARATORITEMDEFINITION_H +#define ___SEPARATORITEMDEFINITION_H + +#include "OsdItemDefinition.h" + +class SeparatorItemDefinition: public OsdItemDefinition +{ + public: + SeparatorItemDefinition(MenuNode* menuNode, cOsdItem* osdItem); + virtual bool IsSeparatorItem(); +}; + +#endif diff --git a/src/Version.h b/src/Version.h index bc93cf6..3aa543d 100644 --- a/src/Version.h +++ b/src/Version.h @@ -24,6 +24,6 @@ #ifndef ___VERSION_H #define ___VERSION_H -static const char VERSION[] = "0.4.1"; +static const char VERSION[] = "0.4.2"; #endif diff --git a/vdr-patch/vdr-menuorg-0.4.diff b/vdr-patch/vdr-menuorg-0.4.2.diff index 26862fa..f4e32c6 100644 --- a/vdr-patch/vdr-menuorg-0.4.diff +++ b/vdr-patch/vdr-menuorg-0.4.2.diff @@ -1,7 +1,7 @@ diff -Nur vdr-1.5.18.orig/mainmenuitemsprovider.h vdr-1.5.18/mainmenuitemsprovider.h --- vdr-1.5.18.orig/mainmenuitemsprovider.h 1970-01-01 01:00:00.000000000 +0100 -+++ vdr-1.5.18/mainmenuitemsprovider.h 2008-03-23 01:54:07.000000000 +0100 -@@ -0,0 +1,59 @@ ++++ vdr-1.5.18/mainmenuitemsprovider.h 2008-03-25 21:17:28.000000000 +0100 +@@ -0,0 +1,60 @@ +/* + * vdr-menuorg - A plugin for the Linux Video Disk Recorder + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> @@ -38,6 +38,7 @@ diff -Nur vdr-1.5.18.orig/mainmenuitemsprovider.h vdr-1.5.18/mainmenuitemsprovid + virtual ~IMenuItemDefinition() {}; + virtual bool IsCustomOsdItem() = 0; + virtual bool IsPluginItem() = 0; ++ virtual bool IsSeparatorItem() = 0; + virtual cOsdItem* CustomOsdItem() = 0; + virtual const char* PluginMenuEntry() = 0; + virtual bool IsSelected() = 0; @@ -63,7 +64,7 @@ diff -Nur vdr-1.5.18.orig/mainmenuitemsprovider.h vdr-1.5.18/mainmenuitemsprovid +#endif //__MAINMENUITEMSPROVIDER_H diff -Nur vdr-1.5.18.orig/menu.c vdr-1.5.18/menu.c --- vdr-1.5.18.orig/menu.c 2008-03-16 12:15:28.000000000 +0100 -+++ vdr-1.5.18/menu.c 2008-03-23 02:00:16.000000000 +0100 ++++ vdr-1.5.18/menu.c 2008-03-25 21:17:28.000000000 +0100 @@ -29,6 +29,7 @@ #include "timers.h" #include "transfer.h" @@ -92,8 +93,8 @@ diff -Nur vdr-1.5.18.orig/menu.c vdr-1.5.18/menu.c + cOsdItem* osdItem = NULL; + if ((*i)->IsCustomOsdItem()) { + osdItem = (*i)->CustomOsdItem(); -+ if (osdItem) -+ osdItem->SetText(hk(osdItem->Text())); ++ if (osdItem && !(*i)->IsSeparatorItem()) ++ osdItem->SetText(hk(osdItem->Text())); + } + else if ((*i)->IsPluginItem()) { + const char *item = (*i)->PluginMenuEntry(); @@ -165,7 +166,7 @@ diff -Nur vdr-1.5.18.orig/menu.c vdr-1.5.18/menu.c case kRed: if (!HadSubMenu) diff -Nur vdr-1.5.18.orig/menuorgpatch.h vdr-1.5.18/menuorgpatch.h --- vdr-1.5.18.orig/menuorgpatch.h 1970-01-01 01:00:00.000000000 +0100 -+++ vdr-1.5.18/menuorgpatch.h 2008-03-23 01:53:29.000000000 +0100 ++++ vdr-1.5.18/menuorgpatch.h 2008-03-25 21:17:28.000000000 +0100 @@ -0,0 +1,100 @@ +/* + * vdr-menuorg - A plugin for the Linux Video Disk Recorder |