mirror of
				https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git
				synced 2023-10-19 15:58:31 +00:00 
			
		
		
		
	if a subview is completely not set in a skin, the default menu is used
This commit is contained in:
		
							
								
								
									
										2
									
								
								HISTORY
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								HISTORY
									
									
									
									
									
								
							@@ -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 
 | 
			
		||||
 
 | 
			
		||||
@@ -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];
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -44,8 +44,8 @@ bool cDisplayMenuRootView::createOsd(void) {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/* Categories:
 | 
			
		||||
mcUndefined = -1,
 | 
			
		||||
mcUnknown = 0,
 | 
			
		||||
-1 mcUndefined,
 | 
			
		||||
0  mcUnknown,
 | 
			
		||||
1  mcMain,
 | 
			
		||||
2  mcSchedule,
 | 
			
		||||
3  mcScheduleNow,
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user