Ref T515, mapping component improvements

* allow to re-display validation dialog
* highlight disabled models
This commit is contained in:
Klaus Basan
2019-01-23 17:10:00 +01:00
committed by Mat Sutcliffe
parent 6644927943
commit 583a5bfb28
7 changed files with 147 additions and 122 deletions

View File

@@ -157,7 +157,7 @@
<height>80</height>
</size>
</property>
<layout class="QGridLayout" name="gl_AircraftModifications">
<layout class="QGridLayout" name="gl_AircraftModifications" columnstretch="0,0,1,1,1,1">
<property name="leftMargin">
<number>3</number>
</property>
@@ -170,7 +170,44 @@
<property name="bottomMargin">
<number>3</number>
</property>
<item row="2" column="3">
<item row="3" column="0">
<widget class="QLabel" name="lbl_Aircraft">
<property name="toolTip">
<string>aircraft enabled</string>
</property>
<property name="text">
<string>Enbl.</string>
</property>
</widget>
</item>
<item row="3" 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="4" 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="1" column="0">
<widget class="QLabel" name="lbl_AircraftIcon">
<property name="text">
<string>Icon</string>
</property>
</widget>
</item>
<item row="3" column="3">
<widget class="QPushButton" name="pb_ResetAircraft">
<property name="toolTip">
<string>reset model by callsign</string>
@@ -184,110 +221,6 @@
</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">
<property name="toolTip">
<string>save selected model</string>
</property>
<property name="text">
<string>save</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lbl_Aircraft">
<property name="toolTip">
<string>aircraft enabled</string>
</property>
<property name="text">
<string>Enbl.</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QLineEdit" name="le_Callsign">
<property name="toolTip">
<string>callsign of aircraft</string>
</property>
<property name="statusTip">
<string/>
</property>
<property name="maxLength">
<number>15</number>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
<property name="placeholderText">
<string>callsign</string>
</property>
</widget>
</item>
<item row="1" column="4" colspan="2">
<widget class="QWidget" name="wi_LoadSet" native="true">
<layout class="QHBoxLayout" name="hl_LoadSet">
<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 alignment="Qt::AlignRight">
<widget class="QPushButton" name="pb_LoadModels">
<property name="toolTip">
<string>load model set</string>
</property>
<property name="text">
<string>load model set</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="cb_AircraftEnabled">
<property name="toolTip">
<string>aircraft enabled/disable</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</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">
@@ -301,8 +234,68 @@
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector"/>
<item row="3" column="5">
<widget class="QPushButton" name="pb_SaveAircraft">
<property name="toolTip">
<string>save selected model</string>
</property>
<property name="text">
<string>save</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QLineEdit" name="le_Callsign">
<property name="toolTip">
<string>callsign of aircraft</string>
</property>
<property name="maxLength">
<number>15</number>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
<property name="placeholderText">
<string>callsign</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="cb_AircraftEnabled">
<property name="toolTip">
<string>aircraft enabled/disable</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="5">
<widget class="BlackGui::CElidedPushButton" name="pb_LoadModels">
<property name="toolTip">
<string>load model set</string>
</property>
<property name="text">
<string>load model set</string>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QPushButton" name="pb_ValidateModelSet">
<property name="text">
<string>validate</string>
</property>
</widget>
</item>
<item row="1" column="2" colspan="2" alignment="Qt::AlignLeft">
<widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector">
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
</widget>
</item>
</layout>
</widget>
@@ -311,6 +304,11 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>BlackGui::Views::CAircraftModelView</class>
<extends>QTableView</extends>
<header>blackgui/views/aircraftmodelview.h</header>
</customwidget>
<customwidget>
<class>BlackGui::Components::CSimulatorSelector</class>
<extends>QFrame</extends>
@@ -322,11 +320,6 @@
<extends>QTableView</extends>
<header>blackgui/views/simulatedaircraftview.h</header>
</customwidget>
<customwidget>
<class>BlackGui::Views::CAircraftModelView</class>
<extends>QTableView</extends>
<header>blackgui/views/aircraftmodelview.h</header>
</customwidget>
<customwidget>
<class>BlackGui::Components::CModelMatcherLogComponent</class>
<extends>QFrame</extends>
@@ -345,11 +338,17 @@
<header>blackgui/components/matchingstatisticscomponent.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::CElidedPushButton</class>
<extends>QPushButton</extends>
<header>blackgui/elidedpushbutton.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>tw_SpecializedViews</tabstop>
<tabstop>tvp_RenderedAircraft</tabstop>
<tabstop>cb_AircraftIconDisplayed</tabstop>
<tabstop>pb_ValidateModelSet</tabstop>
<tabstop>pb_LoadModels</tabstop>
<tabstop>cb_AircraftEnabled</tabstop>
<tabstop>le_Callsign</tabstop>