1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-04 16:01:14 -05:00

Merge pull request #301 from thasti/remove-focus-switch

Don't intentionally disable keyboard commands on application focus change
This commit is contained in:
f4exb 2019-02-26 09:28:09 +01:00 committed by GitHub
commit 0d9b481771
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 17 deletions

View File

@ -209,7 +209,6 @@ MainWindow::MainWindow(qtwebapp::LoggerWithFile *logger, const MainParser& parse
m_apiServer = new WebAPIServer(m_apiHost, m_apiPort, m_requestMapper);
m_apiServer->start();
connect(qApp, SIGNAL(focusChanged(QWidget *, QWidget *)), this, SLOT(focusHasChanged(QWidget *, QWidget *)));
m_commandKeyReceiver = new CommandKeyReceiver();
m_commandKeyReceiver->setRelease(true);
this->installEventFilter(m_commandKeyReceiver);
@ -1792,19 +1791,6 @@ void MainWindow::setLoggingOptions()
}
}
void MainWindow::focusHasChanged(QWidget *oldWidget, QWidget *newWidget)
{
(void) oldWidget;
// this is the hard way:
// if (ui->commandKeyboardConnect->isChecked() && (newWidget != this)) {
// setFocus();
// }
// this is the soft way:
if (newWidget != this) {
ui->commandKeyboardConnect->setChecked(false);
}
}
void MainWindow::commandKeyPressed(Qt::Key key, Qt::KeyboardModifiers keyModifiers, bool release)
{
//qDebug("MainWindow::commandKeyPressed: key: %x mod: %x %s", (int) key, (int) keyModifiers, release ? "release" : "press");

View File

@ -391,7 +391,6 @@ private slots:
void on_action_removeLastDevice_triggered();
void on_action_Exit_triggered();
void tabInputViewIndexChanged();
void focusHasChanged(QWidget *oldWidget, QWidget *newWidget);
void commandKeyPressed(Qt::Key key, Qt::KeyboardModifiers keyModifiers, bool release);
};

View File

@ -663,9 +663,9 @@ This will save the commands immediately. The commands will be automatically save
This will delete the currently selected command or if selection is a group this will delete all commands in the group.
<h5>5B.6.8. Activate keyboard binding</h5>
<h5>5B.6.8. Activate keyboard bindings</h5>
Use this button to activate the keyboard binding. This requires that the focus is set to the main window. On a few occasions the main window looses focus and the button gets unselected. Just click again on this button to reactivate the keyboard binding. Note that you need to have this button selected (its background should be lit in beige/orange) for the key binding to be effective.
Use this button to activate the keyboard bindings. Note that you need to have this button selected (its background should be lit in beige/orange) for the key bindings to be effective.
<h3>6. Channels</h3>