diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-09-23 16:39:52 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-09-24 16:25:40 +0000 |
| commit | 8fc2327766146184852439fac19a769a097f7c85 (patch) | |
| tree | 57ac8e56a1f956e8f9573ebee7ffab69af17de6e /ui/qt/preferences_dialog.h | |
| parent | ffe30fb0d3ee0ebe6f149cc4d8bbd189891bcaf0 (diff) | |
| download | wireshark-8fc2327766146184852439fac19a769a097f7c85.tar.gz | |
Qt: Fix preference bugs.
Make sure we set the "resolved" member of the column fmt_data struct.
Emitting WiresharkApplication::AppSignals from a modal dialog can cause
event loop problems on OS X. Queue them up in PreferencesDialog and emit
them after closing.
Change-Id: I2de77778a0448db3b87d402e431b8e5f325cbbda
Reviewed-on: https://code.wireshark.org/review/4274
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/preferences_dialog.h')
| -rw-r--r-- | ui/qt/preferences_dialog.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/qt/preferences_dialog.h b/ui/qt/preferences_dialog.h index bf8cb04890..1e08d53954 100644 --- a/ui/qt/preferences_dialog.h +++ b/ui/qt/preferences_dialog.h @@ -30,6 +30,8 @@ #include <epan/prefs.h> +#include "wireshark_application.h" + #include <QDialog> #include <QTreeWidgetItem> #include <QComboBox> @@ -48,6 +50,7 @@ class PreferencesDialog : public QDialog public: explicit PreferencesDialog(QWidget *parent = 0); ~PreferencesDialog(); + const QList<WiresharkApplication::AppSignal> appSignals() const { return app_signals_; } protected: void showEvent(QShowEvent *evt); @@ -63,6 +66,7 @@ private: QString saved_string_pref_; QComboBox *cur_combo_box_; int saved_combo_idx_; + QList<WiresharkApplication::AppSignal> app_signals_; private slots: void on_prefsTree_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous); |