mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-16 18:35:35 +08:00
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:
committed by
Roland Winklmeier
parent
b0f01a3ec6
commit
9452ff10c9
@@ -23,9 +23,9 @@
|
||||
#include "logcomponent.h"
|
||||
#include <QTabBar>
|
||||
#include <QPixmap>
|
||||
#include <QScopedPointer>
|
||||
|
||||
namespace Ui { class CMainInfoAreaComponent; }
|
||||
|
||||
namespace BlackGui
|
||||
{
|
||||
namespace Components
|
||||
@@ -47,16 +47,17 @@ namespace BlackGui
|
||||
enum InfoArea
|
||||
{
|
||||
// index must match tab index!
|
||||
InfoAreaAircrafts = 0,
|
||||
InfoAreaAtc = 1,
|
||||
InfoAreaUsers = 2,
|
||||
InfoAreaTextMessages = 3,
|
||||
InfoAreaSimulator = 4,
|
||||
InfoAreaFlightPlan = 5,
|
||||
InfoAreaWeather = 6,
|
||||
InfoAreaMappings = 7,
|
||||
InfoAreaLog = 8,
|
||||
InfoAreaSettings = 9,
|
||||
InfoAreaCockpit = 0,
|
||||
InfoAreaAircrafts = 1,
|
||||
InfoAreaAtc = 2,
|
||||
InfoAreaUsers = 3,
|
||||
InfoAreaTextMessages = 4,
|
||||
InfoAreaSimulator = 5,
|
||||
InfoAreaFlightPlan = 6,
|
||||
InfoAreaWeather = 7,
|
||||
InfoAreaMappings = 8,
|
||||
InfoAreaLog = 9,
|
||||
InfoAreaSettings = 10,
|
||||
InfoAreaNone = -1
|
||||
};
|
||||
|
||||
@@ -105,8 +106,7 @@ namespace BlackGui
|
||||
virtual const QPixmap &indexToPixmap(int areaIndex) const override;
|
||||
|
||||
private:
|
||||
Ui::CMainInfoAreaComponent *ui = nullptr;
|
||||
|
||||
QScopedPointer<Ui::CMainInfoAreaComponent> ui;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user