summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsvntobi <svntobi@cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f>2008-03-25 20:20:37 +0000
committersvntobi <svntobi@cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f>2008-03-25 20:20:37 +0000
commit6a41eac668d05af1d64dddf0fa8fc749f0e5877a (patch)
tree2ec078dfdef8ee4e2d902a6b89628e46c0f97316 /src
parent471da44f9bd1e47d9851791e2231ec7bd84606bc (diff)
downloadvdr-plugin-menuorg-6a41eac668d05af1d64dddf0fa8fc749f0e5877a.tar.gz
vdr-plugin-menuorg-6a41eac668d05af1d64dddf0fa8fc749f0e5877a.tar.bz2
Separator items now don't have a hotkey (number) in the OSD menu anymore
(requires the patch to be updated once more) git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/menuorg/trunk@7088 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f
Diffstat (limited to 'src')
-rw-r--r--src/MenuItemDefinition.cpp5
-rw-r--r--src/MenuItemDefinition.h1
-rw-r--r--src/MenuItemDefinitionFactory.cpp3
-rw-r--r--src/SeparatorItemDefinition.cpp34
-rw-r--r--src/SeparatorItemDefinition.h36
-rw-r--r--src/Version.h2
6 files changed, 79 insertions, 2 deletions
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