diff options
| author | Ahmad Fatoum <ahmad@a3f.at> | 2017-04-14 11:33:57 +0200 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2017-04-17 10:51:10 +0000 |
| commit | b478df61f54f08e0279d83e2cc11313fbdf28758 (patch) | |
| tree | 99585c43e985315c471038eb5a95e3368e9e4a73 /ui/gtk | |
| parent | f63ad23ef9036a60e78e5efd45936aae1705d5ac (diff) | |
Qt: Provide both file save and open preferences
This is a breaking change.
prefs_register_filename_preference hasn't been differentiating
between files to be saved and ones to be opened.
On GTK, a neutral dialog is used, so no problems there.
On Qt, a save dialog has been always used, even in dissectors that
were reading configuration files without modification.
prefs_register_filename_preference now takes an argument to indicate
whether UI could be a save dialog with a warning on overwriting
a file, or whether it's a general purpose open file dialog.
Qt now does this. Previously no warning was shown on overwriting a file,
so it may be used for opening files too without irritating the user.
This has been changed, as non-destructive reads should now use
the open dialog.
Dissectors were changed accordingly.
Change-Id: I9087fefa5ee7ca58de0775d4fe2c0fdcfa3a3018
Reviewed-on: https://code.wireshark.org/review/21086
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'ui/gtk')
| -rw-r--r-- | ui/gtk/prefs_dlg.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ui/gtk/prefs_dlg.c b/ui/gtk/prefs_dlg.c index 0437a2b4f8..13d29f319d 100644 --- a/ui/gtk/prefs_dlg.c +++ b/ui/gtk/prefs_dlg.c @@ -199,7 +199,8 @@ pref_show(pref_t *pref, gpointer user_data) prefs_get_string_value(pref, pref_stashed))); break; - case PREF_FILENAME: + case PREF_SAVE_FILENAME: + case PREF_OPEN_FILENAME: prefs_set_control(pref, create_preference_path_entry(main_grid, prefs_get_ordinal(pref), label_string, tooltip_txt, @@ -978,7 +979,8 @@ pref_check(pref_t *pref, gpointer user_data) break; case PREF_STRING: - case PREF_FILENAME: + case PREF_SAVE_FILENAME: + case PREF_OPEN_FILENAME: case PREF_DIRNAME: /* Value can't be bad. */ break; @@ -1090,7 +1092,8 @@ pref_fetch(pref_t *pref, gpointer user_data) break; case PREF_STRING: - case PREF_FILENAME: + case PREF_SAVE_FILENAME: + case PREF_OPEN_FILENAME: case PREF_DIRNAME: str_val = gtk_entry_get_text(GTK_ENTRY(prefs_get_control(pref))); module->prefs_changed |= prefs_set_string_value(pref, str_val, pref_current); |