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

Ref T731, Ref T739, adjusted launcher to only support "STANDALONE" and "DISTRIBUTED"

Browse Source 
* the audio on core/GUI modes are no longer valid
* aligned the core mode enum
This commit is contained in:
Klaus Basan
2019-10-05 23:46:55 +02:00
committed by Mat Sutcliffe
parent bcd97c3a60
commit 9ddb55e79f
6 changed files with 84 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
src/swiftlauncher/swiftlauncher.ui
View File

@@ -88,7 +88,7 @@
<item>
<widget class="QToolBox" name="tb_Launcher">
<property name="currentIndex">
<number>4</number>
<number>2</number>
</property>
<property name="tabSpacing">
<number>6</number>
@@ -225,7 +225,7 @@
<attribute name="label">
<string>&amp;Core mode</string>
</attribute>
<layout class="QGridLayout" name="gl_CoreMode" columnstretch="10,14,14">
<layout class="QGridLayout" name="gl_CoreMode" columnstretch="0,0">
<property name="leftMargin">
<number>4</number>
</property>
@@ -241,33 +241,17 @@
<property name="spacing">
<number>4</number>
</property>
<item row="1" column="1" alignment="Qt::AlignHCenter">
<widget class="QLabel" name="lbl_AudioGui">
<property name="text">
<string>Audio on GUI side</string>
</property>
</widget>
</item>
<item row="0" column="1" alignment="Qt::AlignHCenter">
<widget class="QRadioButton" name="rb_SwiftCoreAudioOnGui">
<widget class="QRadioButton" name="rb_SwiftDistributed">
<property name="text">
<string>GUI and core</string>
</property>
<attribute name="buttonGroup">
<string notr="true">bg_CoreMode</string>
</attribute>
</widget>
</item>
<item row="0" column="2" alignment="Qt::AlignHCenter">
<widget class="QRadioButton" name="rb_SwiftCoreAudioOnCore">
<property name="text">
<string>GUI and core</string>
</property>
<attribute name="buttonGroup">
<string notr="true">bg_CoreMode</string>
</attribute>
</widget>
</item>
<item row="0" column="0" alignment="Qt::AlignHCenter">
<widget class="QRadioButton" name="rb_SwiftStandalone">
<property name="text">
<string>standalone</string>
</property>
<property name="checked">
<bool>true</bool>
<string>GUI and core (distributed)</string>
</property>
<attribute name="buttonGroup">
<string notr="true">bg_CoreMode</string>
@@ -284,23 +268,6 @@
</property>
</widget>
</item>
<item row="1" column="1" alignment="Qt::AlignHCenter">
<widget class="QLabel" name="lbl_AudioGui">
<property name="text">
<string>Audio on GUI side</string>
</property>
</widget>
</item>
<item row="2" column="2" alignment="Qt::AlignHCenter">
<widget class="QLabel" name="lbl_SwiftCoreAudioIcon">
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="swiftlauncher.qrc">:/launcher/icons/swiftGUIandCore115x85.png</pixmap>
</property>
</widget>
</item>
<item row="2" column="0" alignment="Qt::AlignHCenter">
<widget class="QLabel" name="lbl_SwiftStandaloneIcon">
<property name="text">
@@ -311,15 +278,40 @@
</property>
</widget>
</item>
<item row="1" column="2" alignment="Qt::AlignHCenter">
<widget class="QLabel" name="lbl_AudioCore">
<item row="0" column="0" alignment="Qt::AlignHCenter">
<widget class="QRadioButton" name="rb_SwiftStandalone">
<property name="text">
<string>Audio on core side</string>
<string>standalone</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">bg_CoreMode</string>
</attribute>
</widget>
</item>
<item row="3" column="1" colspan="2">
<item row="4" column="0" colspan="2">
<spacer name="vs_CoreButtomSpace">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="0" colspan="2" alignment="Qt::AlignRight">
<widget class="QGroupBox" name="gb_DBusServer">
<property name="minimumSize">
<size>
<width>225</width>
<height>0</height>
</size>
</property>
<property name="title">
<string>DBus (swift core/GUI, NOT XSwiftBus)</string>
</property>
@@ -358,25 +350,6 @@
</layout>
</widget>
</item>
<item row="4" column="0" colspan="3">
<widget class="QWidget" name="wi_CoreButtonSpace" native="true">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer name="vs_CoreButtomSpace">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="pg_Updates">
@@ -648,7 +621,7 @@
<string>swift GUI</string>
</property>
<property name="icon">
<iconset resource="../blackmisc/blackmisc.qrc">
<iconset>
<normaloff>:/own/icons/own/swift3D/sw3DBlue-256.png</normaloff>:/own/icons/own/swift3D/sw3DBlue-256.png</iconset>
</property>
<property name="iconSize">
@@ -668,7 +641,7 @@
<string>swift core</string>
</property>
<property name="icon">
<iconset resource="../blackmisc/blackmisc.qrc">
<iconset>
<normaloff>:/own/icons/own/swift3D/sw3DOrange-256.png</normaloff>:/own/icons/own/swift3D/sw3DOrange-256.png</iconset>
</property>
<property name="iconSize">
@@ -688,7 +661,7 @@
<string>mapping tool</string>
</property>
<property name="icon">
<iconset resource="../blackmisc/blackmisc.qrc">
<iconset>
<normaloff>:/own/icons/own/swift3D/sw3DGreen-256.png</normaloff>:/own/icons/own/swift3D/sw3DGreen-256.png</iconset>
</property>
<property name="iconSize">
@@ -705,7 +678,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../blackmisc/blackmisc.qrc">
<iconset>
<normaloff>:/misc/icons/misc/toolWizard128.png</normaloff>:/misc/icons/misc/toolWizard128.png</iconset>
</property>
<property name="iconSize">
@@ -725,7 +698,7 @@
<string>goto swift database</string>
</property>
<property name="icon">
<iconset resource="../blackmisc/blackmisc.qrc">
<iconset>
<normaloff>:/own/icons/own/swift3D/sw3DGreen-256.png</normaloff>:/own/icons/own/swift3D/sw3DGreen-256.png</iconset>
</property>
<property name="iconSize">
@@ -827,7 +800,7 @@
<string>back to main</string>
</property>
<property name="icon">
<iconset resource="../blackmisc/blackmisc.qrc">
<iconset>
<normaloff>:/diagona/icons/diagona/icons/arrow-180.png</normaloff>:/diagona/icons/diagona/icons/arrow-180.png</iconset>
</property>
<property name="shortcut">
@@ -895,8 +868,7 @@
<tabstop>rb_WindowNormal</tabstop>
<tabstop>rb_WindowFrameless</tabstop>
<tabstop>rb_SwiftStandalone</tabstop>
<tabstop>rb_SwiftCoreAudioOnGui</tabstop>
<tabstop>rb_SwiftCoreAudioOnCore</tabstop>
<tabstop>rb_SwiftDistributed</tabstop>
<tabstop>sa_DataUpdates</tabstop>
<tabstop>tb_SwiftGui</tabstop>
<tabstop>tb_SwiftCore</tabstop>
@@ -906,7 +878,6 @@
<tabstop>tb_BackToMain</tabstop>
</tabstops>
<resources>
<include location="../blackmisc/blackmisc.qrc"/>
<include location="swiftlauncher.qrc"/>
</resources>
<connections/>