summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwr61 <wr61@e10066b5-e1e2-0310-b819-94efdf66514b>2005-01-12 10:50:38 +0000
committerwr61 <wr61@e10066b5-e1e2-0310-b819-94efdf66514b>2005-01-12 10:50:38 +0000
commit4ff783d18802d1334d1b06141132d9fe138a2927 (patch)
treeeb92be26419446b0bdf1a8ed6a9237be303ac17c
parent97ef2c39156f0df490aa5b948464c5b3c48ae622 (diff)
downloadvdr-plugin-muggle-4ff783d18802d1334d1b06141132d9fe138a2927.tar.gz
vdr-plugin-muggle-4ff783d18802d1334d1b06141132d9fe138a2927.tar.bz2
fixed partial checkin of kOK for start of CreateCollection
git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@349 e10066b5-e1e2-0310-b819-94efdf66514b
-rw-r--r--mg_actions.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/mg_actions.c b/mg_actions.c
index b2e21f8..502b1f6 100644
--- a/mg_actions.c
+++ b/mg_actions.c
@@ -689,13 +689,18 @@ mgRemoveThisFromCollection::MenuName (const unsigned int idx,const string value)
return b;
}
+bool
+mgCreateCollection::Editing()
+{
+ return (strchr(cOsdItem::Text(),'[') && strchr(cOsdItem::Text(),']'));
+}
+
void
mgCreateCollection::Notify()
{
- if (!strchr(Text(),'['))
- if (!strchr(Text(),']'))
- osd()->SetHelpKeys(NULL,NULL,NULL,NULL);
+ if (!Editing())
+ osd()->SetHelpKeys(NULL,NULL,NULL,NULL);
}
const char*
@@ -717,7 +722,10 @@ mgCreateCollection::ProcessKey(eKeys key)
Execute();
else
return cMenuEditStrItem::ProcessKey(kRight);
- return cMenuEditStrItem::ProcessKey(key);
+ if (key != kYellow || Editing())
+ return cMenuEditStrItem::ProcessKey(key);
+ else
+ return osUnknown;
}
bool