w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2026-06-08 08:54:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improved next and current Tx message widget short cuts

Browse Source 
Short cut  keys implemented via a  special key press event  handler do
not  fully  integrate  with  the UI  and  standard  UI  implementation
guidelines,  also they  introduce an  alternative code  path that  can
diverge from the intended behaviour.

Short  cuts   to  set  the  next   Tx  message  have  been   added  as
Ctrl+<number>.  Alt+<number>  short cuts  now do  as the  help implies
i.e. change  the current Tx message  even if there is  another message
being transmitted.

The log QSO  window should only be  triggered by a 73  Tx message when
transmitting.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4992 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville
2015-02-27 13:34:18 +00:00
parent 69fd5d2c39
commit 1f3e160a6a
3 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mainwindow.cpp
+6 -43
View File
@@ -765,43 +765,6 @@ void MainWindow::keyPressEvent( QKeyEvent *e ) //keyPressEvent
int n;
switch(e->key())
{
case Qt::Key_1:
if(e->modifiers() & Qt::AltModifier) {
on_txb1_clicked();
e->ignore ();
return;
}
break;
case Qt::Key_2:
if(e->modifiers() & Qt::AltModifier) {
on_txb2_clicked();
return;
}
break;
case Qt::Key_3:
if(e->modifiers() & Qt::AltModifier) {
on_txb3_clicked();
return;
}
break;
case Qt::Key_4:
if(e->modifiers() & Qt::AltModifier) {
on_txb4_clicked();
return;
}
break;
case Qt::Key_5:
if(e->modifiers() & Qt::AltModifier) {
on_txb5_clicked();
return;
}
break;
case Qt::Key_6:
if(e->modifiers() & Qt::AltModifier) {
on_txb6_clicked();
return;
}
break;
case Qt::Key_D:
if(e->modifiers() & Qt::ShiftModifier) {
if(!m_decoderBusy) {
@@ -1846,42 +1809,42 @@ void MainWindow::on_txb1_clicked() //txb1
{
m_ntx=1;
ui->txrb1->setChecked(true);
m_restart=true;
if (m_transmitting) m_restart=true;
}
void MainWindow::on_txb2_clicked() //txb2
{
m_ntx=2;
ui->txrb2->setChecked(true);
m_restart=true;
if (m_transmitting) m_restart=true;
}
void MainWindow::on_txb3_clicked() //txb3
{
m_ntx=3;
ui->txrb3->setChecked(true);
m_restart=true;
if (m_transmitting) m_restart=true;
}
void MainWindow::on_txb4_clicked() //txb4
{
m_ntx=4;
ui->txrb4->setChecked(true);
m_restart=true;
if (m_transmitting) m_restart=true;
}
void MainWindow::on_txb5_clicked() //txb5
{
m_ntx=5;
ui->txrb5->setChecked(true);
m_restart=true;
if (m_transmitting) m_restart=true;
}
void MainWindow::on_txb6_clicked() //txb6
{
m_ntx=6;
ui->txrb6->setChecked(true);
m_restart=true;
if (m_transmitting) m_restart=true;
}
void MainWindow::doubleClickOnCall2(bool shift, bool ctrl)