flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-28 20:25:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use combobox simulator selector in mapping component as it allows "smaller" columns

Browse Source
This commit is contained in:
Klaus Basan
2018-12-15 01:39:13 +01:00
parent 5f252530cd
commit d5ebd91c55
2 changed files with 81 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackgui/components/mappingcomponent.cpp
View File

@@ -122,7 +122,7 @@ namespace BlackGui
// selector // selector
ui->comp_SimulatorSelector->setRememberSelection(false); // pilot client UI ui->comp_SimulatorSelector->setRememberSelection(false); // pilot client UI
ui->comp_SimulatorSelector->setMode(CSimulatorSelector::RadioButtons); ui->comp_SimulatorSelector->setMode(CSimulatorSelector::ComboBox);
ui->comp_SimulatorSelector->setToConnectedSimulator(); ui->comp_SimulatorSelector->setToConnectedSimulator();
connect(ui->comp_SimulatorSelector, &CSimulatorSelector::changed, this, &CMappingComponent::onModelSetSimulatorChanged); connect(ui->comp_SimulatorSelector, &CSimulatorSelector::changed, this, &CMappingComponent::onModelSetSimulatorChanged);

161
src/blackgui/components/mappingcomponent.ui
View File

@@ -170,7 +170,41 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>3</number> <number>3</number>
</property> </property>
<item row="1" column="5"> <item row="2" column="3">
<widget class="QPushButton" name="pb_ResetAircraft">
<property name="toolTip">
<string>reset model by callsign</string>
</property>
<property name="text">
<string>reset</string>
</property>
<property name="icon">
<iconset resource="../../blackmisc/blackmisc.qrc">
<normaloff>:/pastel/icons/pastel/16/arrow-refresh.png</normaloff>:/pastel/icons/pastel/16/arrow-refresh.png</iconset>
</property>
</widget>
</item>
<item row="2" column="4">
<widget class="QPushButton" name="pb_DoMatchingAgain">
<property name="toolTip">
<string>do all matchings again</string>
</property>
<property name="text">
<string>re-match</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="6">
<widget class="BlackGui::Components::CAircraftModelStringCompleter" name="completer_ModelStrings">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
</widget>
</item>
<item row="2" column="5">
<widget class="QPushButton" name="pb_SaveAircraft"> <widget class="QPushButton" name="pb_SaveAircraft">
<property name="toolTip"> <property name="toolTip">
<string>save selected model</string> <string>save selected model</string>
@@ -180,30 +214,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="2" column="0">
<widget class="QCheckBox" name="cb_AircraftEnabled">
<property name="toolTip">
<string>aircraft enabled/disable</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="cb_AircraftIconDisplayed">
<property name="toolTip">
<string>show / hide icon of aircraft</string>
</property>
<property name="text">
<string/>
</property>
<property name="checked">
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lbl_Aircraft"> <widget class="QLabel" name="lbl_Aircraft">
<property name="toolTip"> <property name="toolTip">
<string>aircraft enabled</string> <string>aircraft enabled</string>
@@ -213,24 +224,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="2" column="2">
<widget class="QLabel" name="lbl_AircraftIcon">
<property name="text">
<string>Icon</string>
</property>
</widget>
</item>
<item row="0" column="5">
<widget class="QPushButton" name="pb_LoadModels">
<property name="toolTip">
<string>load model set</string>
</property>
<property name="text">
<string>load set</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLineEdit" name="le_Callsign"> <widget class="QLineEdit" name="le_Callsign">
<property name="toolTip"> <property name="toolTip">
<string>callsign of aircraft</string> <string>callsign of aircraft</string>
@@ -249,56 +243,67 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="6"> <item row="1" column="4" colspan="2">
<widget class="BlackGui::Components::CAircraftModelStringCompleter" name="completer_ModelStrings"> <widget class="QWidget" name="wi_LoadSet" native="true">
<property name="minimumSize"> <layout class="QHBoxLayout" name="hl_LoadSet">
<size> <property name="leftMargin">
<width>0</width> <number>0</number>
<height>20</height>
</size>
</property> </property>
</widget> <property name="topMargin">
</item> <number>0</number>
<item row="1" column="4"> </property>
<widget class="QPushButton" name="pb_DoMatchingAgain"> <property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item alignment="Qt::AlignRight">
<widget class="QPushButton" name="pb_LoadModels">
<property name="toolTip"> <property name="toolTip">
<string>do all matchings again</string> <string>load model set</string>
</property> </property>
<property name="text"> <property name="text">
<string>re-match</string> <string>load model set</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2" colspan="3" alignment="Qt::AlignLeft"> </layout>
<widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="3"> <item row="2" column="1">
<widget class="QPushButton" name="pb_ResetAircraft"> <widget class="QCheckBox" name="cb_AircraftEnabled">
<property name="toolTip"> <property name="toolTip">
<string>reset model by callsign</string> <string>aircraft enabled/disable</string>
</property> </property>
<property name="text"> <property name="text">
<string>reset</string> <string/>
</property>
<property name="icon">
<iconset resource="../../blackmisc/blackmisc.qrc">
<normaloff>:/pastel/icons/pastel/16/arrow-refresh.png</normaloff>:/pastel/icons/pastel/16/arrow-refresh.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0">
<widget class="QLabel" name="lbl_AircraftIcon">
<property name="text">
<string>Icon</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="cb_AircraftIconDisplayed">
<property name="toolTip">
<string>show / hide icon of aircraft</string>
</property>
<property name="text">
<string/>
</property>
<property name="checked">
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector"/>
</item>
</layout> </layout>
</widget> </widget>
</widget> </widget>