From 75be0027d0a0c2e385ef318d677becb9a850c104 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Wed, 19 Dec 2018 09:20:02 -0800
Subject: 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>
---
 ui/qt/module_preferences_scroll_area.cpp | 16 ++++++++--------
 ui/qt/module_preferences_scroll_area.h   |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ui/qt/module_preferences_scroll_area.cpp b/ui/qt/module_preferences_scroll_area.cpp
index 5de7f1f678..6b3bf25106 100644
--- a/ui/qt/module_preferences_scroll_area.cpp
+++ b/ui/qt/module_preferences_scroll_area.cpp
@@ -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;
diff --git a/ui/qt/module_preferences_scroll_area.h b/ui/qt/module_preferences_scroll_area.h
index 9440f7026b..3d1ba38b79 100644
--- a/ui/qt/module_preferences_scroll_area.h
+++ b/ui/qt/module_preferences_scroll_area.h
@@ -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
-- 
cgit v1.2.3