mirror of
				https://github.com/saitohirga/WSJT-X.git
				synced 2025-11-04 05:50:31 -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
							
								
									b13ba9b9ee
								
							
						
					
					
						commit
						23a65ea2f3
					
				
							
								
								
									
										25
									
								
								about.ui
									
									
									
									
									
								
							
							
						
						
									
										25
									
								
								about.ui
									
									
									
									
									
								
							@ -22,19 +22,18 @@
 | 
			
		||||
  <property name="windowTitle">
 | 
			
		||||
   <string>About MAP65</string>
 | 
			
		||||
  </property>
 | 
			
		||||
  <widget class="QLabel" name="labelTxt">
 | 
			
		||||
   <property name="geometry">
 | 
			
		||||
    <rect>
 | 
			
		||||
     <x>20</x>
 | 
			
		||||
     <y>10</y>
 | 
			
		||||
     <width>331</width>
 | 
			
		||||
     <height>131</height>
 | 
			
		||||
    </rect>
 | 
			
		||||
   </property>
 | 
			
		||||
   <property name="text">
 | 
			
		||||
    <string/>
 | 
			
		||||
   </property>
 | 
			
		||||
  </widget>
 | 
			
		||||
  <layout class="QVBoxLayout" name="verticalLayout">
 | 
			
		||||
   <item>
 | 
			
		||||
    <widget class="QLabel" name="labelTxt">
 | 
			
		||||
     <property name="text">
 | 
			
		||||
      <string/>
 | 
			
		||||
     </property>
 | 
			
		||||
     <property name="alignment">
 | 
			
		||||
      <set>Qt::AlignCenter</set>
 | 
			
		||||
     </property>
 | 
			
		||||
    </widget>
 | 
			
		||||
   </item>
 | 
			
		||||
  </layout>
 | 
			
		||||
 </widget>
 | 
			
		||||
 <resources/>
 | 
			
		||||
 <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_dataBits=settings.value("DataBits",8).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_handshake=settings.value("Handshake","None").toString();
 | 
			
		||||
  m_handshakeIndex=settings.value("HandshakeIndex",0).toInt();
 | 
			
		||||
 | 
			
		||||
@ -6,7 +6,7 @@
 | 
			
		||||
   <rect>
 | 
			
		||||
    <x>0</x>
 | 
			
		||||
    <y>0</y>
 | 
			
		||||
    <width>686</width>
 | 
			
		||||
    <width>680</width>
 | 
			
		||||
    <height>598</height>
 | 
			
		||||
   </rect>
 | 
			
		||||
  </property>
 | 
			
		||||
@ -18,13 +18,13 @@
 | 
			
		||||
  </property>
 | 
			
		||||
  <property name="minimumSize">
 | 
			
		||||
   <size>
 | 
			
		||||
    <width>686</width>
 | 
			
		||||
    <width>680</width>
 | 
			
		||||
    <height>475</height>
 | 
			
		||||
   </size>
 | 
			
		||||
  </property>
 | 
			
		||||
  <property name="maximumSize">
 | 
			
		||||
   <size>
 | 
			
		||||
    <width>686</width>
 | 
			
		||||
    <width>680</width>
 | 
			
		||||
    <height>1028</height>
 | 
			
		||||
   </size>
 | 
			
		||||
  </property>
 | 
			
		||||
@ -322,14 +322,14 @@ p, li { white-space: pre-wrap; }
 | 
			
		||||
        <item row="3" column="9">
 | 
			
		||||
         <widget class="QLineEdit" name="tx3">
 | 
			
		||||
          <property name="sizePolicy">
 | 
			
		||||
           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
 | 
			
		||||
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
 | 
			
		||||
            <horstretch>160</horstretch>
 | 
			
		||||
            <verstretch>0</verstretch>
 | 
			
		||||
           </sizepolicy>
 | 
			
		||||
          </property>
 | 
			
		||||
          <property name="minimumSize">
 | 
			
		||||
           <size>
 | 
			
		||||
            <width>180</width>
 | 
			
		||||
            <width>100</width>
 | 
			
		||||
            <height>24</height>
 | 
			
		||||
           </size>
 | 
			
		||||
          </property>
 | 
			
		||||
@ -799,14 +799,14 @@ p, li { white-space: pre-wrap; }
 | 
			
		||||
        <item row="6" column="9">
 | 
			
		||||
         <widget class="QLineEdit" name="tx6">
 | 
			
		||||
          <property name="sizePolicy">
 | 
			
		||||
           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
 | 
			
		||||
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
 | 
			
		||||
            <horstretch>160</horstretch>
 | 
			
		||||
            <verstretch>0</verstretch>
 | 
			
		||||
           </sizepolicy>
 | 
			
		||||
          </property>
 | 
			
		||||
          <property name="minimumSize">
 | 
			
		||||
           <size>
 | 
			
		||||
            <width>180</width>
 | 
			
		||||
            <width>100</width>
 | 
			
		||||
            <height>24</height>
 | 
			
		||||
           </size>
 | 
			
		||||
          </property>
 | 
			
		||||
@ -991,14 +991,14 @@ p, li { white-space: pre-wrap; }
 | 
			
		||||
        <item row="1" column="9">
 | 
			
		||||
         <widget class="QLineEdit" name="tx1">
 | 
			
		||||
          <property name="sizePolicy">
 | 
			
		||||
           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
 | 
			
		||||
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
 | 
			
		||||
            <horstretch>160</horstretch>
 | 
			
		||||
            <verstretch>0</verstretch>
 | 
			
		||||
           </sizepolicy>
 | 
			
		||||
          </property>
 | 
			
		||||
          <property name="minimumSize">
 | 
			
		||||
           <size>
 | 
			
		||||
            <width>180</width>
 | 
			
		||||
            <width>100</width>
 | 
			
		||||
            <height>24</height>
 | 
			
		||||
           </size>
 | 
			
		||||
          </property>
 | 
			
		||||
@ -1106,14 +1106,14 @@ p, li { white-space: pre-wrap; }
 | 
			
		||||
        <item row="5" column="9">
 | 
			
		||||
         <widget class="QLineEdit" name="tx5">
 | 
			
		||||
          <property name="sizePolicy">
 | 
			
		||||
           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
 | 
			
		||||
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
 | 
			
		||||
            <horstretch>160</horstretch>
 | 
			
		||||
            <verstretch>0</verstretch>
 | 
			
		||||
           </sizepolicy>
 | 
			
		||||
          </property>
 | 
			
		||||
          <property name="minimumSize">
 | 
			
		||||
           <size>
 | 
			
		||||
            <width>180</width>
 | 
			
		||||
            <width>100</width>
 | 
			
		||||
            <height>24</height>
 | 
			
		||||
           </size>
 | 
			
		||||
          </property>
 | 
			
		||||
@ -1122,14 +1122,14 @@ p, li { white-space: pre-wrap; }
 | 
			
		||||
        <item row="4" column="9">
 | 
			
		||||
         <widget class="QLineEdit" name="tx4">
 | 
			
		||||
          <property name="sizePolicy">
 | 
			
		||||
           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
 | 
			
		||||
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
 | 
			
		||||
            <horstretch>160</horstretch>
 | 
			
		||||
            <verstretch>0</verstretch>
 | 
			
		||||
           </sizepolicy>
 | 
			
		||||
          </property>
 | 
			
		||||
          <property name="minimumSize">
 | 
			
		||||
           <size>
 | 
			
		||||
            <width>180</width>
 | 
			
		||||
            <width>100</width>
 | 
			
		||||
            <height>24</height>
 | 
			
		||||
           </size>
 | 
			
		||||
          </property>
 | 
			
		||||
@ -1151,14 +1151,14 @@ p, li { white-space: pre-wrap; }
 | 
			
		||||
        <item row="2" column="9">
 | 
			
		||||
         <widget class="QLineEdit" name="tx2">
 | 
			
		||||
          <property name="sizePolicy">
 | 
			
		||||
           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
 | 
			
		||||
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
 | 
			
		||||
            <horstretch>160</horstretch>
 | 
			
		||||
            <verstretch>0</verstretch>
 | 
			
		||||
           </sizepolicy>
 | 
			
		||||
          </property>
 | 
			
		||||
          <property name="minimumSize">
 | 
			
		||||
           <size>
 | 
			
		||||
            <width>180</width>
 | 
			
		||||
            <width>100</width>
 | 
			
		||||
            <height>24</height>
 | 
			
		||||
           </size>
 | 
			
		||||
          </property>
 | 
			
		||||
@ -1172,9 +1172,15 @@ p, li { white-space: pre-wrap; }
 | 
			
		||||
            <verstretch>0</verstretch>
 | 
			
		||||
           </sizepolicy>
 | 
			
		||||
          </property>
 | 
			
		||||
          <property name="minimumSize">
 | 
			
		||||
           <size>
 | 
			
		||||
            <width>100</width>
 | 
			
		||||
            <height>0</height>
 | 
			
		||||
           </size>
 | 
			
		||||
          </property>
 | 
			
		||||
          <property name="maximumSize">
 | 
			
		||||
           <size>
 | 
			
		||||
            <width>200</width>
 | 
			
		||||
            <width>16777215</width>
 | 
			
		||||
            <height>16777215</height>
 | 
			
		||||
           </size>
 | 
			
		||||
          </property>
 | 
			
		||||
@ -1629,7 +1635,7 @@ p, li { white-space: pre-wrap; }
 | 
			
		||||
    <rect>
 | 
			
		||||
     <x>0</x>
 | 
			
		||||
     <y>0</y>
 | 
			
		||||
     <width>686</width>
 | 
			
		||||
     <width>680</width>
 | 
			
		||||
     <height>21</height>
 | 
			
		||||
    </rect>
 | 
			
		||||
   </property>
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user