refs #661, improved model set dialog

* allow to change simulator
* consider distributor preferences for new model set
* error messages in dialog, therefor use CForm as base class
This commit is contained in:
Klaus Basan
2016-05-26 02:30:31 +02:00
parent cc166020b9
commit 97742f4a87
16 changed files with 262 additions and 73 deletions

View File

@@ -37,7 +37,7 @@
<property name="spacing">
<number>3</number>
</property>
<item row="1" column="1">
<item row="2" column="1">
<widget class="QRadioButton" name="rb_DbDataOnly">
<property name="toolTip">
<string>Own models for which DB data are available</string>
@@ -50,14 +50,27 @@
</attribute>
</widget>
</item>
<item row="1" column="0">
<item row="2" column="0">
<widget class="QLabel" name="lbl_SelectSourceSet">
<property name="text">
<string>Source set:</string>
</property>
</widget>
</item>
<item row="1" column="3">
<item row="3" column="2">
<widget class="QRadioButton" name="rb_DefaultDistributors">
<property name="text">
<string>default</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">bg_Distributors</string>
</attribute>
</widget>
</item>
<item row="2" column="3">
<widget class="QRadioButton" name="rb_WithIcaoData">
<property name="toolTip">
<string>Model has ICAO code</string>
@@ -73,7 +86,14 @@
</attribute>
</widget>
</item>
<item row="2" column="1">
<item row="3" column="0">
<widget class="QLabel" name="lbl_Providers">
<property name="text">
<string>Distributors:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QRadioButton" name="rb_SelectedDistributors">
<property name="text">
<string>selected</string>
@@ -83,27 +103,37 @@
</attribute>
</widget>
</item>
<item row="2" column="2">
<widget class="QRadioButton" name="rb_DefaultDistributors">
<item row="1" column="0">
<widget class="QLabel" name="lbl_Mode">
<property name="text">
<string>default</string>
<string>Mode:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QRadioButton" name="rb_Full">
<property name="text">
<string>full</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">bg_Distributors</string>
<string notr="true">bg_Mode</string>
</attribute>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lbl_Providers">
<item row="1" column="2">
<widget class="QRadioButton" name="rb_Incremental">
<property name="text">
<string>Distributors:</string>
<string>incremental</string>
</property>
<attribute name="buttonGroup">
<string notr="true">bg_Mode</string>
</attribute>
</widget>
</item>
<item row="1" column="2">
<item row="2" column="2">
<widget class="QRadioButton" name="rb_DbIcaoCodesOnly">
<property name="toolTip">
<string>Model has ICAO code known in DB</string>
@@ -119,36 +149,30 @@
</attribute>
</widget>
</item>
<item row="3" column="3">
<widget class="QCheckBox" name="cb_Preferences">
<property name="text">
<string>preferences</string>
</property>
</widget>
</item>
<item row="0" column="1" colspan="3">
<widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="lbl_Mode">
<widget class="QLabel" name="lbl_Simulator">
<property name="text">
<string>Mode:</string>
<string>Simulator:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QRadioButton" name="rb_Full">
<property name="text">
<string>full</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">bg_Mode</string>
</attribute>
</widget>
</item>
<item row="0" column="2">
<widget class="QRadioButton" name="rb_Incremental">
<property name="text">
<string>incremental</string>
</property>
<attribute name="buttonGroup">
<string notr="true">bg_Mode</string>
</attribute>
</widget>
</item>
</layout>
</item>
<item>
@@ -172,12 +196,18 @@
<extends>QTableView</extends>
<header>blackgui/views/distributorview.h</header>
</customwidget>
<customwidget>
<class>BlackGui::Components::CSimulatorSelector</class>
<extends>QFrame</extends>
<header>blackgui/components/simulatorselector.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>
<buttongroups>
<buttongroup name="bg_Distributors"/>
<buttongroup name="bg_SourceSet"/>
<buttongroup name="bg_Mode"/>
<buttongroup name="bg_Distributors"/>
</buttongroups>
</ui>