w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-07-17 17:15:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove the Mouse Timer. Make the AutoSeq checkbox sticky, again.

Browse Source
This commit is contained in:
Joe Taylor 2018-11-14 11:33:46 -05:00
parent c113d62ea6
commit dd28dd2670
2 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
widgets/mainwindow.cpp
View File

@ -931,12 +931,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
ui->cbMenus->setChecked(true); ui->cbMenus->setChecked(true);
ui->cbMenus->setChecked(false); ui->cbMenus->setChecked(false);
} }
mouseLastPos=QCursor::pos();
m_mouseIdleSeconds=0;
connect(&mouseTimer, &QTimer::timeout, this, &MainWindow::mouseTimerTick);
mouseTimer.start(1000);
// this must be the last statement of constructor // this must be the last statement of constructor
if (!m_valid) throw std::runtime_error {"Fatal initialization exception"}; if (!m_valid) throw std::runtime_error {"Fatal initialization exception"};
} }
@ -962,22 +956,6 @@ void MainWindow::initialize_fonts ()
setDecodedTextFont (m_config.decoded_text_font ()); setDecodedTextFont (m_config.decoded_text_font ());
} }
void MainWindow::mouseTimerTick()
{
QPoint point = QCursor::pos();
if(point != mouseLastPos)
m_mouseIdleSeconds = 0;
else
m_mouseIdleSeconds++;
mouseLastPos = point;
//Here we should do what's necessary when mouseIdleSeconds gets too big.
// qDebug() << m_mouseIdleSeconds;
if(ui->cbAutoSeq->isChecked() and m_mouseIdleSeconds>300) {
auto_tx_mode (false);
}
}
void MainWindow::splash_done () void MainWindow::splash_done ()
{ {
m_splash && m_splash->close (); m_splash && m_splash->close ();
@ -1880,7 +1858,6 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
if((e->modifiers() & Qt::ControlModifier) and (e->modifiers() & Qt::ShiftModifier)) { if((e->modifiers() & Qt::ControlModifier) and (e->modifiers() & Qt::ShiftModifier)) {
m_bandEdited = true; m_bandEdited = true;
band_changed(m_freqNominal-2000); band_changed(m_freqNominal-2000);
// qDebug() << "Down" << m_freqNominal;
} else { } else {
n=11; n=11;
if(e->modifiers() & Qt::ControlModifier) n+=100; if(e->modifiers() & Qt::ControlModifier) n+=100;
@ -1895,7 +1872,6 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
if((e->modifiers() & Qt::ControlModifier) and (e->modifiers() & Qt::ShiftModifier)) { if((e->modifiers() & Qt::ControlModifier) and (e->modifiers() & Qt::ShiftModifier)) {
m_bandEdited = true; m_bandEdited = true;
band_changed(m_freqNominal+2000); band_changed(m_freqNominal+2000);
// qDebug() << "Up " << m_freqNominal;
} else { } else {
n=12; n=12;
if(e->modifiers() & Qt::ControlModifier) n+=100; if(e->modifiers() & Qt::ControlModifier) n+=100;
@ -5464,7 +5440,6 @@ void MainWindow::displayWidgets(qint64 n)
if(i==32) ui->cbCQonly->setVisible(b); if(i==32) ui->cbCQonly->setVisible(b);
j=j>>1; j=j>>1;
} }
if(!ui->cbAutoSeq->isVisible()) ui->cbAutoSeq->setChecked(false);
b=SpecOp::EU_VHF==m_config.special_op_id() or (SpecOp::RTTY==m_config.special_op_id() and b=SpecOp::EU_VHF==m_config.special_op_id() or (SpecOp::RTTY==m_config.special_op_id() and
(m_config.RTTY_Exchange()=="#" or m_config.RTTY_Exchange()=="DX")); (m_config.RTTY_Exchange()=="#" or m_config.RTTY_Exchange()=="DX"));
ui->sbSerialNumber->setVisible(b); ui->sbSerialNumber->setVisible(b);

5
widgets/mainwindow.h
View File

@ -446,7 +446,6 @@ private:
qint32 m_Nslots=5; qint32 m_Nslots=5;
qint32 m_nFoxMsgTimes[5]={0,0,0,0,0}; qint32 m_nFoxMsgTimes[5]={0,0,0,0,0};
qint32 m_tAutoOn; qint32 m_tAutoOn;
qint32 m_mouseIdleSeconds;
qint32 m_tFoxTx=0; qint32 m_tFoxTx=0;
qint32 m_tFoxTx0=0; qint32 m_tFoxTx0=0;
qint32 m_maxStrikes=3; //Max # of repeats: 3 strikes and you're out qint32 m_maxStrikes=3; //Max # of repeats: 3 strikes and you're out
@ -570,9 +569,6 @@ private:
QTimer minuteTimer; QTimer minuteTimer;
QTimer splashTimer; QTimer splashTimer;
QTimer p1Timer; QTimer p1Timer;
QTimer mouseTimer;
QPoint mouseLastPos;
QString m_path; QString m_path;
QString m_baseCall; QString m_baseCall;
@ -701,7 +697,6 @@ private:
void CQTxFreq(); void CQTxFreq();
void useNextCall(); void useNextCall();
void abortQSO(); void abortQSO();
void mouseTimerTick();
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