w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-25 13:48:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Let "Best S+P" status time out after 2 minutes. Update the keyboard shortcuts.txt file.

Browse Source
This commit is contained in:
Joe Taylor 2019-04-16 13:21:45 -04:00
parent b43d91240d
commit 5826aefedc
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shortcuts.txt
View File

@ -8,7 +8,7 @@
<tr><td><b>F4 </b></td><td>Clear DX Call, DX Grid, Tx messages 1-4 (Alt: transmit Tx4)</td></tr> <tr><td><b>F4 </b></td><td>Clear DX Call, DX Grid, Tx messages 1-4 (Alt: transmit Tx4)</td></tr>
<tr><td><b>Alt+F4 </b></td><td>Exit program</td></tr> <tr><td><b>Alt+F4 </b></td><td>Exit program</td></tr>
<tr><td><b>F5 </b></td><td>Display special mouse commands (Alt: transmit Tx5)</td></tr> <tr><td><b>F5 </b></td><td>Display special mouse commands (Alt: transmit Tx5)</td></tr>
<tr><td><b>F6 </b></td><td>Open next file in directory (Alt: toggle Call 11t)</td></tr> <tr><td><b>F6 </b></td><td>Open next file in directory (Alt: toggle "Call 1st")</td></tr>
<tr><td><b>Shift+F6 </b></td><td>Decode all remaining files in directrory</td></tr> <tr><td><b>Shift+F6 </b></td><td>Decode all remaining files in directrory</td></tr>
<tr><td><b>F7 </b></td><td>Display Message Averaging window</td></tr> <tr><td><b>F7 </b></td><td>Display Message Averaging window</td></tr>
<tr><td><b>F11 </b></td><td>Move Rx frequency down 1 Hz</td></tr> <tr><td><b>F11 </b></td><td>Move Rx frequency down 1 Hz</td></tr>
@ -21,6 +21,8 @@
<tr><td><b>Ctrl+Shift+F12 </b></td><td>Move dial frequency up 2000 Hz</td></tr> <tr><td><b>Ctrl+Shift+F12 </b></td><td>Move dial frequency up 2000 Hz</td></tr>
<tr><td><b>Alt+1-6 </b></td><td>Set now transmission to this number on Tab 1</td></tr> <tr><td><b>Alt+1-6 </b></td><td>Set now transmission to this number on Tab 1</td></tr>
<tr><td><b>Ctl+1-6 </b></td><td>Set next transmission to this number on Tab 1</td></tr> <tr><td><b>Ctl+1-6 </b></td><td>Set next transmission to this number on Tab 1</td></tr>
<tr><td><b>Alt+B </b></td><td>Toggle "Best S+P" status</td></tr>
<tr><td><b>Alt+C </b></td><td>Toggle "Call 1st" checkbox</td></tr>
<tr><td><b>Alt+D </b></td><td>Decode again at QSO frequency</td></tr> <tr><td><b>Alt+D </b></td><td>Decode again at QSO frequency</td></tr>
<tr><td><b>Shift+D </b></td><td>Full decode (both windows)</td></tr> <tr><td><b>Shift+D </b></td><td>Full decode (both windows)</td></tr>
<tr><td><b>Ctrl+E </b></td><td>Turn on TX even/1st</td></tr> <tr><td><b>Ctrl+E </b></td><td>Turn on TX even/1st</td></tr>

12
widgets/mainwindow.cpp
View File

@ -1895,6 +1895,11 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
bool bAltF1F6=m_config.alternate_bindings(); bool bAltF1F6=m_config.alternate_bindings();
switch(e->key()) switch(e->key())
{ {
case Qt::Key_B:
if(m_mode=="FT4" && e->modifiers() & Qt::AltModifier) {
on_pbBestSP_clicked();
}
return;
case Qt::Key_C: case Qt::Key_C:
if(m_mode=="FT4" && e->modifiers() & Qt::AltModifier) { if(m_mode=="FT4" && e->modifiers() & Qt::AltModifier) {
bool b=ui->cbFirst->isChecked(); bool b=ui->cbFirst->isChecked();
@ -4024,9 +4029,8 @@ void MainWindow::guiUpdate()
QString utc = t.date().toString("yyyy MMM dd") + "\n " + QString utc = t.date().toString("yyyy MMM dd") + "\n " +
t.time().toString() + " "; t.time().toString() + " ";
ui->labUTC->setText(utc); ui->labUTC->setText(utc);
if(!m_monitoring and !m_diskData) { if(m_bBestSPArmed and (m_dateTimeBestSP.secsTo(t) >= 120)) on_pbBestSP_clicked(); //BestSP timeout
ui->signal_meter_widget->setValue(0,0); if(!m_monitoring and !m_diskData) ui->signal_meter_widget->setValue(0,0);
}
m_sec0=nsec; m_sec0=nsec;
displayDialFrequency (); displayDialFrequency ();
} }
@ -8711,7 +8715,7 @@ void MainWindow::chkFT4()
void MainWindow::on_pbBestSP_clicked() void MainWindow::on_pbBestSP_clicked()
{ {
m_bBestSPArmed = !m_bBestSPArmed; m_bBestSPArmed = !m_bBestSPArmed;
// ui->pbBestSP->setChecked(m_bBestSPArmed);
if(m_bBestSPArmed and !m_transmitting) ui->pbBestSP->setStyleSheet ("QPushButton{color:red}"); if(m_bBestSPArmed and !m_transmitting) ui->pbBestSP->setStyleSheet ("QPushButton{color:red}");
if(!m_bBestSPArmed) ui->pbBestSP->setStyleSheet (""); if(!m_bBestSPArmed) ui->pbBestSP->setStyleSheet ("");
if(m_bBestSPArmed) m_dateTimeBestSP=QDateTime::currentDateTimeUtc();
} }

1
widgets/mainwindow.h
View File

@ -653,6 +653,7 @@ private:
QDateTime m_dateTimeLastTX; QDateTime m_dateTimeLastTX;
QDateTime m_dateTimeSentTx3; QDateTime m_dateTimeSentTx3;
QDateTime m_dateTimeRcvdRR73; QDateTime m_dateTimeRcvdRR73;
QDateTime m_dateTimeBestSP;
QSharedMemory *mem_jt9; QSharedMemory *mem_jt9;
QString m_QSOText; QString m_QSOText;