mirror of
				https://github.com/saitohirga/WSJT-X.git
				synced 2025-10-31 13:10:19 -04:00 
			
		
		
		
	Add a "+ 2 kHz" checkbox under the Band selector.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3480 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
		
							parent
							
								
									d38ddd8b85
								
							
						
					
					
						commit
						48dd53f357
					
				
										
											Binary file not shown.
										
									
								
							| @ -446,6 +446,7 @@ void MainWindow::writeSettings() | ||||
|   settings.setValue("Fmin",m_fMin); | ||||
|   settings.setValue("TxSplit",m_bSplit); | ||||
|   settings.setValue("UseXIT",m_bXIT); | ||||
|   settings.setValue("Plus2kHz",m_plus2kHz); | ||||
|   settings.endGroup(); | ||||
| } | ||||
| 
 | ||||
| @ -593,6 +594,8 @@ void MainWindow::readSettings() | ||||
|   m_fMin=settings.value("fMin",2500).toInt(); | ||||
|   m_bSplit=settings.value("TxSplit",false).toBool(); | ||||
|   m_bXIT=settings.value("UseXit",false).toBool(); | ||||
|   m_plus2kHz=settings.value("Plus2kHz",false).toBool(); | ||||
|   ui->cbPlus2kHz->setChecked(m_plus2kHz); | ||||
|   settings.endGroup(); | ||||
| 
 | ||||
|   if(!ui->actionLinrad->isChecked() && !ui->actionCuteSDR->isChecked() && | ||||
| @ -2699,6 +2702,7 @@ void MainWindow::on_bandComboBox_activated(int index) | ||||
|   m_band=index; | ||||
|   QString t=m_dFreq[index]; | ||||
|   m_dialFreq=t.toDouble(); | ||||
|   if(m_plus2kHz) m_dialFreq+=0.002; | ||||
|   dialFreqChanged2(m_dialFreq); | ||||
|   m_repeatMsg=0; | ||||
|   m_secBandChanged=QDateTime::currentMSecsSinceEpoch()/1000; | ||||
| @ -3034,3 +3038,9 @@ void MainWindow::on_actionTx2QSO_triggered(bool checked) | ||||
| { | ||||
|   m_tx2QSO=checked; | ||||
| } | ||||
| 
 | ||||
| void MainWindow::on_cbPlus2kHz_toggled(bool checked) | ||||
| { | ||||
|   m_plus2kHz=checked; | ||||
|   on_bandComboBox_activated(m_band); | ||||
| } | ||||
|  | ||||
| @ -156,7 +156,8 @@ private slots: | ||||
|   void on_pbTxMode_clicked(); | ||||
|   void on_RxFreqSpinBox_valueChanged(int n); | ||||
|   void on_cbTxLock_clicked(bool checked); | ||||
|   void on_actionTx2QSO_triggered(bool checked); | ||||
|   void on_actionTx2QSO_triggered(bool checked);   | ||||
|   void on_cbPlus2kHz_toggled(bool checked); | ||||
| 
 | ||||
| private: | ||||
|     Ui::MainWindow *ui; | ||||
| @ -256,6 +257,7 @@ private: | ||||
|     bool    m_CATerror; | ||||
|     bool    m_bSplit; | ||||
|     bool    m_bXIT; | ||||
|     bool    m_plus2kHz; | ||||
| 
 | ||||
|     char    m_decoded[80]; | ||||
| 
 | ||||
|  | ||||
							
								
								
									
										139
									
								
								mainwindow.ui
									
									
									
									
									
								
							
							
						
						
									
										139
									
								
								mainwindow.ui
									
									
									
									
									
								
							| @ -642,7 +642,7 @@ p, li { white-space: pre-wrap; } | ||||
|         </property> | ||||
|         <property name="minimumSize"> | ||||
|          <size> | ||||
|           <width>0</width> | ||||
|           <width>140</width> | ||||
|           <height>30</height> | ||||
|          </size> | ||||
|         </property> | ||||
| @ -1493,71 +1493,10 @@ p, li { white-space: pre-wrap; } | ||||
|         </layout> | ||||
|        </widget> | ||||
|       </item> | ||||
|       <item row="1" column="1" rowspan="6"> | ||||
|        <widget class="QProgressBar" name="xThermo"> | ||||
|         <property name="sizePolicy"> | ||||
|          <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> | ||||
|           <horstretch>0</horstretch> | ||||
|           <verstretch>0</verstretch> | ||||
|          </sizepolicy> | ||||
|         </property> | ||||
|         <property name="minimumSize"> | ||||
|          <size> | ||||
|           <width>0</width> | ||||
|           <height>180</height> | ||||
|          </size> | ||||
|         </property> | ||||
|         <property name="maximumSize"> | ||||
|          <size> | ||||
|           <width>15</width> | ||||
|           <height>16777215</height> | ||||
|          </size> | ||||
|         </property> | ||||
|         <property name="maximum"> | ||||
|          <number>60</number> | ||||
|         </property> | ||||
|         <property name="value"> | ||||
|          <number>0</number> | ||||
|         </property> | ||||
|         <property name="textVisible"> | ||||
|          <bool>false</bool> | ||||
|         </property> | ||||
|         <property name="orientation"> | ||||
|          <enum>Qt::Vertical</enum> | ||||
|         </property> | ||||
|        </widget> | ||||
|       </item> | ||||
|       <item row="1" column="2" rowspan="6"> | ||||
|        <widget class="QSlider" name="inGain"> | ||||
|         <property name="sizePolicy"> | ||||
|          <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> | ||||
|           <horstretch>0</horstretch> | ||||
|           <verstretch>0</verstretch> | ||||
|          </sizepolicy> | ||||
|         </property> | ||||
|         <property name="minimumSize"> | ||||
|          <size> | ||||
|           <width>0</width> | ||||
|           <height>180</height> | ||||
|          </size> | ||||
|         </property> | ||||
|         <property name="maximumSize"> | ||||
|          <size> | ||||
|           <width>20</width> | ||||
|           <height>180</height> | ||||
|          </size> | ||||
|         </property> | ||||
|         <property name="toolTip"> | ||||
|          <string>Digital gain for audio input</string> | ||||
|         </property> | ||||
|         <property name="minimum"> | ||||
|          <number>-50</number> | ||||
|         </property> | ||||
|         <property name="maximum"> | ||||
|          <number>50</number> | ||||
|         </property> | ||||
|         <property name="orientation"> | ||||
|          <enum>Qt::Vertical</enum> | ||||
|       <item row="1" column="0" colspan="4"> | ||||
|        <widget class="QCheckBox" name="cbPlus2kHz"> | ||||
|         <property name="text"> | ||||
|          <string>  +2 kHz</string> | ||||
|         </property> | ||||
|        </widget> | ||||
|       </item> | ||||
| @ -1761,6 +1700,74 @@ p, li { white-space: pre-wrap; } | ||||
|         </property> | ||||
|        </widget> | ||||
|       </item> | ||||
|       <item row="2" column="1" rowspan="5"> | ||||
|        <widget class="QProgressBar" name="xThermo"> | ||||
|         <property name="sizePolicy"> | ||||
|          <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> | ||||
|           <horstretch>0</horstretch> | ||||
|           <verstretch>0</verstretch> | ||||
|          </sizepolicy> | ||||
|         </property> | ||||
|         <property name="minimumSize"> | ||||
|          <size> | ||||
|           <width>0</width> | ||||
|           <height>160</height> | ||||
|          </size> | ||||
|         </property> | ||||
|         <property name="maximumSize"> | ||||
|          <size> | ||||
|           <width>15</width> | ||||
|           <height>160</height> | ||||
|          </size> | ||||
|         </property> | ||||
|         <property name="maximum"> | ||||
|          <number>60</number> | ||||
|         </property> | ||||
|         <property name="value"> | ||||
|          <number>0</number> | ||||
|         </property> | ||||
|         <property name="textVisible"> | ||||
|          <bool>false</bool> | ||||
|         </property> | ||||
|         <property name="orientation"> | ||||
|          <enum>Qt::Vertical</enum> | ||||
|         </property> | ||||
|        </widget> | ||||
|       </item> | ||||
|       <item row="2" column="2" rowspan="5"> | ||||
|        <widget class="QSlider" name="inGain"> | ||||
|         <property name="sizePolicy"> | ||||
|          <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> | ||||
|           <horstretch>0</horstretch> | ||||
|           <verstretch>0</verstretch> | ||||
|          </sizepolicy> | ||||
|         </property> | ||||
|         <property name="minimumSize"> | ||||
|          <size> | ||||
|           <width>0</width> | ||||
|           <height>160</height> | ||||
|          </size> | ||||
|         </property> | ||||
|         <property name="maximumSize"> | ||||
|          <size> | ||||
|           <width>20</width> | ||||
|           <height>160</height> | ||||
|          </size> | ||||
|         </property> | ||||
|         <property name="toolTip"> | ||||
|          <string>Digital gain for audio input</string> | ||||
|         </property> | ||||
|         <property name="minimum"> | ||||
|          <number>-50</number> | ||||
|         </property> | ||||
|         <property name="maximum"> | ||||
|          <number>50</number> | ||||
|         </property> | ||||
|         <property name="orientation"> | ||||
|          <enum>Qt::Vertical</enum> | ||||
|         </property> | ||||
|        </widget> | ||||
|       </item> | ||||
|       <item row="2" column="4"> | ||||
|        <widget class="QLineEdit" name="dxCallEntry"> | ||||
|         <property name="sizePolicy"> | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user