mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-15 00:21:56 -05:00
1. Added Linux serial devices to serial devices selector
2. Fixed bug with default number of serial stop bits 3. Adjusted layout on setup dialog git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3096 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
12a6996907
commit
cff342420f
25
about.ui
25
about.ui
@ -22,19 +22,18 @@
|
|||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>About MAP65</string>
|
<string>About MAP65</string>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QLabel" name="labelTxt">
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
<property name="geometry">
|
<item>
|
||||||
<rect>
|
<widget class="QLabel" name="labelTxt">
|
||||||
<x>20</x>
|
<property name="text">
|
||||||
<y>10</y>
|
<string/>
|
||||||
<width>331</width>
|
</property>
|
||||||
<height>131</height>
|
<property name="alignment">
|
||||||
</rect>
|
<set>Qt::AlignCenter</set>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
</widget>
|
||||||
<string/>
|
</item>
|
||||||
</property>
|
</layout>
|
||||||
</widget>
|
|
||||||
</widget>
|
</widget>
|
||||||
<resources/>
|
<resources/>
|
||||||
<connections/>
|
<connections/>
|
||||||
|
3182
devsetup.ui
3182
devsetup.ui
File diff suppressed because it is too large
Load Diff
@ -434,7 +434,7 @@ void MainWindow::readSettings()
|
|||||||
m_serialRateIndex=settings.value("SerialRateIndex",1).toInt();
|
m_serialRateIndex=settings.value("SerialRateIndex",1).toInt();
|
||||||
m_dataBits=settings.value("DataBits",8).toInt();
|
m_dataBits=settings.value("DataBits",8).toInt();
|
||||||
m_dataBitsIndex=settings.value("DataBitsIndex",1).toInt();
|
m_dataBitsIndex=settings.value("DataBitsIndex",1).toInt();
|
||||||
m_stopBits=settings.value("StopBits",8).toInt();
|
m_stopBits=settings.value("StopBits",2).toInt();
|
||||||
m_stopBitsIndex=settings.value("StopBitsIndex",1).toInt();
|
m_stopBitsIndex=settings.value("StopBitsIndex",1).toInt();
|
||||||
m_handshake=settings.value("Handshake","None").toString();
|
m_handshake=settings.value("Handshake","None").toString();
|
||||||
m_handshakeIndex=settings.value("HandshakeIndex",0).toInt();
|
m_handshakeIndex=settings.value("HandshakeIndex",0).toInt();
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>686</width>
|
<width>680</width>
|
||||||
<height>598</height>
|
<height>598</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
@ -18,13 +18,13 @@
|
|||||||
</property>
|
</property>
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>686</width>
|
<width>680</width>
|
||||||
<height>475</height>
|
<height>475</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="maximumSize">
|
<property name="maximumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>686</width>
|
<width>680</width>
|
||||||
<height>1028</height>
|
<height>1028</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
@ -322,14 +322,14 @@ p, li { white-space: pre-wrap; }
|
|||||||
<item row="3" column="9">
|
<item row="3" column="9">
|
||||||
<widget class="QLineEdit" name="tx3">
|
<widget class="QLineEdit" name="tx3">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
|
||||||
<horstretch>160</horstretch>
|
<horstretch>160</horstretch>
|
||||||
<verstretch>0</verstretch>
|
<verstretch>0</verstretch>
|
||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>180</width>
|
<width>100</width>
|
||||||
<height>24</height>
|
<height>24</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
@ -799,14 +799,14 @@ p, li { white-space: pre-wrap; }
|
|||||||
<item row="6" column="9">
|
<item row="6" column="9">
|
||||||
<widget class="QLineEdit" name="tx6">
|
<widget class="QLineEdit" name="tx6">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
|
||||||
<horstretch>160</horstretch>
|
<horstretch>160</horstretch>
|
||||||
<verstretch>0</verstretch>
|
<verstretch>0</verstretch>
|
||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>180</width>
|
<width>100</width>
|
||||||
<height>24</height>
|
<height>24</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
@ -991,14 +991,14 @@ p, li { white-space: pre-wrap; }
|
|||||||
<item row="1" column="9">
|
<item row="1" column="9">
|
||||||
<widget class="QLineEdit" name="tx1">
|
<widget class="QLineEdit" name="tx1">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
|
||||||
<horstretch>160</horstretch>
|
<horstretch>160</horstretch>
|
||||||
<verstretch>0</verstretch>
|
<verstretch>0</verstretch>
|
||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>180</width>
|
<width>100</width>
|
||||||
<height>24</height>
|
<height>24</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
@ -1106,14 +1106,14 @@ p, li { white-space: pre-wrap; }
|
|||||||
<item row="5" column="9">
|
<item row="5" column="9">
|
||||||
<widget class="QLineEdit" name="tx5">
|
<widget class="QLineEdit" name="tx5">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
|
||||||
<horstretch>160</horstretch>
|
<horstretch>160</horstretch>
|
||||||
<verstretch>0</verstretch>
|
<verstretch>0</verstretch>
|
||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>180</width>
|
<width>100</width>
|
||||||
<height>24</height>
|
<height>24</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
@ -1122,14 +1122,14 @@ p, li { white-space: pre-wrap; }
|
|||||||
<item row="4" column="9">
|
<item row="4" column="9">
|
||||||
<widget class="QLineEdit" name="tx4">
|
<widget class="QLineEdit" name="tx4">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
|
||||||
<horstretch>160</horstretch>
|
<horstretch>160</horstretch>
|
||||||
<verstretch>0</verstretch>
|
<verstretch>0</verstretch>
|
||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>180</width>
|
<width>100</width>
|
||||||
<height>24</height>
|
<height>24</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
@ -1151,14 +1151,14 @@ p, li { white-space: pre-wrap; }
|
|||||||
<item row="2" column="9">
|
<item row="2" column="9">
|
||||||
<widget class="QLineEdit" name="tx2">
|
<widget class="QLineEdit" name="tx2">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
|
||||||
<horstretch>160</horstretch>
|
<horstretch>160</horstretch>
|
||||||
<verstretch>0</verstretch>
|
<verstretch>0</verstretch>
|
||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>180</width>
|
<width>100</width>
|
||||||
<height>24</height>
|
<height>24</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
@ -1172,9 +1172,15 @@ p, li { white-space: pre-wrap; }
|
|||||||
<verstretch>0</verstretch>
|
<verstretch>0</verstretch>
|
||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>100</width>
|
||||||
|
<height>0</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
<property name="maximumSize">
|
<property name="maximumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>200</width>
|
<width>16777215</width>
|
||||||
<height>16777215</height>
|
<height>16777215</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
@ -1629,7 +1635,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>686</width>
|
<width>680</width>
|
||||||
<height>21</height>
|
<height>21</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
|
Loading…
Reference in New Issue
Block a user