flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-17 02:45:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #335, preparation for new cockpit

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

95
src/blackgui/components/maininfoareacomponent.ui
View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1207</width>
<height>97</height>
<width>1266</width>
<height>55</height>
</rect>
</property>
<property name="minimumSize">
@@ -39,11 +39,44 @@
<set>QMainWindow::AllowTabbedDocks|QMainWindow::AnimatedDocks|QMainWindow::ForceTabbedDocks</set>
</property>
<widget class="QWidget" name="qw_centralWidgetEmpty"/>
<widget class="BlackGui::CDockWidgetInfoArea" name="dw_Cockpit">
<property name="allowedAreas">
<set>Qt::TopDockWidgetArea</set>
</property>
<property name="windowTitle">
<string>Cockpit</string>
</property>
<attribute name="dockWidgetArea">
<number>4</number>
</attribute>
<widget class="QWidget" name="dw_CockpitInner">
<layout class="QVBoxLayout" name="vl_Cockpit">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="BlackGui::Components::CCockpitInfoAreaComponent" name="comp_CockpitInfoArea" native="true"/>
</item>
</layout>
</widget>
</widget>
<widget class="BlackGui::CDockWidgetInfoArea" name="dw_Aircrafts">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
<width>127</width>
<height>38</height>
</size>
</property>
<property name="features">
@@ -103,8 +136,8 @@
<widget class="BlackGui::CDockWidgetInfoArea" name="dw_AtcStations">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
<width>127</width>
<height>38</height>
</size>
</property>
<property name="floating">
@@ -164,8 +197,8 @@
<widget class="BlackGui::CDockWidgetInfoArea" name="dw_Users">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
<width>127</width>
<height>38</height>
</size>
</property>
<property name="allowedAreas">
@@ -210,8 +243,8 @@
<widget class="BlackGui::CDockWidgetInfoArea" name="dw_TextMessages">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
<width>127</width>
<height>38</height>
</size>
</property>
<property name="allowedAreas">
@@ -256,8 +289,8 @@
<widget class="BlackGui::CDockWidgetInfoArea" name="dw_Simulator">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
<width>127</width>
<height>38</height>
</size>
</property>
<property name="allowedAreas">
@@ -302,8 +335,8 @@
<widget class="BlackGui::CDockWidgetInfoArea" name="dw_FlightPlan">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
<width>127</width>
<height>38</height>
</size>
</property>
<property name="allowedAreas">
@@ -348,8 +381,8 @@
<widget class="BlackGui::CDockWidgetInfoArea" name="dw_Weather">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
<width>80</width>
<height>38</height>
</size>
</property>
<property name="allowedAreas">
@@ -397,8 +430,8 @@
<widget class="BlackGui::CDockWidgetInfoArea" name="dw_Mappings">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
<width>127</width>
<height>38</height>
</size>
</property>
<property name="allowedAreas">
@@ -443,8 +476,8 @@
<widget class="BlackGui::CDockWidgetInfoArea" name="dw_Log">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
<width>80</width>
<height>38</height>
</size>
</property>
<property name="allowedAreas">
@@ -489,8 +522,8 @@
<widget class="BlackGui::CDockWidgetInfoArea" name="dw_Settings">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
<width>127</width>
<height>38</height>
</size>
</property>
<property name="allowedAreas">
@@ -534,6 +567,18 @@
</widget>
</widget>
<customwidgets>
<customwidget>
<class>BlackGui::CDockWidgetInfoArea</class>
<extends>QDockWidget</extends>
<header>blackgui/dockwidgetinfoarea.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::Components::CCockpitInfoAreaComponent</class>
<extends>QWidget</extends>
<header>blackgui/components/cockpitinfoareacomponent.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::Components::CAtcStationComponent</class>
<extends>QTabWidget</extends>
@@ -570,12 +615,6 @@
<header>blackgui/components/settingscomponent.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::CDockWidgetInfoArea</class>
<extends>QDockWidget</extends>
<header>blackgui/dockwidgetinfoarea.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::Components::CLogComponent</class>
<extends>QFrame</extends>