refs #335, preparation for new cockpit

* allow nested info areas
* added cockpit info area
* fixed several finder methods to excluded nested info areas from child elements
* using QScopedPointer for ui
* placeholder GUI components for new cockpit
This commit is contained in:
Klaus Basan
2014-10-07 02:25:08 +02:00
committed by Roland Winklmeier
parent b0f01a3ec6
commit 9452ff10c9
14 changed files with 1149 additions and 104 deletions

View File

@@ -33,9 +33,7 @@ namespace BlackGui
}
CMainInfoAreaComponent::~CMainInfoAreaComponent()
{
delete ui;
}
{ }
CAtcStationComponent *CMainInfoAreaComponent::getAtcStationComponent()
{
@@ -82,6 +80,7 @@ namespace BlackGui
InfoArea area = static_cast<InfoArea>(areaIndex);
switch (area)
{
case InfoAreaCockpit:
case InfoAreaAircrafts:
case InfoAreaAtc:
case InfoAreaUsers:
@@ -112,6 +111,8 @@ namespace BlackGui
InfoArea area = static_cast<InfoArea>(areaIndex);
switch (area)
{
case InfoAreaCockpit:
return CIcons::appCockpit16();
case InfoAreaUsers:
return CIcons::appUsers16();
case InfoAreaWeather:
@@ -136,5 +137,5 @@ namespace BlackGui
return CIcons::empty();
}
}
}
}
} // namespace
} // namespace