UI tweaks to improve portability between platforms and font size changes

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8102 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2017-09-22 12:31:01 +00:00
parent d706ee5887
commit e1da6f6e16
2 changed files with 302 additions and 366 deletions

View File

@ -334,7 +334,7 @@
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="2,2,2,2,2,2,2,2,2,1">
<item> <item>
<widget class="QPushButton" name="logQSOButton"> <widget class="QPushButton" name="logQSOButton">
<property name="minimumSize"> <property name="minimumSize">
@ -531,12 +531,6 @@
</item> </item>
<item> <item>
<widget class="QCheckBox" name="cbMenus"> <widget class="QCheckBox" name="cbMenus">
<property name="maximumSize">
<size>
<width>60</width>
<height>16777215</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Menus</string> <string>Menus</string>
</property> </property>
@ -1028,146 +1022,17 @@ QLabel[oob=&quot;true&quot;] {
<attribute name="title"> <attribute name="title">
<string>1</string> <string>1</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_6"> <layout class="QGridLayout" name="gridLayout_7">
<property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QPushButton" name="genStdMsgsPushButton"> <layout class="QGridLayout" name="gridLayout_6">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>2</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Generate standard messages for minimal QSO</string>
</property>
<property name="text">
<string>Generate Std Msgs</string>
</property>
</widget>
</item>
<item row="0" column="1" alignment="Qt::AlignHCenter|Qt::AlignVCenter">
<widget class="QLabel" name="label_5">
<property name="toolTip">
<string>Queue up the next Tx message</string>
</property>
<property name="text">
<string>Next</string>
</property>
</widget>
</item>
<item row="0" column="2" alignment="Qt::AlignHCenter|Qt::AlignVCenter">
<widget class="QLabel" name="label_2">
<property name="toolTip">
<string>Switch to this Tx message NOW</string>
</property>
<property name="text">
<string>Now</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLineEdit" name="tx1">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>2</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="1" alignment="Qt::AlignHCenter|Qt::AlignVCenter">
<widget class="DoubleClickableRadioButton" name="txrb1">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Send this message in next Tx interval&lt;/p&gt;&lt;p&gt;Double click to toggle the use of the Tx1 message to start a QSO with a station (not allowed for type 1 compound call holders)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string/>
</property>
<property name="shortcut">
<string>Ctrl+1</string>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroup</string>
</attribute>
</widget>
</item>
<item row="1" column="2">
<widget class="DoubleClickablePushButton" name="txb1">
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Switch to this Tx message NOW&lt;/p&gt;&lt;p&gt;Double click to toggle the use of the Tx1 message to start a QSO with a station (not allowed for type 1 compund call holders)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="text">
<string>Tx &amp;1</string>
</property>
<property name="shortcut">
<string>Alt+1</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLineEdit" name="tx2">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>2</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="2" column="1" alignment="Qt::AlignHCenter|Qt::AlignVCenter">
<widget class="QRadioButton" name="txrb2">
<property name="toolTip">
<string>Send this message in next Tx interval</string>
</property>
<property name="text">
<string/>
</property>
<property name="shortcut">
<string>Ctrl+2</string>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroup</string>
</attribute>
</widget>
</item>
<item row="2" column="2"> <item row="2" column="2">
<widget class="QPushButton" name="txb2"> <widget class="QPushButton" name="txb2">
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip"> <property name="toolTip">
<string>Switch to this Tx message NOW</string> <string>Switch to this Tx message NOW</string>
</property> </property>
<property name="styleSheet">
<string notr="true">padding-left: 15%; padding-right: 15%; padding-top: 3%; padding-bottom: 3%</string>
</property>
<property name="text"> <property name="text">
<string>Tx &amp;2</string> <string>Tx &amp;2</string>
</property> </property>
@ -1177,20 +1042,16 @@ QLabel[oob=&quot;true&quot;] {
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLineEdit" name="tx3"> <widget class="QLineEdit" name="tx3"/>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>2</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item> </item>
<item row="3" column="1" alignment="Qt::AlignHCenter|Qt::AlignVCenter"> <item row="3" column="1">
<widget class="QRadioButton" name="txrb3"> <widget class="QRadioButton" name="txrb3">
<property name="toolTip"> <property name="toolTip">
<string>Send this message in next Tx interval</string> <string>Send this message in next Tx interval</string>
</property> </property>
<property name="styleSheet">
<string notr="true">margin-left: 10%; margin-right: 0%</string>
</property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
@ -1202,40 +1063,14 @@ QLabel[oob=&quot;true&quot;] {
</attribute> </attribute>
</widget> </widget>
</item> </item>
<item row="3" column="2"> <item row="4" column="1">
<widget class="QPushButton" name="txb3">
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>Switch to this Tx message NOW</string>
</property>
<property name="text">
<string>Tx &amp;3</string>
</property>
<property name="shortcut">
<string>Alt+3</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLineEdit" name="tx4">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>2</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="4" column="1" alignment="Qt::AlignHCenter|Qt::AlignVCenter">
<widget class="DoubleClickableRadioButton" name="txrb4"> <widget class="DoubleClickableRadioButton" name="txrb4">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Send this message in next Tx interval&lt;/p&gt;&lt;p&gt;Double-click to toggle between RRR and RR73 messages in Tx4 (not allowed for type 2 compound call holders)&lt;/p&gt;&lt;p&gt;RR73 messages should only be used when you are reasonably confident that no message repetitions will be required&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Send this message in next Tx interval&lt;/p&gt;&lt;p&gt;Double-click to toggle between RRR and RR73 messages in Tx4 (not allowed for type 2 compound call holders)&lt;/p&gt;&lt;p&gt;RR73 messages should only be used when you are reasonably confident that no message repetitions will be required&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="styleSheet">
<string notr="true">margin-left: 10%; margin-right: 0%</string>
</property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
@ -1247,52 +1082,14 @@ QLabel[oob=&quot;true&quot;] {
</attribute> </attribute>
</widget> </widget>
</item> </item>
<item row="4" column="2"> <item row="5" column="1">
<widget class="DoubleClickablePushButton" name="txb4">
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Switch to this Tx message NOW&lt;/p&gt;&lt;p&gt;Double-click to toggle between RRR and RR73 messages in Tx4 (not allowed for type2 compound call holders)&lt;/p&gt;&lt;p&gt;RR73 messages should only be used when you are reasonably confident that no message repetitions will be required&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Tx &amp;4</string>
</property>
<property name="shortcut">
<string>Alt+4</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QComboBox" name="tx5">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>2</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Enter a free text message (maximum 13 characters)
or select a predefined macro from the dropdown list.
Press ENTER to add the current text to the predefined
list. The list can be maintained in Settings (F2).</string>
</property>
<property name="editable">
<bool>true</bool>
</property>
<property name="insertPolicy">
<enum>QComboBox::InsertAtBottom</enum>
</property>
</widget>
</item>
<item row="5" column="1" alignment="Qt::AlignHCenter|Qt::AlignVCenter">
<widget class="DoubleClickableRadioButton" name="txrb5"> <widget class="DoubleClickableRadioButton" name="txrb5">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Send this message in next Tx interval&lt;/p&gt;&lt;p&gt;Double-click to reset to the standard 73 message&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Send this message in next Tx interval&lt;/p&gt;&lt;p&gt;Double-click to reset to the standard 73 message&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="styleSheet">
<string notr="true">margin-left: 10%; margin-right: 0%</string>
</property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
@ -1306,15 +1103,12 @@ list. The list can be maintained in Settings (F2).</string>
</item> </item>
<item row="5" column="2"> <item row="5" column="2">
<widget class="DoubleClickablePushButton" name="txb5"> <widget class="DoubleClickablePushButton" name="txb5">
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Switch to this Tx message NOW&lt;/p&gt;&lt;p&gt;Double-click to reset to the standard 73 message&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Switch to this Tx message NOW&lt;/p&gt;&lt;p&gt;Double-click to reset to the standard 73 message&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="styleSheet">
<string notr="true">padding-left: 15%; padding-right: 15%; padding-top: 3%; padding-bottom: 3%</string>
</property>
<property name="text"> <property name="text">
<string>Tx &amp;5</string> <string>Tx &amp;5</string>
</property> </property>
@ -1323,24 +1117,175 @@ list. The list can be maintained in Settings (F2).</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="4" column="2">
<widget class="QLineEdit" name="tx6"> <widget class="DoubleClickablePushButton" name="txb4">
<property name="sizePolicy"> <property name="toolTip">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Switch to this Tx message NOW&lt;/p&gt;&lt;p&gt;Double-click to toggle between RRR and RR73 messages in Tx4 (not allowed for type2 compound call holders)&lt;/p&gt;&lt;p&gt;RR73 messages should only be used when you are reasonably confident that no message repetitions will be required&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<horstretch>2</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="styleSheet">
<string notr="true">padding-left: 15%; padding-right: 15%; padding-top: 3%; padding-bottom: 3%</string>
</property>
<property name="text">
<string>Tx &amp;4</string>
</property>
<property name="shortcut">
<string>Alt+4</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QComboBox" name="tx5">
<property name="toolTip">
<string>Enter a free text message (maximum 13 characters)
or select a predefined macro from the dropdown list.
Press ENTER to add the current text to the predefined
list. The list can be maintained in Settings (F2).</string>
</property>
<property name="editable">
<bool>true</bool>
</property>
<property name="insertPolicy">
<enum>QComboBox::InsertAtBottom</enum>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLineEdit" name="tx1">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="1" alignment="Qt::AlignHCenter|Qt::AlignVCenter"> <item row="0" column="2">
<widget class="QLabel" name="label_2">
<property name="toolTip">
<string>Switch to this Tx message NOW</string>
</property>
<property name="text">
<string>Now</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="DoubleClickablePushButton" name="txb1">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Switch to this Tx message NOW&lt;/p&gt;&lt;p&gt;Double click to toggle the use of the Tx1 message to start a QSO with a station (not allowed for type 1 compund call holders)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="styleSheet">
<string notr="true">padding-left: 15%; padding-right: 15%; padding-top: 3%; padding-bottom: 3%</string>
</property>
<property name="text">
<string>Tx &amp;1</string>
</property>
<property name="shortcut">
<string>Alt+1</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_5">
<property name="toolTip">
<string>Queue up the next Tx message</string>
</property>
<property name="text">
<string>Next</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="DoubleClickableRadioButton" name="txrb1">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Send this message in next Tx interval&lt;/p&gt;&lt;p&gt;Double click to toggle the use of the Tx1 message to start a QSO with a station (not allowed for type 1 compound call holders)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="styleSheet">
<string notr="true">margin-left: 10%; margin-right: 0%</string>
</property>
<property name="text">
<string/>
</property>
<property name="shortcut">
<string>Ctrl+1</string>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroup</string>
</attribute>
</widget>
</item>
<item row="2" column="0">
<widget class="QLineEdit" name="tx2"/>
</item>
<item row="2" column="1">
<widget class="QRadioButton" name="txrb2">
<property name="toolTip">
<string>Send this message in next Tx interval</string>
</property>
<property name="styleSheet">
<string notr="true">margin-left: 10%; margin-right: 0%</string>
</property>
<property name="text">
<string/>
</property>
<property name="shortcut">
<string>Ctrl+2</string>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroup</string>
</attribute>
</widget>
</item>
<item row="0" column="0">
<widget class="QPushButton" name="genStdMsgsPushButton">
<property name="toolTip">
<string>Generate standard messages for minimal QSO</string>
</property>
<property name="text">
<string>Generate Std Msgs</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLineEdit" name="tx4"/>
</item>
<item row="3" column="2">
<widget class="QPushButton" name="txb3">
<property name="toolTip">
<string>Switch to this Tx message NOW</string>
</property>
<property name="styleSheet">
<string notr="true">padding-left: 15%; padding-right: 15%; padding-top: 3%; padding-bottom: 3%</string>
</property>
<property name="text">
<string>Tx &amp;3</string>
</property>
<property name="shortcut">
<string>Alt+3</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLineEdit" name="tx6">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QRadioButton" name="txrb6"> <widget class="QRadioButton" name="txrb6">
<property name="toolTip"> <property name="toolTip">
<string>Send this message in next Tx interval</string> <string>Send this message in next Tx interval</string>
</property> </property>
<property name="styleSheet">
<string notr="true">margin-left: 10%; margin-right: 0%</string>
</property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
@ -1357,15 +1302,12 @@ list. The list can be maintained in Settings (F2).</string>
</item> </item>
<item row="6" column="2"> <item row="6" column="2">
<widget class="QPushButton" name="txb6"> <widget class="QPushButton" name="txb6">
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip"> <property name="toolTip">
<string>Switch to this Tx message NOW</string> <string>Switch to this Tx message NOW</string>
</property> </property>
<property name="styleSheet">
<string notr="true">padding-left: 15%; padding-right: 15%; padding-top: 3%; padding-bottom: 3%</string>
</property>
<property name="text"> <property name="text">
<string>Tx &amp;6</string> <string>Tx &amp;6</string>
</property> </property>
@ -1375,6 +1317,8 @@ list. The list can be maintained in Settings (F2).</string>
</widget> </widget>
</item> </item>
</layout> </layout>
</item>
</layout>
</widget> </widget>
<widget class="QWidget" name="tab_2"> <widget class="QWidget" name="tab_2">
<attribute name="title"> <attribute name="title">
@ -1395,8 +1339,8 @@ list. The list can be maintained in Settings (F2).</string>
</property> </property>
<item> <item>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_4">
<property name="spacing"> <property name="horizontalSpacing">
<number>2</number> <number>0</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_9"> <widget class="QLabel" name="label_9">

View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>799</width> <width>799</width>
<height>395</height> <height>337</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -34,6 +34,12 @@
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>400</width> <width>400</width>
@ -50,20 +56,6 @@
<number>1</number> <number>1</number>
</property> </property>
<widget class="QCheckBox" name="cbControls"> <widget class="QCheckBox" name="cbControls">
<property name="geometry">
<rect>
<x>9</x>
<y>10</y>
<width>60</width>
<height>17</height>
</rect>
</property>
<property name="maximumSize">
<size>
<width>65</width>
<height>16777215</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Controls</string> <string>Controls</string>
</property> </property>
@ -76,7 +68,7 @@
<item> <item>
<widget class="QWidget" name="controls_widget" native="true"> <widget class="QWidget" name="controls_widget" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>