diff --git a/WSJT-X_Users_Guide.docx b/WSJT-X_Users_Guide.docx
index ac3fc4625..6f9084a85 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 fa1842fa1..82ab9bf7f 100644
--- a/about.cpp
+++ b/about.cpp
@@ -12,7 +12,7 @@ CAboutDlg::CAboutDlg(QWidget *parent, QString Revision) :
m_Str += "WSJT-X implements experimental mode JT9 for
";
m_Str += "Amateur Radio communication at MF and LF.
";
m_Str += "Copyright 2001-2013 by Joe Taylor, K1JT. Additional
";
- m_Str += "acknowledgments are contained in the source code.
";
+ m_Str += "contributions from PY2SDR, VK4BDJ, and AC6SL.
";
ui->labelTxt->setText(m_Str);
}
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 3aa84628b..d79b19208 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -862,7 +862,7 @@ void MainWindow::dialFreqChanged2(double f)
t.sprintf("%.6f",m_dialFreq);
int n=t.length();
t=t.mid(0,n-3) + " " + t.mid(n-3,3);
- if(qAbs(m_dialFreq-dFreq[m_band])<0.01) {
+ if(qAbs(m_dialFreq-dFreq[m_band])<0.1) {
ui->labDialFreq->setStyleSheet( \
"QLabel { background-color : black; color : yellow; }");
} else {
@@ -1897,13 +1897,51 @@ void MainWindow::doubleClickOnCall(bool shift, bool ctrl)
ui->rptSpinBox->setValue(rpt.toInt());
genStdMsgs(rpt);
if(t2.indexOf(m_myCall)>=0) {
- m_ntx=2;
- ui->txrb2->setChecked(true);
- if(ui->tabWidget->currentIndex()==1) {
- ui->genMsg->setText(ui->tx2->text());
- m_ntx=7;
- ui->rbGenMsg->setChecked(true);
+ if(t4.length()>=7 and !gridOK(t4.at(6))) {
+ QString r=t4.at(6);
+ if(r.mid(0,3)=="RRR") {
+ m_ntx=5;
+ ui->txrb5->setChecked(true);
+ if(ui->tabWidget->currentIndex()==1) {
+ ui->genMsg->setText(ui->tx5->text());
+ m_ntx=7;
+ ui->rbGenMsg->setChecked(true);
+ }
+ } else if(r.mid(0,1)=="R") {
+ m_ntx=4;
+ ui->txrb4->setChecked(true);
+ if(ui->tabWidget->currentIndex()==1) {
+ ui->genMsg->setText(ui->tx4->text());
+ m_ntx=7;
+ ui->rbGenMsg->setChecked(true);
+ }
+ } else if(r.toInt()>=-50 and r.toInt()<=49) {
+ m_ntx=3;
+ ui->txrb3->setChecked(true);
+ if(ui->tabWidget->currentIndex()==1) {
+ ui->genMsg->setText(ui->tx3->text());
+ m_ntx=7;
+ ui->rbGenMsg->setChecked(true);
+ }
+ } else if(r.toInt()==73) {
+ m_ntx=6;
+ ui->txrb6->setChecked(true);
+ if(ui->tabWidget->currentIndex()==1) {
+ ui->genMsg->setText(ui->tx6->text());
+ m_ntx=7;
+ ui->rbGenMsg->setChecked(true);
+ }
+ }
+ } else {
+ m_ntx=2;
+ ui->txrb2->setChecked(true);
+ if(ui->tabWidget->currentIndex()==1) {
+ ui->genMsg->setText(ui->tx2->text());
+ m_ntx=7;
+ ui->rbGenMsg->setChecked(true);
+ }
}
+
} else {
m_ntx=1;
ui->txrb1->setChecked(true);
diff --git a/wsjtx_changelog.txt b/wsjtx_changelog.txt
index 8031a221f..bf7d56645 100644
--- a/wsjtx_changelog.txt
+++ b/wsjtx_changelog.txt
@@ -4,19 +4,20 @@
We are getting close to a stable "Version 1.0" release of WSJT-X. At
that point program features will be frozen temporarily while we
concentrate on any necessary bug fixes. If you have bug reports on
-version 0.95 r3226, or very important feature requests, send them to
-wsjtgroup@yahoogroups.com now!
+version 0.95 r3242, or important feature requests, send them to us
+at wsjtgroup@yahoogroups.com now!
-April 25, 2013: v0.95, r3226
+April 29, 2013: v0.95, r3242
----------------------------
-1. Bi-directionsl CAT control re-established using calls to hamlib
-functions. Display dial frequency highlighted with red background if
-frequency differs from nominal for the selected band by more than 10
-kHz. (Is there a more useful or logical condition to flag?) Mode is
-set to USB when rig is opened in main window. (Note: CAT control
-diagnostics are presently rather rudimentary, we're still working on
-this. Feedback is welcome!)
+1. Now has bi-directionsl CAT control using direct calls to hamlib
+ functions. Highlights displayed dial frequency with red background
+ if frequency differs from nominal for the selected band by more
+ than 100 kHz. (Is there a more useful or logical condition to
+ flag?) Small red square between Band selector and Dial Frequency
+ display to indicate that CAT control is active. Mode is set to USB
+ on startup. (Note: CAT control diagnostics are presently rather
+ rudimentary, we're still working on this. Feedback is welcome!)
2. New controls on Setup | Configuration screen:
- RTS/DTR OFF -- needed by K2 and maybe other radios
@@ -28,13 +29,14 @@ this. Feedback is welcome!)
via F3) and Special Mouse Commands (F4).
4. Option "Setup | Advanced | Allow multiple instances" enables the
- use of more than one instance of WSJT-X. (The program must be
- copied and run from different directories.)
+ use of more than one instance of WSJT-X for special applications.
+ (The program must be copied into and run from different
+ directories.)
-5. Posts to PSK Reporter are suppressed if band was changed during the
-reception period.
+5. No posts to PSK Reporter if band was changed during the reception
+ period.
-6. Tune button On/Off action was improved.
+6. Improved behavior of Tune button.
7. Improved inter-process communication between WSJT-X and JT-Alert-X.
@@ -42,11 +44,25 @@ reception period.
9. Removed the NB checkbox and slider. (Has anyone found these useful?)
-10. New buttons on main window: "Tx=Rx" sets Tx frequency to current Rx
-frequency; "Rx=Tx" does the opposite.
+10. New buttons on main window: "Tx=Rx" sets Tx frequency to current
+ Rx frequency; "Rx=Tx" does the opposite.
-11. Finally: a bug causing occasional, seemingly unpredictable program
-crashes has been fixed.
+11. Log QSO confirmation window is now "non-modal": you can keep it
+ open and still access controls on the main window.
+
+12. Tab-order has been rationalized on most screens.
+
+13. Dial frequency and mode written to file ALL.TXT.
+
+14. Double-click on decoded line sets Tx message #3 if message has
+ the form "MyCall Call2 rpt".
+
+15. Bug causing occasional, seemingly unpredictable program crashes
+ has been fixed.
+
+16. The WSJT-X User's Guide is somewhat closer to being complete. User
+ feedback on the Guide will be most welcome. What is unclear? What
+ is missing?
April 17, 2013: v0.9, r3195
---------------------------