w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-21 19:55:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

1. Add report to wsjt_status.txt, for JT-Alert.

Browse Source 
2. Fix annoying bug when trying to open rig using a non-existent or
   busy serial port.
3. Add acknowledgments to AE4JY
4. Tentative tweaks to "Tab 2" GUI layout.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3261 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-05-08 15:23:02 +00:00
parent 79bdc5c82f
commit f05cc4bd87
5 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
WSJT-X_Users_Guide.docx
View File

Binary file not shown.

4
about.cpp
View File

@ -10,9 +10,9 @@ CAboutDlg::CAboutDlg(QWidget *parent, QString Revision) :
ui->labelTxt->clear(); ui->labelTxt->clear();
m_Str = "<html><h2>" + m_Revision + "</h2>\n\n"; m_Str = "<html><h2>" + m_Revision + "</h2>\n\n";
m_Str += "WSJT-X implements experimental mode JT9 for <br>"; m_Str += "WSJT-X implements experimental mode JT9 for <br>";
m_Str += "Amateur Radio communication at MF and LF. <br><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 += "Copyright 2001-2013 by Joe Taylor, K1JT. Additional <br>";
m_Str += "contributions from PY2SDR, VK4BDJ, and AC6SL. <br>"; m_Str += "contributions from AE4JY, PY2SDR, VK4BDJ, and AC6SL. <br>";
ui->labelTxt->setText(m_Str); ui->labelTxt->setText(m_Str);
} }

2
about.ui
View File

@ -29,7 +29,7 @@
<string/> <string/>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property> </property>
</widget> </widget>
</item> </item>

21
mainwindow.cpp
View File

@ -885,7 +885,8 @@ void MainWindow::statusChanged()
QFile f("wsjtx_status.txt"); QFile f("wsjtx_status.txt");
if(f.open(QFile::WriteOnly | QIODevice::Text)) { if(f.open(QFile::WriteOnly | QIODevice::Text)) {
QTextStream out(&f); QTextStream out(&f);
out << m_dialFreq << ";" << m_mode << ";" << m_hisCall << endl; out << m_dialFreq << ";" << m_mode << ";" << m_hisCall << ";"
<< ui->rptSpinBox->value() << endl;
f.close(); f.close();
} else { } else {
msgBox("Cannot open file \"wsjtx_status.txt\"."); 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==4) ui->txrb4->setChecked(true);
if(m_ntx==5) ui->txrb5->setChecked(true); if(m_ntx==5) ui->txrb5->setChecked(true);
if(m_ntx==6) ui->txrb6->setChecked(true); if(m_ntx==6) ui->txrb6->setChecked(true);
statusChanged();
} }
void MainWindow::on_actionColor_highlighting_in_left_window_triggered(bool checked) void MainWindow::on_actionColor_highlighting_in_left_window_triggered(bool checked)
{ {
@ -2789,14 +2790,20 @@ void MainWindow::rigOpen()
} else { } else {
t="Open rig failed"; t="Open rig failed";
msgBox(t); msgBox(t);
m_catEnabled=false;
m_bRigOpen=false;
} }
if(m_poll>0) { if(m_bRigOpen) {
ui->readFreq->setStyleSheet("QPushButton{background-color: red; \ if(m_poll>0) {
border-width: 0px; border-radius: 5px;}"); 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 { } else {
ui->readFreq->setStyleSheet("QPushButton{background-color: orange; \ ui->readFreq->setStyleSheet("");
border-width: 0px; border-radius: 5px;}");
} }
} }

51
mainwindow.ui
View File

@ -1080,45 +1080,24 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1">
<widget class="QPushButton" name="pbAnswerCQ">
<property name="text">
<string>Answer CQ</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<widget class="QPushButton" name="pbSend73">
<property name="text">
<string>Send 73</string>
</property>
</widget>
</item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QPushButton" name="pbCallCQ"> <widget class="QPushButton" name="pbCallCQ">
<property name="text"> <property name="text">
<string>Call CQ</string> <string>CQ</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QPushButton" name="pbSendReport">
<property name="text">
<string>Send Report</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QPushButton" name="pbSendRRR"> <widget class="QPushButton" name="pbSendRRR">
<property name="text"> <property name="text">
<string>Send RRR</string> <string>RRR</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QPushButton" name="pbAnswerCaller"> <widget class="QPushButton" name="pbAnswerCaller">
<property name="text"> <property name="text">
<string>Answer Caller</string> <string>dB</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -1144,6 +1123,27 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1">
<widget class="QPushButton" name="pbAnswerCQ">
<property name="text">
<string>Grid</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="pbSendReport">
<property name="text">
<string>R+dB</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QPushButton" name="pbSend73">
<property name="text">
<string>73</string>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item> <item>
@ -2859,11 +2859,8 @@ p, li { white-space: pre-wrap; }
<tabstop>pbCallCQ</tabstop> <tabstop>pbCallCQ</tabstop>
<tabstop>pbAnswerCaller</tabstop> <tabstop>pbAnswerCaller</tabstop>
<tabstop>pbSendRRR</tabstop> <tabstop>pbSendRRR</tabstop>
<tabstop>pbSend73</tabstop>
<tabstop>genMsg</tabstop> <tabstop>genMsg</tabstop>
<tabstop>freeTextMsg</tabstop> <tabstop>freeTextMsg</tabstop>
<tabstop>pbAnswerCQ</tabstop>
<tabstop>pbSendReport</tabstop>
<tabstop>rbGenMsg</tabstop> <tabstop>rbGenMsg</tabstop>
<tabstop>rbFreeText</tabstop> <tabstop>rbFreeText</tabstop>
<tabstop>genStdMsgsPushButton</tabstop> <tabstop>genStdMsgsPushButton</tabstop>