refs #400, GUI after Qt 5.4.1 migration

* ini file to complement style sheets (values changed in code)
* aircrafts -> aircraft
* some .h code to .cpp
This commit is contained in:
Klaus Basan
2015-04-01 14:47:42 +02:00
parent 313c5f5638
commit 96434928fe
17 changed files with 245 additions and 138 deletions

View File

@@ -94,16 +94,16 @@
</widget>
</widget>
<customwidgets>
<customwidget>
<class>BlackGui::Views::CAirportView</class>
<extends>QTableView</extends>
<header>blackgui/views/airportview.h</header>
</customwidget>
<customwidget>
<class>BlackGui::Views::CSimulatedAircraftView</class>
<extends>QTableView</extends>
<header>blackgui/views/simulatedaircraftview.h</header>
</customwidget>
<customwidget>
<class>BlackGui::Views::CAirportView</class>
<extends>QTableView</extends>
<header>blackgui/views/airportview.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>

View File

@@ -14,10 +14,13 @@
<string>Audio</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
<enum>QFrame::Plain</enum>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<layout class="QVBoxLayout" name="vl_AudioComponent">
<property name="spacing">
@@ -51,8 +54,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>396</width>
<height>296</height>
<width>398</width>
<height>298</height>
</rect>
</property>
<layout class="QVBoxLayout" name="vl_ScrollAreaInner">

View File

@@ -14,10 +14,13 @@
<string>Frame</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
<enum>QFrame::Plain</enum>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<layout class="QVBoxLayout" name="vl_AudioSetup">
<property name="leftMargin">

View File

@@ -20,10 +20,13 @@
<string>Frame</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
<enum>QFrame::Plain</enum>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<layout class="QGridLayout" name="gl_LogComponent">
<property name="leftMargin">
@@ -46,7 +49,7 @@
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="pg_LogPage" native="true">
<widget class="QWidget" name="pg_LogPage">
<attribute name="title">
<string>Log</string>
</attribute>
@@ -81,7 +84,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="pg_LogConsole" native="true">
<widget class="QWidget" name="pg_LogConsole">
<attribute name="title">
<string>Console</string>
</attribute>

View File

@@ -92,7 +92,7 @@
<set>Qt::TopDockWidgetArea</set>
</property>
<property name="windowTitle">
<string>Aircrafts</string>
<string>Aircraft</string>
</property>
<attribute name="dockWidgetArea">
<number>4</number>

View File

@@ -11,32 +11,41 @@
</rect>
</property>
<property name="windowTitle">
<string>Frame</string>
<string>Text messages</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
<enum>QFrame::Plain</enum>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<layout class="QVBoxLayout" name="vl_TextMessages">
<property name="spacing">
<number>2</number>
<number>1</number>
</property>
<property name="leftMargin">
<number>2</number>
<number>0</number>
</property>
<property name="topMargin">
<number>2</number>
<number>0</number>
</property>
<property name="rightMargin">
<number>2</number>
<number>0</number>
</property>
<property name="bottomMargin">
<number>2</number>
<number>0</number>
</property>
<item>
<widget class="QTabWidget" name="tw_TextMessages">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="currentIndex">
<number>0</number>
</property>
@@ -46,19 +55,19 @@
</attribute>
<layout class="QVBoxLayout" name="vl_TextMessagesAll">
<property name="spacing">
<number>2</number>
<number>0</number>
</property>
<property name="leftMargin">
<number>2</number>
<number>0</number>
</property>
<property name="topMargin">
<number>2</number>
<number>0</number>
</property>
<property name="rightMargin">
<number>2</number>
<number>0</number>
</property>
<property name="bottomMargin">
<number>2</number>
<number>0</number>
</property>
<item>
<widget class="BlackGui::Views::CTextMessageView" name="tvp_TextMessagesAll">
@@ -111,19 +120,19 @@
</attribute>
<layout class="QVBoxLayout" name="vl_TextMessagesUnicom">
<property name="spacing">
<number>2</number>
<number>0</number>
</property>
<property name="leftMargin">
<number>2</number>
<number>0</number>
</property>
<property name="topMargin">
<number>2</number>
<number>0</number>
</property>
<property name="rightMargin">
<number>2</number>
<number>0</number>
</property>
<property name="bottomMargin">
<number>2</number>
<number>0</number>
</property>
<item>
<widget class="BlackGui::CTextMessageTextEdit" name="tep_TextMessagesUnicom">
@@ -146,19 +155,19 @@
</attribute>
<layout class="QVBoxLayout" name="vl_TextMessagesCom1">
<property name="spacing">
<number>2</number>
<number>0</number>
</property>
<property name="leftMargin">
<number>2</number>
<number>0</number>
</property>
<property name="topMargin">
<number>2</number>
<number>0</number>
</property>
<property name="rightMargin">
<number>2</number>
<number>0</number>
</property>
<property name="bottomMargin">
<number>2</number>
<number>0</number>
</property>
<item>
<widget class="BlackGui::CTextMessageTextEdit" name="tep_TextMessagesCOM1">
@@ -184,19 +193,19 @@
</attribute>
<layout class="QVBoxLayout" name="vl_TextMessagesCom2">
<property name="spacing">
<number>2</number>
<number>0</number>
</property>
<property name="leftMargin">
<number>2</number>
<number>0</number>
</property>
<property name="topMargin">
<number>2</number>
<number>0</number>
</property>
<property name="rightMargin">
<number>2</number>
<number>0</number>
</property>
<property name="bottomMargin">
<number>2</number>
<number>0</number>
</property>
<item>
<widget class="BlackGui::CTextMessageTextEdit" name="tep_TextMessagesCOM2">