diff --git a/WSJT-X_Users_Guide.docx b/WSJT-X_Users_Guide.docx index 2a7454111..736e7b8fe 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 82ab9bf7f..8b6dc245b 100644 --- a/about.cpp +++ b/about.cpp @@ -10,9 +10,9 @@ CAboutDlg::CAboutDlg(QWidget *parent, QString Revision) : ui->labelTxt->clear(); m_Str = "

" + m_Revision + "

\n\n"; m_Str += "WSJT-X implements experimental mode JT9 for
"; - m_Str += "Amateur Radio communication at MF and LF.

"; + m_Str += "Amateur Radio communication at HF, MF, and LF.

"; m_Str += "Copyright 2001-2013 by Joe Taylor, K1JT. Additional
"; - m_Str += "contributions from PY2SDR, VK4BDJ, and AC6SL.
"; + m_Str += "contributions from AE4JY, PY2SDR, VK4BDJ, and AC6SL.
"; ui->labelTxt->setText(m_Str); } diff --git a/about.ui b/about.ui index a8482c8f5..3a862599c 100644 --- a/about.ui +++ b/about.ui @@ -29,7 +29,7 @@ - Qt::AlignCenter + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter diff --git a/mainwindow.cpp b/mainwindow.cpp index e7f45e10f..b907f83d7 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -885,7 +885,8 @@ void MainWindow::statusChanged() QFile f("wsjtx_status.txt"); if(f.open(QFile::WriteOnly | QIODevice::Text)) { QTextStream out(&f); - out << m_dialFreq << ";" << m_mode << ";" << m_hisCall << endl; + out << m_dialFreq << ";" << m_mode << ";" << m_hisCall << ";" + << ui->rptSpinBox->value() << endl; f.close(); } else { msgBox("Cannot open file \"wsjtx_status.txt\"."); @@ -2710,7 +2711,7 @@ void MainWindow::on_rptSpinBox_valueChanged(int n) if(m_ntx==4) ui->txrb4->setChecked(true); if(m_ntx==5) ui->txrb5->setChecked(true); if(m_ntx==6) ui->txrb6->setChecked(true); - + statusChanged(); } void MainWindow::on_actionColor_highlighting_in_left_window_triggered(bool checked) { @@ -2789,14 +2790,20 @@ void MainWindow::rigOpen() } else { t="Open rig failed"; msgBox(t); + m_catEnabled=false; + m_bRigOpen=false; } - if(m_poll>0) { - ui->readFreq->setStyleSheet("QPushButton{background-color: red; \ - border-width: 0px; border-radius: 5px;}"); + if(m_bRigOpen) { + if(m_poll>0) { + ui->readFreq->setStyleSheet("QPushButton{background-color: red; \ + border-width: 0px; border-radius: 5px;}"); + } else { + ui->readFreq->setStyleSheet("QPushButton{background-color: orange; \ + border-width: 0px; border-radius: 5px;}"); + } } else { - ui->readFreq->setStyleSheet("QPushButton{background-color: orange; \ - border-width: 0px; border-radius: 5px;}"); + ui->readFreq->setStyleSheet(""); } } diff --git a/mainwindow.ui b/mainwindow.ui index 329114d03..ab7265679 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -1080,45 +1080,24 @@ p, li { white-space: pre-wrap; } - - - - Answer CQ - - - - - - - Send 73 - - - - Call CQ - - - - - - - Send Report + CQ - Send RRR + RRR - Answer Caller + dB @@ -1144,6 +1123,27 @@ p, li { white-space: pre-wrap; } + + + + Grid + + + + + + + R+dB + + + + + + + 73 + + + @@ -2859,11 +2859,8 @@ p, li { white-space: pre-wrap; } pbCallCQ pbAnswerCaller pbSendRRR - pbSend73 genMsg freeTextMsg - pbAnswerCQ - pbSendReport rbGenMsg rbFreeText genStdMsgsPushButton