diff options
| author | louis <louis.braun@gmx.de> | 2014-10-25 12:47:00 +0200 |
|---|---|---|
| committer | louis <louis.braun@gmx.de> | 2014-10-25 12:47:00 +0200 |
| commit | 1d5a75af58aa2f3ce87a6ae32c357c948b872f0d (patch) | |
| tree | 737fcf62020b19d7cdf9e8dcfc84f286feb1f8fd | |
| parent | fa90ab746d35e0f6c028b2dd21e3d21083e43f9e (diff) | |
| download | vdr-plugin-skindesigner-1d5a75af58aa2f3ce87a6ae32c357c948b872f0d.tar.gz vdr-plugin-skindesigner-1d5a75af58aa2f3ce87a6ae32c357c948b872f0d.tar.bz2 | |
if a subview is completely not set in a skin, the default menu is used
| -rw-r--r-- | HISTORY | 2 | ||||
| -rw-r--r-- | displaymenu.c | 4 | ||||
| -rw-r--r-- | dtd/displaymenu.dtd | 4 | ||||
| -rw-r--r-- | views/displaymenurootview.c | 4 |
4 files changed, 7 insertions, 7 deletions
@@ -30,4 +30,4 @@ Version 0.0.2 - added extented recording information - added token {nummenuitem} as number of item for every list, value starts with 1 - fixed bug that x and y of subviews was not respected - +- if a subview is completely not set in a skin, the default menu is used diff --git a/displaymenu.c b/displaymenu.c index c029174..9f0e97e 100644 --- a/displaymenu.c +++ b/displaymenu.c @@ -155,9 +155,9 @@ void cSDDisplayMenu::SetItem(const char *Text, int Index, bool Current, bool Sel if (config.blockFlush) rootView->LockFlush(); eMenuCategory cat = MenuCategory(); - if (cat == mcMain) { + if (cat == mcMain && rootView->SubViewAvailable()) { list->AddMainMenuItem(Index, Text, Current, Selectable); - } else if (cat == mcSetup) { + } else if (cat == mcSetup && rootView->SubViewAvailable()) { list->AddSetupMenuItem(Index, Text, Current, Selectable); } else { string *tabTexts = new string[MaxTabs]; diff --git a/dtd/displaymenu.dtd b/dtd/displaymenu.dtd index b70a944..4b93809 100644 --- a/dtd/displaymenu.dtd +++ b/dtd/displaymenu.dtd @@ -3,8 +3,8 @@ <!ENTITY % functions SYSTEM "functions.dtd">
<!ELEMENT displaymenu (background,header,datetime,message,colorbuttons,
- menudefault,menumain,menusetup,menuschedules,
- menutimers,menuchannels,menurecordings,
+ menudefault,menumain*,menusetup*,menuschedules*,
+ menutimers*,menuchannels*,menurecordings*,
menudetailedepg,menudetailedrecording,
menudetailedtext)>
<!ATTLIST displaymenu
diff --git a/views/displaymenurootview.c b/views/displaymenurootview.c index 93848c2..8bedf18 100644 --- a/views/displaymenurootview.c +++ b/views/displaymenurootview.c @@ -44,8 +44,8 @@ bool cDisplayMenuRootView::createOsd(void) { } /* Categories: -mcUndefined = -1, -mcUnknown = 0, +-1 mcUndefined, +0 mcUnknown, 1 mcMain, 2 mcSchedule, 3 mcScheduleNow, |