osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Qt: Add key events to accept and reject changes in PreferenceEditorFrame 

Change-Id: I4a9c4b80b0438cd33c38b274a24a3b1b5db46cb8
Reviewed-on: https://code.wireshark.org/review/23605
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Stig Bjørlykke 2017-09-18 19:20:50 +02:00 committed by Anders Broman
parent 939ea8c8ed
commit 59fce46d01
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/qt/main_window.cpp
View File

@ -412,6 +412,8 @@ MainWindow::MainWindow(QWidget *parent) :
connect(main_ui_->columnEditorFrame, SIGNAL(pushFilterSyntaxStatus(const QString&)),
main_ui_->statusBar, SLOT(pushTemporaryStatus(const QString&)));
main_ui_->preferenceEditorFrame->hide();
connect(main_ui_->preferenceEditorFrame, SIGNAL(pushFilterSyntaxStatus(const QString&)),
main_ui_->statusBar, SLOT(pushTemporaryStatus(const QString&)));
main_ui_->filterExpressionFrame->hide();
#ifndef HAVE_LIBPCAP

16
ui/qt/preference_editor_frame.cpp
View File

@ -39,6 +39,7 @@
#include "wireshark_application.h"
#include <QPushButton>
#include <QKeyEvent>
// To do:
// - Handle PREF_SAVE_FILENAME, PREF_OPEN_FILENAME and PREF_DIRNAME.
@ -239,6 +240,21 @@ void PreferenceEditorFrame::on_buttonBox_rejected()
animatedHide();
}
void PreferenceEditorFrame::keyPressEvent(QKeyEvent *event)
{
if (event->modifiers() == Qt::NoModifier) {
if (event->key() == Qt::Key_Escape) {
on_buttonBox_rejected();
} else if (event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return) {
if (ui->buttonBox->button(QDialogButtonBox::Ok)->isEnabled()) {
on_buttonBox_accepted();
} else if (ui->preferenceLineEdit->syntaxState() == SyntaxLineEdit::Invalid) {
emit pushFilterSyntaxStatus(tr("Invalid value."));
}
}
}
}
/*
* Editor modelines
*

4
ui/qt/preference_editor_frame.h
View File

@ -45,6 +45,10 @@ public slots:
signals:
void showProtocolPreferences(const QString module_name);
void pushFilterSyntaxStatus(const QString&);
protected:
void keyPressEvent(QKeyEvent *event);
private slots:
// Similar to ModulePreferencesScrollArea