Tidy up the settings advanced tab layout and remove unnecessary elements

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7074 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2016-09-11 01:09:40 +00:00
parent d8a2c1239c
commit 9fb5422fbb
2 changed files with 169 additions and 204 deletions

View File

@ -2,14 +2,6 @@
<ui version="4.0"> <ui version="4.0">
<class>configuration_dialog</class> <class>configuration_dialog</class>
<widget class="QDialog" name="configuration_dialog"> <widget class="QDialog" name="configuration_dialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>545</width>
<height>591</height>
</rect>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Settings</string> <string>Settings</string>
</property> </property>
@ -2170,126 +2162,112 @@ Right click for insert and delete options.</string>
<string>Advanced</string> <string>Advanced</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_9"> <layout class="QGridLayout" name="gridLayout_9">
<item row="1" column="0" colspan="2">
<spacer name="verticalSpacer_8">
<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="0" column="1"> <item row="0" column="1">
<widget class="QGroupBox" name="groupBox_5"> <widget class="QGroupBox" name="groupBox_5">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="title"> <property name="title">
<string>Miscellaneous</string> <string>Miscellaneous</string>
</property> </property>
<layout class="QFormLayout" name="formLayout_10"> <layout class="QFormLayout" name="formLayout_10">
<item row="1" column="1"> <item row="2" column="0">
<layout class="QFormLayout" name="formLayout_3"> <widget class="QLabel" name="label_3">
<item row="0" column="0"> <property name="text">
<widget class="QLabel" name="label_3"> <string>Degrade S/N of .wav file: </string>
<property name="text"> </property>
<string>Degrade S/N of .wav file: </string> <property name="buddy">
</property> <cstring>sbDegrade</cstring>
<property name="buddy"> </property>
<cstring>sbDegrade</cstring> </widget>
</property> </item>
</widget> <item row="2" column="1">
</item> <widget class="QDoubleSpinBox" name="sbDegrade">
<item row="0" column="1"> <property name="suffix">
<widget class="QDoubleSpinBox" name="sbDegrade"> <string> dB</string>
<property name="suffix"> </property>
<string> dB</string> <property name="decimals">
</property> <number>1</number>
<property name="decimals"> </property>
<number>1</number> <property name="singleStep">
</property> <double>0.100000000000000</double>
<property name="singleStep"> </property>
<double>0.100000000000000</double> </widget>
</property> </item>
</widget> <item row="3" column="0">
</item> <widget class="QLabel" name="label_9">
<item row="1" column="0"> <property name="text">
<widget class="QLabel" name="label_9"> <string>Receiver bandwidth:</string>
<property name="text"> </property>
<string>Receiver bandwidth:</string> <property name="buddy">
</property> <cstring>sbBandwidth</cstring>
</widget> </property>
</item> </widget>
<item row="1" column="1"> </item>
<widget class="QSpinBox" name="sbBandwidth"> <item row="3" column="1">
<property name="suffix"> <widget class="QSpinBox" name="sbBandwidth">
<string> Hz</string> <property name="suffix">
</property> <string> Hz</string>
<property name="maximum"> </property>
<number>6000</number> <property name="maximum">
</property> <number>6000</number>
<property name="singleStep"> </property>
<number>100</number> <property name="singleStep">
</property> <number>100</number>
<property name="value"> </property>
<number>2500</number> <property name="value">
</property> <number>2500</number>
</widget> </property>
</item> </widget>
<item row="4" column="0"> </item>
<widget class="QCheckBox" name="cbx2ToneSpacing"> <item row="4" column="0">
<property name="toolTip"> <widget class="QLabel" name="label_11">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Generate Tx audio with twice the normal tone spacing. Intended for special LF/MF transmitters that use a divide-by-2 before generating RF.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <property name="text">
</property> <string>Tx delay:</string>
<property name="text"> </property>
<string>x 2 Tone Spacing</string> <property name="buddy">
</property> <cstring>sbTxDelay</cstring>
</widget> </property>
</item> </widget>
<item row="2" column="0"> </item>
<widget class="QLabel" name="label_11"> <item row="4" column="1">
<property name="text"> <widget class="QDoubleSpinBox" name="sbTxDelay">
<string>Tx delay:</string> <property name="toolTip">
</property> <string>Minimum delay between assertion of PTT and start of Tx audio.</string>
</widget> </property>
</item> <property name="suffix">
<item row="2" column="1"> <string> s</string>
<widget class="QDoubleSpinBox" name="sbTxDelay"> </property>
<property name="toolTip"> <property name="decimals">
<string>Minimum delay between assertion of PTT and start of Tx audio.</string> <number>1</number>
</property> </property>
<property name="suffix"> <property name="minimum">
<string> s</string> <double>0.200000000000000</double>
</property> </property>
<property name="decimals"> <property name="maximum">
<number>1</number> <double>2.000000000000000</double>
</property> </property>
<property name="minimum"> <property name="singleStep">
<double>0.200000000000000</double> <double>0.100000000000000</double>
</property> </property>
<property name="maximum"> </widget>
<double>2.000000000000000</double> </item>
</property> <item row="7" column="0">
<property name="singleStep"> <widget class="QCheckBox" name="cbContestMode">
<double>0.100000000000000</double> <property name="toolTip">
</property> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Skip Tx2 and Tx3 when Auto-Sequencing.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</widget> </property>
</item> <property name="text">
<item row="3" column="0"> <string>MSK144 Contest Mode</string>
<widget class="QCheckBox" name="cbContestMode"> </property>
<property name="toolTip"> </widget>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Skip Tx2 and Tx3 when Auto-Sequencing.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> </item>
</property> <item row="8" column="0">
<property name="text"> <widget class="QCheckBox" name="cbx2ToneSpacing">
<string>MSK144 Contest Mode</string> <property name="toolTip">
</property> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Generate Tx audio with twice the normal tone spacing. Intended for special LF/MF transmitters that use a divide-by-2 before generating RF.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</widget> </property>
</item> <property name="text">
</layout> <string>x 2 Tone Spacing</string>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
@ -2303,72 +2281,78 @@ Right click for insert and delete options.</string>
<string>JT65 decoding parameters</string> <string>JT65 decoding parameters</string>
</property> </property>
<layout class="QFormLayout" name="formLayout_11"> <layout class="QFormLayout" name="formLayout_11">
<item row="0" column="1"> <item row="2" column="0">
<layout class="QFormLayout" name="formLayout_2"> <widget class="QLabel" name="label_2">
<property name="fieldGrowthPolicy"> <property name="text">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum> <string>Random erasure patterns:</string>
</property> </property>
<item row="0" column="0"> <property name="buddy">
<widget class="QLabel" name="label_2"> <cstring>sbNtrials</cstring>
<property name="text"> </property>
<string>Random erasure patterns:</string> </widget>
</property> </item>
<property name="buddy"> <item row="2" column="1">
<cstring>sbNtrials</cstring> <widget class="QSpinBox" name="sbNtrials">
</property> <property name="toolTip">
</widget> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of erasure patterns for stochastic soft-decision Reed Solomon decoder is 10^(n/2).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</item> </property>
<item row="0" column="1"> <property name="minimum">
<widget class="QSpinBox" name="sbNtrials"> <number>0</number>
<property name="toolTip"> </property>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of erasure patterns for stochastic soft-decision Reed Solomon decoder is 10^(n/2).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <property name="maximum">
</property> <number>12</number>
<property name="minimum"> </property>
<number>0</number> <property name="value">
</property> <number>6</number>
<property name="maximum"> </property>
<number>12</number> </widget>
</property> </item>
<property name="value"> <item row="3" column="0">
<number>6</number> <widget class="QLabel" name="label_4">
</property> <property name="text">
</widget> <string>Aggressive decoding level:</string>
</item> </property>
<item row="1" column="0"> <property name="buddy">
<widget class="QLabel" name="label_4"> <cstring>sbAggressive</cstring>
<property name="text"> </property>
<string>Aggressive decoding level:</string> </widget>
</property> </item>
<property name="buddy"> <item row="3" column="1">
<cstring>sbAggressive</cstring> <widget class="QSpinBox" name="sbAggressive">
</property> <property name="toolTip">
</widget> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Higher levels will increase the probability of decoding, but will also increase probability of a false decode.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</item> </property>
<item row="1" column="1"> <property name="maximum">
<widget class="QSpinBox" name="sbAggressive"> <number>10</number>
<property name="toolTip"> </property>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Higher levels will increase the probability of decoding, but will also increase probability of a false decode.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> </widget>
</property> </item>
<property name="maximum"> <item row="4" column="0">
<number>10</number> <widget class="QCheckBox" name="cbTwoPass">
</property> <property name="text">
</widget> <string>Two-pass decoding</string>
</item> </property>
<item row="2" column="0"> <property name="checked">
<widget class="QCheckBox" name="cbTwoPass"> <bool>true</bool>
<property name="text"> </property>
<string>Two-pass decoding</string> </widget>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2">
<spacer name="verticalSpacer_8">
<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> </layout>
</widget> </widget>
</widget> </widget>
@ -2465,9 +2449,6 @@ soundcard changes</string>
<tabstop>pbTxMsg</tabstop> <tabstop>pbTxMsg</tabstop>
<tabstop>pbNewDXCC</tabstop> <tabstop>pbNewDXCC</tabstop>
<tabstop>pbNewCall</tabstop> <tabstop>pbNewCall</tabstop>
<tabstop>sbNtrials</tabstop>
<tabstop>cbTwoPass</tabstop>
<tabstop>sbDegrade</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections> <connections>
@ -2539,9 +2520,9 @@ soundcard changes</string>
<buttongroups> <buttongroups>
<buttongroup name="CAT_stop_bits_button_group"/> <buttongroup name="CAT_stop_bits_button_group"/>
<buttongroup name="split_mode_button_group"/> <buttongroup name="split_mode_button_group"/>
<buttongroup name="CAT_handshake_button_group"/>
<buttongroup name="CAT_data_bits_button_group"/>
<buttongroup name="PTT_method_button_group"/> <buttongroup name="PTT_method_button_group"/>
<buttongroup name="CAT_data_bits_button_group"/>
<buttongroup name="CAT_handshake_button_group"/>
<buttongroup name="TX_mode_button_group"/> <buttongroup name="TX_mode_button_group"/>
<buttongroup name="TX_audio_source_button_group"/> <buttongroup name="TX_audio_source_button_group"/>
</buttongroups> </buttongroups>

View File

@ -2,14 +2,6 @@
<ui version="4.0"> <ui version="4.0">
<class>MainWindow</class> <class>MainWindow</class>
<widget class="QMainWindow" name="MainWindow"> <widget class="QMainWindow" name="MainWindow">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>896</width>
<height>565</height>
</rect>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>WSJT-X by K1JT</string> <string>WSJT-X by K1JT</string>
</property> </property>
@ -2339,14 +2331,6 @@ QPushButton[state=&quot;ok&quot;] {
</layout> </layout>
</widget> </widget>
<widget class="QMenuBar" name="menuBar"> <widget class="QMenuBar" name="menuBar">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>896</width>
<height>21</height>
</rect>
</property>
<widget class="QMenu" name="menuFile"> <widget class="QMenu" name="menuFile">
<property name="title"> <property name="title">
<string>File</string> <string>File</string>