Rename the "saved_val" preference element to "stashed_val" in order to

more clearly indicate that it's a copy of a preference value rather than
something we've saved in the preferences file. Update
prefs_pref_to_str() to handle default, stashed, and current prefs.

Create ui/preference_utils.[ch] and move some common routines there. Use
prefs_pref_type_name() in the GTK+ preferences dialog.

Make the "OK" button in the Qt preferences dialog work. We simply write
the prefs and redissect on "OK" and do nothing on "Cancel". This is
intentionally different from the Apply/OK/Cancel behavior in the GTK+
version.

Add a general "emitAppSignal" method to wsApp and use it for packet
dissection and preference changes.

Suggest that we might want to create a WsString class to make conversion
between QStrings, gchar *s, and GStrings easier.

svn path=/trunk/; revision=47139

1 files changed, 9 insertions, 2 deletions

diff --git a/ui/qt/wireshark_application.h b/ui/qt/wireshark_application.h
index 219c33d171..326d7cd248 100644
--- a/ui/qt/wireshark_application.h
+++ b/ui/qt/wireshark_application.h
@@ -60,9 +60,14 @@ class WiresharkApplication : public QApplication
 public:
     explicit WiresharkApplication(int &argc,  char **argv);
 
+    enum AppSignal {
+        PacketDissectionChanged,
+        PreferencesChanged
+    };
+
     void registerUpdate(register_action_e action, const char *message);
+    void emitAppSignal(AppSignal signal);
     void allSystemsGo();
-    void applyAllPreferences();
     e_prefs * readConfigurationFiles(char **gdp_path, char **dp_path);
     QList<recent_item_status *> recentItems() const;
     void addRecentItem(const QString &filename, qint64 size, bool accessible);
@@ -93,9 +98,11 @@ signals:
     void openCaptureFile(QString &cf_path);
     void updateRecentItemStatus(const QString &filename, qint64 size, bool accessible);
     void splashUpdate(register_action_e action, const char *message);
-    void updatePreferences();
     void configurationProfileChanged(const gchar *profile_name);
 
+    void packetDissectionChanged();
+    void preferencesChanged();
+
 #ifdef HAVE_LIBPCAP
     // XXX It might make more sense to move these to main.cpp or main_window.cpp or their own class.
     void captureCapturePrepared(capture_options *capture_opts);