mirror of https://github.com/saitohirga/WSJT-X.git
1. Correct a flaw in setting m_lockFreq in wideGraph.
2. Double-click on a 73 message sets Tx5, rather than Tx6. 3. Clean up a few remaining compiler warnings. 4. Clean up Tab order. 5. Updates to User's Guide git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3320 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor
parent
fc5d05394e
commit
b0c2eb69ed
Binary file not shown.
|
|
@ -12,7 +12,8 @@ CAboutDlg::CAboutDlg(QWidget *parent, QString Revision) :
|
|||
m_Str += "WSJT-X implements experimental mode JT9 for <br>";
|
||||
m_Str += "Amateur Radio communication at HF, MF, and LF. <br><br>";
|
||||
m_Str += "Copyright 2001-2013 by Joe Taylor, K1JT. Additional <br>";
|
||||
m_Str += "contributions from AE4JY, PY2SDR, VK4BDJ, and AC6SL. <br>";
|
||||
m_Str += "contributions from AC6SL, AE4JY, G4KLA, PY2SDR, <br>";
|
||||
m_Str += "and VK4BDJ.<br>";
|
||||
ui->labelTxt->setText(m_Str);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -83,7 +83,8 @@ void DevSetup::initDlg()
|
|||
Pa_GetHostApiInfo(pdi->hostApi)->name);
|
||||
|
||||
#ifdef WIN32
|
||||
// Needs work to compile for Linux
|
||||
char *p,*p1;
|
||||
char p2[50];
|
||||
p1=(char*)"";
|
||||
p=strstr(pa_device_hostapi,"MME");
|
||||
if(p!=NULL) p1=(char*)"MME";
|
||||
|
|
|
|||
45
devsetup.ui
45
devsetup.ui
|
|
@ -2449,37 +2449,38 @@
|
|||
<tabstop>rbMic</tabstop>
|
||||
<tabstop>testCATButton</tabstop>
|
||||
<tabstop>testPTTButton</tabstop>
|
||||
<tabstop>pollSpinBox</tabstop>
|
||||
<tabstop>comboBoxSndIn</tabstop>
|
||||
<tabstop>comboBoxSndOut</tabstop>
|
||||
<tabstop>saveDirEntry</tabstop>
|
||||
<tabstop>macro1</tabstop>
|
||||
<tabstop>macro2</tabstop>
|
||||
<tabstop>macro3</tabstop>
|
||||
<tabstop>macro4</tabstop>
|
||||
<tabstop>macro5</tabstop>
|
||||
<tabstop>macro6</tabstop>
|
||||
<tabstop>macro7</tabstop>
|
||||
<tabstop>macro8</tabstop>
|
||||
<tabstop>macro9</tabstop>
|
||||
<tabstop>macro10</tabstop>
|
||||
<tabstop>f1</tabstop>
|
||||
<tabstop>f2</tabstop>
|
||||
<tabstop>f3</tabstop>
|
||||
<tabstop>f4</tabstop>
|
||||
<tabstop>f5</tabstop>
|
||||
<tabstop>f6</tabstop>
|
||||
<tabstop>f7</tabstop>
|
||||
<tabstop>f8</tabstop>
|
||||
<tabstop>f9</tabstop>
|
||||
<tabstop>f10</tabstop>
|
||||
<tabstop>f11</tabstop>
|
||||
<tabstop>f12</tabstop>
|
||||
<tabstop>f13</tabstop>
|
||||
<tabstop>f14</tabstop>
|
||||
<tabstop>f15</tabstop>
|
||||
<tabstop>f16</tabstop>
|
||||
<tabstop>macro2</tabstop>
|
||||
<tabstop>buttonBox</tabstop>
|
||||
<tabstop>macro7</tabstop>
|
||||
<tabstop>macro5</tabstop>
|
||||
<tabstop>macro6</tabstop>
|
||||
<tabstop>ioTabWidget</tabstop>
|
||||
<tabstop>f12</tabstop>
|
||||
<tabstop>f11</tabstop>
|
||||
<tabstop>macro4</tabstop>
|
||||
<tabstop>macro1</tabstop>
|
||||
<tabstop>macro3</tabstop>
|
||||
<tabstop>f10</tabstop>
|
||||
<tabstop>macro10</tabstop>
|
||||
<tabstop>macro8</tabstop>
|
||||
<tabstop>macro9</tabstop>
|
||||
<tabstop>f1</tabstop>
|
||||
<tabstop>f4</tabstop>
|
||||
<tabstop>f2</tabstop>
|
||||
<tabstop>f8</tabstop>
|
||||
<tabstop>f5</tabstop>
|
||||
<tabstop>f9</tabstop>
|
||||
<tabstop>f3</tabstop>
|
||||
<tabstop>f6</tabstop>
|
||||
<tabstop>f7</tabstop>
|
||||
</tabstops>
|
||||
<resources/>
|
||||
<connections>
|
||||
|
|
|
|||
|
|
@ -237,6 +237,7 @@ MainWindow::MainWindow(QSharedMemory *shdmem, QWidget *parent) :
|
|||
genStdMsgs(m_rpt);
|
||||
on_actionWide_Waterfall_triggered(); //###
|
||||
g_pWideGraph->setTxFreq(m_txFreq);
|
||||
g_pWideGraph->m_lockTxFreq=m_lockTxFreq;
|
||||
|
||||
if(m_mode=="JT9-1") on_actionJT9_1_triggered();
|
||||
if(m_mode=="JT9-2") on_actionJT9_2_triggered();
|
||||
|
|
@ -1947,8 +1948,9 @@ void MainWindow::doubleClickOnCall(bool shift, bool ctrl)
|
|||
QString firstcall=t4.at(4);
|
||||
// Don't change Tx freq if a station is calling me, unless m_lockTxFreq
|
||||
// is true or CTRL is held down or
|
||||
if((firstcall!=m_myCall) or m_lockTxFreq or ctrl)
|
||||
if((firstcall!=m_myCall) or m_lockTxFreq or ctrl) {
|
||||
ui->TxFreqSpinBox->setValue(nfreq);
|
||||
}
|
||||
QString hiscall=t4.at(5);
|
||||
QString hisgrid="";
|
||||
if(t4.length()>=7)
|
||||
|
|
@ -2001,10 +2003,10 @@ void MainWindow::doubleClickOnCall(bool shift, bool ctrl)
|
|||
ui->rbGenMsg->setChecked(true);
|
||||
}
|
||||
} else if(r.toInt()==73) {
|
||||
m_ntx=6;
|
||||
ui->txrb6->setChecked(true);
|
||||
m_ntx=5;
|
||||
ui->txrb5->setChecked(true);
|
||||
if(ui->tabWidget->currentIndex()==1) {
|
||||
ui->genMsg->setText(ui->tx6->text());
|
||||
ui->genMsg->setText(ui->tx5->text());
|
||||
m_ntx=7;
|
||||
ui->rbGenMsg->setChecked(true);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2884,7 +2884,12 @@ p, li { white-space: pre-wrap; }
|
|||
<tabstop>EraseButton</tabstop>
|
||||
<tabstop>autoButton</tabstop>
|
||||
<tabstop>stopTxButton</tabstop>
|
||||
<tabstop>tuneButton</tabstop>
|
||||
<tabstop>bandComboBox</tabstop>
|
||||
<tabstop>readFreq</tabstop>
|
||||
<tabstop>inGain</tabstop>
|
||||
<tabstop>dxCallEntry</tabstop>
|
||||
<tabstop>dxGridEntry</tabstop>
|
||||
<tabstop>lookupButton</tabstop>
|
||||
<tabstop>addButton</tabstop>
|
||||
<tabstop>txFirstCheckBox</tabstop>
|
||||
|
|
@ -2892,13 +2897,7 @@ p, li { white-space: pre-wrap; }
|
|||
<tabstop>pbR2T</tabstop>
|
||||
<tabstop>pbT2R</tabstop>
|
||||
<tabstop>rptSpinBox</tabstop>
|
||||
<tabstop>pbCallCQ</tabstop>
|
||||
<tabstop>pbAnswerCaller</tabstop>
|
||||
<tabstop>pbSendRRR</tabstop>
|
||||
<tabstop>genMsg</tabstop>
|
||||
<tabstop>freeTextMsg</tabstop>
|
||||
<tabstop>rbGenMsg</tabstop>
|
||||
<tabstop>rbFreeText</tabstop>
|
||||
<tabstop>tabWidget</tabstop>
|
||||
<tabstop>genStdMsgsPushButton</tabstop>
|
||||
<tabstop>tx1</tabstop>
|
||||
<tabstop>tx2</tabstop>
|
||||
|
|
@ -2918,9 +2917,18 @@ p, li { white-space: pre-wrap; }
|
|||
<tabstop>txb4</tabstop>
|
||||
<tabstop>txb5</tabstop>
|
||||
<tabstop>txb6</tabstop>
|
||||
<tabstop>inGain</tabstop>
|
||||
<tabstop>decodedTextBrowser2</tabstop>
|
||||
<tabstop>decodedTextBrowser</tabstop>
|
||||
<tabstop>decodedTextBrowser2</tabstop>
|
||||
<tabstop>pbCallCQ</tabstop>
|
||||
<tabstop>rbFreeText</tabstop>
|
||||
<tabstop>genMsg</tabstop>
|
||||
<tabstop>rbGenMsg</tabstop>
|
||||
<tabstop>pbAnswerCQ</tabstop>
|
||||
<tabstop>pbSendReport</tabstop>
|
||||
<tabstop>pbSend73</tabstop>
|
||||
<tabstop>pbSendRRR</tabstop>
|
||||
<tabstop>pbAnswerCaller</tabstop>
|
||||
<tabstop>freeTextMsg</tabstop>
|
||||
</tabstops>
|
||||
<resources/>
|
||||
<connections>
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ void SoundOutThread::run()
|
|||
|
||||
outParam.device=m_nDevOut; //Output device number
|
||||
outParam.channelCount=1; //Number of analog channels
|
||||
#ifdef unix
|
||||
#ifdef UNIX
|
||||
outParam.channelCount=2; //Number of analog channels
|
||||
#endif
|
||||
outParam.sampleFormat=paInt16; //Send short ints to PortAudio
|
||||
|
|
|
|||
Loading…
Reference in New Issue