refs #335, GUI finetuning

* combo boxes, size model changed - fixes the issue with the settings exceeding the boundaries
* main window can be minimized
* renaming the main page
* style sheet
This commit is contained in:
Klaus Basan
2014-10-18 15:46:47 +02:00
committed by Roland Winklmeier
parent 216b9f170d
commit 6f8d85e864
10 changed files with 149 additions and 22 deletions

View File

@@ -36,11 +36,17 @@
<number>0</number>
</property>
<item>
<widget class="QScrollArea" name="sa_AudioSetup">
<widget class="QScrollArea" name="sa_AudioComponent">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="saAudioSetupInner">
<widget class="QWidget" name="sa_AudioComponentInner">
<property name="geometry">
<rect>
<x>0</x>
@@ -53,6 +59,9 @@
<property name="spacing">
<number>0</number>
</property>
<property name="sizeConstraint">
<enum>QLayout::SetMaximumSize</enum>
</property>
<property name="leftMargin">
<number>0</number>
</property>
@@ -66,13 +75,85 @@
<number>0</number>
</property>
<item>
<widget class="BlackGui::Components::CAudioSetup" name="comp_AudioSetup">
<widget class="QFrame" name="fr_AudioComponentInner">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="vl_AudioComponentInner">
<property name="spacing">
<number>2</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>
<layout class="QFormLayout" name="fl_AudioVolume">
<item row="0" column="0">
<widget class="QLabel" name="lbl_AudioSound">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Sound:</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lbl_VolumeCom1">
<property name="text">
<string>Volume COM1:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSlider" name="hs_VolumeCom1">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lbl_VolumeCom2">
<property name="text">
<string>Volume COM2:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QSlider" name="hs_VolumeCom2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="BlackGui::Components::CAudioSetup" name="comp_AudioSetup">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>

View File

@@ -60,7 +60,17 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="cb_SetupAudioInputDevice"/>
<widget class="QComboBox" name="cb_SetupAudioInputDevice">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLength</enum>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lbl_SetupAudioOutputDevice">
@@ -70,7 +80,17 @@
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="cb_SetupAudioOutputDevice"/>
<widget class="QComboBox" name="cb_SetupAudioOutputDevice">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLength</enum>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lbl_SetupAudioVoiceTests">

View File

@@ -540,7 +540,7 @@
</property>
</widget>
</item>
<item>
<item alignment="Qt::AlignRight">
<widget class="QPushButton" name="pb_ComPanelSelcalTest">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -552,7 +552,7 @@
<string>test SELCAL</string>
</property>
<property name="text">
<string>Test</string>
<string/>
</property>
<property name="icon">
<iconset resource="../../blackmisc/blackmisc.qrc">

View File

@@ -127,7 +127,7 @@
<item row="3" column="0">
<widget class="QLabel" name="lbl_SettingsFsxExistsSimconncetCfg">
<property name="text">
<string>&quot;simconnect.cfg&quot; exists?</string>
<string>&quot;simconnect.cfg&quot;?</string>
</property>
</widget>
</item>
@@ -174,6 +174,9 @@
</item>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="lbl_HeaderFsxSimConnect">
<property name="toolTip">
<string>&quot;simconnect.cfg&quot; exists?</string>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt; font-weight:600;&quot;&gt;FSX simconnect config files&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>

View File

@@ -63,13 +63,20 @@
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="cb_Plugins"/>
<widget class="QComboBox" name="cb_Plugins">
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLength</enum>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lbl_TimeSync">
<property name="text">
<property name="toolTip">
<string>Time synchronization</string>
</property>
<property name="text">
<string>Time synch.</string>
</property>
</widget>
</item>
<item row="2" column="1">