osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Qt: Open our preference dialogs via "clicked" signals. 

In ModulePreferencesScrollArea we create QPushButtons that open modal
UAT and file dialogs. Open them via the "clicked" signal instead of
the "pressed" signal. "clicked" is a general activation signal that
fires after the mouse button has been clicked+released or a keyboard
event. "pressed" fires before "released" and can be problematic in
some cases.

Bug: 15366
Change-Id: Icb353d86ae0a4b4b97e5f63df791ec562070756d
Reviewed-on: https://code.wireshark.org/review/31123
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2018-12-19 09:20:02 -08:00
parent 003cba974b
commit 75be0027d0
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ui/qt/module_preferences_scroll_area.cpp
View File

@ -299,16 +299,16 @@ ModulePreferencesScrollArea::ModulePreferencesScrollArea(module_t *module, QWidg
switch (prefs_get_type(pref)) {
case PREF_UAT:
connect(pb, SIGNAL(pressed()), this, SLOT(uatPushButtonPressed()));
connect(pb, SIGNAL(clicked()), this, SLOT(uatPushButtonClicked()));
break;
case PREF_SAVE_FILENAME:
connect(pb, SIGNAL(pressed()), this, SLOT(saveFilenamePushButtonPressed()));
connect(pb, SIGNAL(clicked()), this, SLOT(saveFilenamePushButtonClicked()));
break;
case PREF_OPEN_FILENAME:
connect(pb, SIGNAL(pressed()), this, SLOT(openFilenamePushButtonPressed()));
connect(pb, SIGNAL(clicked()), this, SLOT(openFilenamePushButtonClicked()));
break;
case PREF_DIRNAME:
connect(pb, SIGNAL(pressed()), this, SLOT(dirnamePushButtonPressed()));
connect(pb, SIGNAL(clicked()), this, SLOT(dirnamePushButtonClicked()));
break;
}
}
@ -467,7 +467,7 @@ void ModulePreferencesScrollArea::rangeSyntaxLineEditTextEdited(const QString &n
}
}
void ModulePreferencesScrollArea::uatPushButtonPressed()
void ModulePreferencesScrollArea::uatPushButtonClicked()
{
QPushButton *uat_pb = qobject_cast<QPushButton*>(sender());
if (!uat_pb) return;
@ -479,7 +479,7 @@ void ModulePreferencesScrollArea::uatPushButtonPressed()
uat_dlg.exec();
}
void ModulePreferencesScrollArea::saveFilenamePushButtonPressed()
void ModulePreferencesScrollArea::saveFilenamePushButtonClicked()
{
QPushButton *filename_pb = qobject_cast<QPushButton*>(sender());
if (!filename_pb) return;
@ -496,7 +496,7 @@ void ModulePreferencesScrollArea::saveFilenamePushButtonPressed()
}
}
void ModulePreferencesScrollArea::openFilenamePushButtonPressed()
void ModulePreferencesScrollArea::openFilenamePushButtonClicked()
{
QPushButton *filename_pb = qobject_cast<QPushButton*>(sender());
if (!filename_pb) return;
@ -512,7 +512,7 @@ void ModulePreferencesScrollArea::openFilenamePushButtonPressed()
}
}
void ModulePreferencesScrollArea::dirnamePushButtonPressed()
void ModulePreferencesScrollArea::dirnamePushButtonClicked()
{
QPushButton *dirname_pb = qobject_cast<QPushButton*>(sender());
if (!dirname_pb) return;

8
ui/qt/module_preferences_scroll_area.h
View File

@ -49,10 +49,10 @@ private slots:
void enumComboBoxCurrentIndexChanged(int index);
void stringLineEditTextEdited(const QString &new_str);
void rangeSyntaxLineEditTextEdited(const QString &new_str);
void uatPushButtonPressed();
void saveFilenamePushButtonPressed();
void openFilenamePushButtonPressed();
void dirnamePushButtonPressed();
void uatPushButtonClicked();
void saveFilenamePushButtonClicked();
void openFilenamePushButtonClicked();
void dirnamePushButtonClicked();
};
#endif // MODULE_PREFERENCES_SCROLL_AREA_H