refs #400, 2nd stage for Qt 541

* GUI finetuning after folder split and migration to Qt 5.4.1
* Doxygen fixes
This commit is contained in:
Klaus Basan
2015-04-10 00:04:28 +02:00
parent aafee8eafd
commit 1f5eb16bb1
12 changed files with 597 additions and 461 deletions

View File

@@ -92,19 +92,19 @@
</attribute>
<layout class="QVBoxLayout" name="vl_SettingsAudio">
<property name="spacing">
<number>0</number>
<number>2</number>
</property>
<property name="leftMargin">
<number>0</number>
<number>1</number>
</property>
<property name="topMargin">
<number>0</number>
<number>1</number>
</property>
<property name="rightMargin">
<number>0</number>
<number>1</number>
</property>
<property name="bottomMargin">
<number>0</number>
<number>1</number>
</property>
<item>
<widget class="BlackGui::Components::CAudioSetupComponent" name="comp_AudioSetup">
@@ -124,19 +124,19 @@
</attribute>
<layout class="QVBoxLayout" name="vl_SettingsSimulator">
<property name="spacing">
<number>0</number>
<number>2</number>
</property>
<property name="leftMargin">
<number>0</number>
<number>1</number>
</property>
<property name="topMargin">
<number>0</number>
<number>1</number>
</property>
<property name="rightMargin">
<number>0</number>
<number>1</number>
</property>
<property name="bottomMargin">
<number>0</number>
<number>1</number>
</property>
<item>
<widget class="BlackGui::Components::CSettingsSimulatorComponent" name="comp_SettingsSimulator">
@@ -156,13 +156,13 @@
</attribute>
<layout class="QVBoxLayout" name="vl_SettingsGui">
<property name="leftMargin">
<number>1</number>
<number>3</number>
</property>
<property name="topMargin">
<number>1</number>
<number>3</number>
</property>
<property name="rightMargin">
<number>1</number>
<number>3</number>
</property>
<property name="bottomMargin">
<number>1</number>
@@ -182,7 +182,7 @@
<item row="0" column="1">
<widget class="QSlider" name="hs_SettingsGuiOpacity">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -214,7 +214,7 @@
<item row="1" column="1">
<widget class="QSlider" name="hs_SettingsGuiAircraftRefreshTime">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -255,7 +255,7 @@
<item row="2" column="1">
<widget class="QSlider" name="hs_SettingsGuiAtcRefreshTime">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -293,7 +293,7 @@
<item row="3" column="1">
<widget class="QSlider" name="hs_SettingsGuiUserRefreshTime">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -327,12 +327,6 @@
</item>
<item row="4" column="1">
<widget class="QFontComboBox" name="cb_SettingsGuiFont">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLength</enum>
</property>
@@ -347,6 +341,12 @@
</item>
<item row="5" column="1">
<widget class="QComboBox" name="cb_SettingsGuiFontSize">
<property name="maximumSize">
<size>
<width>150</width>
<height>16777215</height>
</size>
</property>
<item>
<property name="text">
<string>6</string>
@@ -403,6 +403,12 @@
</item>
<item row="6" column="1">
<widget class="QComboBox" name="cb_SettingsGuiFontStyle">
<property name="maximumSize">
<size>
<width>150</width>
<height>16777215</height>
</size>
</property>
<item>
<property name="text">
<string>normal</string>
@@ -433,28 +439,42 @@
</widget>
</item>
<item row="7" column="1">
<layout class="QHBoxLayout" name="hl_SettingsGuiFontColor">
<item>
<widget class="QToolButton" name="tb_SettingsGuiFontColor">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="le_SettingsGuiFontColor">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
<widget class="QWidget" name="qw_SettingsGuiFont" native="true">
<layout class="QHBoxLayout" name="hl_SettingsGuiFontColor">
<property name="spacing">
<number>3</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="QToolButton" name="tb_SettingsGuiFontColor">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="le_SettingsGuiFontColor">
<property name="maxLength">
<number>200</number>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</item>