mirror of
				https://projects.vdr-developer.org/git/vdr-plugin-tvguide.git
				synced 2023-10-05 13:01:48 +00:00 
			
		
		
		
	Refactor cRecMenuTimerConflict
This commit is contained in:
		
							
								
								
									
										14
									
								
								recmenus.c
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								recmenus.c
									
									
									
									
									
								
							@@ -234,16 +234,18 @@ int cRecMenuTimerConflicts::GetTimerConflict(void) {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// --- cRecMenuTimerConflict  ---------------------------------------------------------
 | 
			
		||||
cRecMenuTimerConflict::cRecMenuTimerConflict(cTVGuideTimerConflict *conflict, eRecMenuState nextAction) {
 | 
			
		||||
    SetWidthPercent(95);
 | 
			
		||||
cRecMenuTimerConflict::cRecMenuTimerConflict(cTVGuideTimerConflict *conflict, eRecMenuState nextAction) { //OK
 | 
			
		||||
    SetWidthPercent(90);
 | 
			
		||||
 | 
			
		||||
    this->conflict = conflict;
 | 
			
		||||
    totalNumMenuItems = (int)conflict->timerIDs.size();
 | 
			
		||||
 | 
			
		||||
    SetHeader(new cRecMenuItemTimerConflictHeader(conflict->timeStart,
 | 
			
		||||
    AddHeader(new cRecMenuItemTimerConflictHeader(conflict->timeStart,
 | 
			
		||||
                                                  conflict->timeStop,
 | 
			
		||||
                                                  conflict->overlapStart,
 | 
			
		||||
                                                  conflict->overlapStop));
 | 
			
		||||
    SetFooter(new cRecMenuItemButton(tr("Ignore Conflict"), nextAction, false, true));
 | 
			
		||||
    AddFooter(new cRecMenuItemButton(tr("Ignore Conflict"), nextAction, false, true));
 | 
			
		||||
 | 
			
		||||
    int i = 0;
 | 
			
		||||
    for(std::vector<int>::iterator it = conflict->timerIDs.begin(); it != conflict->timerIDs.end(); it++) {
 | 
			
		||||
#if VDRVERSNUM >= 20301
 | 
			
		||||
@@ -262,12 +264,12 @@ cRecMenuTimerConflict::cRecMenuTimerConflict(cTVGuideTimerConflict *conflict, eR
 | 
			
		||||
                                                          conflict->timeStop,
 | 
			
		||||
                                                          conflict->overlapStart,
 | 
			
		||||
                                                          conflict->overlapStop,
 | 
			
		||||
                                                      (!i)?true:false)
 | 
			
		||||
            ))
 | 
			
		||||
                                                          (!i) ? true : false)))
 | 
			
		||||
                break;
 | 
			
		||||
            i++;
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    CalculateHeight();
 | 
			
		||||
    CreatePixmap();
 | 
			
		||||
    Arrange();
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user