refs #335, changed info areas

* remove unused methods
* changed ui, preferred size and such
* changed ctor for CEnableForDockWidgetInfoArea and made setParentDockWidgetInfoArea virtual
* adjusted derived classes ctor
* added enum and area methods for cockpitinfoarea
This commit is contained in:
Klaus Basan
2014-10-16 03:06:08 +02:00
committed by Roland Winklmeier
parent 594df164a2
commit e6a5e2960f
13 changed files with 117 additions and 112 deletions

View File

@@ -27,16 +27,16 @@
<string notr="true"/>
</property>
<property name="animated">
<bool>true</bool>
<bool>false</bool>
</property>
<property name="documentMode">
<bool>true</bool>
<bool>false</bool>
</property>
<property name="dockNestingEnabled">
<bool>false</bool>
</property>
<property name="dockOptions">
<set>QMainWindow::AllowTabbedDocks|QMainWindow::AnimatedDocks|QMainWindow::ForceTabbedDocks</set>
<set>QMainWindow::AllowTabbedDocks|QMainWindow::ForceTabbedDocks</set>
</property>
<widget class="QWidget" name="qw_centralWidgetEmpty"/>
<widget class="BlackGui::CDockWidgetInfoArea" name="dw_Cockpit">
@@ -67,7 +67,7 @@
<number>0</number>
</property>
<item>
<widget class="BlackGui::Components::CCockpitInfoAreaComponent" name="comp_CockpitInfoArea" native="true"/>
<widget class="BlackGui::Components::CCockpitComponent" name="comp_CockpitInfoArea" native="true"/>
</item>
</layout>
</widget>
@@ -573,12 +573,6 @@
<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>
@@ -627,6 +621,12 @@
<header>blackgui/components/simulatorcomponent.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::Components::CCockpitComponent</class>
<extends>QWidget</extends>
<header>blackgui/components/cockpitcomponent.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources>
<include location="../../blackmisc/blackmisc.qrc"/>