diff --git a/WSJT-X_Users_Guide.docx b/WSJT-X_Users_Guide.docx
index f03482538..cde4669ba 100644
Binary files a/WSJT-X_Users_Guide.docx and b/WSJT-X_Users_Guide.docx differ
diff --git a/about.cpp b/about.cpp
index 8b6dc245b..d8b2c7dfb 100644
--- a/about.cpp
+++ b/about.cpp
@@ -12,7 +12,8 @@ CAboutDlg::CAboutDlg(QWidget *parent, QString Revision) :
m_Str += "WSJT-X implements experimental mode JT9 for
";
m_Str += "Amateur Radio communication at HF, MF, and LF.
";
m_Str += "Copyright 2001-2013 by Joe Taylor, K1JT. Additional
";
- m_Str += "contributions from AE4JY, PY2SDR, VK4BDJ, and AC6SL.
";
+ m_Str += "contributions from AC6SL, AE4JY, G4KLA, PY2SDR,
";
+ m_Str += "and VK4BDJ.
";
ui->labelTxt->setText(m_Str);
}
diff --git a/devsetup.cpp b/devsetup.cpp
index 5c517f51c..9407621a1 100644
--- a/devsetup.cpp
+++ b/devsetup.cpp
@@ -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";
diff --git a/devsetup.ui b/devsetup.ui
index b32ad8a5b..d9ef4ee46 100644
--- a/devsetup.ui
+++ b/devsetup.ui
@@ -2449,37 +2449,38 @@
rbMic
testCATButton
testPTTButton
+ pollSpinBox
comboBoxSndIn
comboBoxSndOut
saveDirEntry
+ macro1
+ macro2
+ macro3
+ macro4
+ macro5
+ macro6
+ macro7
+ macro8
+ macro9
+ macro10
+ f1
+ f2
+ f3
+ f4
+ f5
+ f6
+ f7
+ f8
+ f9
+ f10
+ f11
+ f12
f13
f14
f15
f16
- macro2
buttonBox
- macro7
- macro5
- macro6
ioTabWidget
- f12
- f11
- macro4
- macro1
- macro3
- f10
- macro10
- macro8
- macro9
- f1
- f4
- f2
- f8
- f5
- f9
- f3
- f6
- f7
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 3d8c28837..25c2ddcb4 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -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);
}
diff --git a/mainwindow.ui b/mainwindow.ui
index d1d3f52bd..06cddc62d 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -2884,7 +2884,12 @@ p, li { white-space: pre-wrap; }
EraseButton
autoButton
stopTxButton
+ tuneButton
bandComboBox
+ readFreq
+ inGain
+ dxCallEntry
+ dxGridEntry
lookupButton
addButton
txFirstCheckBox
@@ -2892,13 +2897,7 @@ p, li { white-space: pre-wrap; }
pbR2T
pbT2R
rptSpinBox
- pbCallCQ
- pbAnswerCaller
- pbSendRRR
- genMsg
- freeTextMsg
- rbGenMsg
- rbFreeText
+ tabWidget
genStdMsgsPushButton
tx1
tx2
@@ -2918,9 +2917,18 @@ p, li { white-space: pre-wrap; }
txb4
txb5
txb6
- inGain
- decodedTextBrowser2
decodedTextBrowser
+ decodedTextBrowser2
+ pbCallCQ
+ rbFreeText
+ genMsg
+ rbGenMsg
+ pbAnswerCQ
+ pbSendReport
+ pbSend73
+ pbSendRRR
+ pbAnswerCaller
+ freeTextMsg
diff --git a/soundout.cpp b/soundout.cpp
index 188675d0a..ca9614bfe 100644
--- a/soundout.cpp
+++ b/soundout.cpp
@@ -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
diff --git a/wsjtx.iss b/wsjtx.iss
index f1c87ab83..25e73e763 100644
--- a/wsjtx.iss
+++ b/wsjtx.iss
@@ -1,6 +1,6 @@
[Setup]
AppName=wsjtx
-AppVerName=wsjtx Version 0.99 r3313
+AppVerName=wsjtx Version 1.0.0 r3320
AppCopyright=Copyright (C) 2001-2013 by Joe Taylor, K1JT
DefaultDirName=c:\wsjtx
DefaultGroupName=wsjtx