w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-15 08:31:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix-2.0.0-rc4' of bitbucket.org:k1jt/wsjtx into hotfix-2.0.0-rc4

Browse Source
This commit is contained in:
Bill Somerville 2018-10-18 21:13:54 +01:00
commit 6d25c45d9f
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mainwindow.cpp
View File

@ -1867,6 +1867,11 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
} }
} }
return; return;
case Qt::Key_A:
if(e->modifiers() & Qt::ControlModifier) {
abortQSO();
return;
}
case Qt::Key_X: case Qt::Key_X:
if(e->modifiers() & Qt::AltModifier) { if(e->modifiers() & Qt::AltModifier) {
foxTest(); foxTest();
@ -1931,7 +1936,6 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
break; break;
case Qt::Key_PageDown: case Qt::Key_PageDown:
band_changed(m_freqNominal-2000); band_changed(m_freqNominal-2000);
qDebug() << "Down" << m_freqNominal;
break; } break; }
QMainWindow::keyPressEvent (e); QMainWindow::keyPressEvent (e);
@ -3752,8 +3756,9 @@ void MainWindow::guiUpdate()
//Once per second: //Once per second:
if(nsec != m_sec0) { if(nsec != m_sec0) {
// qDebug() << "OneSec:" << m_nContest << m_Nslots; // qDebug() << "OneSec:" << m_nContest << m_msgAvgWidget;
if(!m_msgAvgWidget and m_nContest>0 and m_nContest<6) on_actionFox_Log_triggered(); if((!m_msgAvgWidget or (m_msgAvgWidget and !m_msgAvgWidget->isVisible()))
and (m_nContest>0) and (m_nContest<6)) on_actionFox_Log_triggered();
if(m_freqNominal!=0 and m_freqNominal<50000000 and m_config.enable_VHF_features()) { if(m_freqNominal!=0 and m_freqNominal<50000000 and m_config.enable_VHF_features()) {
if(!m_bVHFwarned) vhfWarning(); if(!m_bVHFwarned) vhfWarning();
} else { } else {
@ -4675,6 +4680,14 @@ void MainWindow::genCQMsg ()
} }
} }
void MainWindow::abortQSO()
{
bool b=m_auto;
clearDX();
if(b and !m_auto) auto_tx_mode(true);
ui->txrb6->setChecked(true);
}
bool MainWindow::stdCall(QString w) bool MainWindow::stdCall(QString w)
{ {
int n=w.trimmed().length(); int n=w.trimmed().length();

1
mainwindow.h
View File

@ -704,6 +704,7 @@ private:
void CQTxFreq(); void CQTxFreq();
void cabLog(); void cabLog();
void useNextCall(); void useNextCall();
void abortQSO();
bool isWorked(int itype, QString key, float fMHz=0, QString=""); bool isWorked(int itype, QString key, float fMHz=0, QString="");
QString save_wave_file (QString const& name QString save_wave_file (QString const& name

5
wsjtx.pro
View File

@ -68,8 +68,7 @@ SOURCES += \
WSPRBandHopping.cpp MessageAggregator.cpp SampleDownloader.cpp qt_helpers.cpp\ WSPRBandHopping.cpp MessageAggregator.cpp SampleDownloader.cpp qt_helpers.cpp\
MultiSettings.cpp PhaseEqualizationDialog.cpp IARURegions.cpp MessageBox.cpp \ MultiSettings.cpp PhaseEqualizationDialog.cpp IARURegions.cpp MessageBox.cpp \
EqualizationToolsDialog.cpp CallsignValidator.cpp ExchangeValidator.cpp \ EqualizationToolsDialog.cpp CallsignValidator.cpp ExchangeValidator.cpp \
colorhighlighting.cpp ExportCabrillo.cpp LotWUsers.cpp colorhighlighting.cpp ExportCabrillo.cpp LotWUsers.cpp TraceFile.cpp
HEADERS += qt_helpers.hpp \ HEADERS += qt_helpers.hpp \
pimpl_h.hpp pimpl_impl.hpp \ pimpl_h.hpp pimpl_impl.hpp \
Radio.hpp NetworkServerLookup.hpp revision_utils.hpp \ Radio.hpp NetworkServerLookup.hpp revision_utils.hpp \
@ -85,7 +84,7 @@ HEADERS += qt_helpers.hpp \
messageaveraging.h echoplot.h echograph.h fastgraph.h fastplot.h Modes.hpp WSPRBandHopping.hpp \ messageaveraging.h echoplot.h echograph.h fastgraph.h fastplot.h Modes.hpp WSPRBandHopping.hpp \
WsprTxScheduler.h SampleDownloader.hpp MultiSettings.hpp PhaseEqualizationDialog.hpp \ WsprTxScheduler.h SampleDownloader.hpp MultiSettings.hpp PhaseEqualizationDialog.hpp \
IARURegions.hpp MessageBox.hpp EqualizationToolsDialog.hpp CallsignValidator.hpp \ IARURegions.hpp MessageBox.hpp EqualizationToolsDialog.hpp CallsignValidator.hpp \
ExchangeValidator.hpp colorhighlighting.h ExportCabrillo.h LotWUsers.h ExchangeValidator.hpp colorhighlighting.h ExportCabrillo.h LotWUsers.h TraceFile.hpp
INCLUDEPATH += qmake_only INCLUDEPATH += qmake_only