diff options
| author | svntobi <svntobi@cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f> | 2008-03-25 20:20:37 +0000 |
|---|---|---|
| committer | svntobi <svntobi@cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f> | 2008-03-25 20:20:37 +0000 |
| commit | 6a41eac668d05af1d64dddf0fa8fc749f0e5877a (patch) | |
| tree | 2ec078dfdef8ee4e2d902a6b89628e46c0f97316 /vdr-patch | |
| parent | 471da44f9bd1e47d9851791e2231ec7bd84606bc (diff) | |
| download | vdr-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 'vdr-patch')
| -rw-r--r-- | vdr-patch/vdr-menuorg-0.4.2.diff (renamed from vdr-patch/vdr-menuorg-0.4.diff) | 13 |
1 files changed, 7 insertions, 6 deletions
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 |