diff options
author | Gerald Combs <gerald@wireshark.org> | 2016-12-13 10:33:02 -0800 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2016-12-20 14:18:14 +0000 |
commit | 795f4eb106d877ba6f2bd30524cc871404e9e42a (patch) | |
tree | 2ba3df1aa07b2b6f565929f3efef916525c047cc /ui/qt/wireshark_application.h | |
parent | 0de990e022a74aab7b6b1c9bf35849a035327b92 (diff) | |
download | wireshark-795f4eb106d877ba6f2bd30524cc871404e9e42a.tar.gz |
Qt+Win32: Make software updates more friendly.
Add WinSparkle can_shutdown and shutdown_request callbacks which are
called prior to running the installer. Reject updates when we have
unsaved information. Add notes about possible improvements.
Ping-Bug: 9687
Ping-Bug: 12989
Change-Id: Ia126244b311417aa3105ea8136f186adc2745445
Reviewed-on: https://code.wireshark.org/review/19244
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt/wireshark_application.h')
-rw-r--r-- | ui/qt/wireshark_application.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/ui/qt/wireshark_application.h b/ui/qt/wireshark_application.h index 58b489badf..6f26a90f99 100644 --- a/ui/qt/wireshark_application.h +++ b/ui/qt/wireshark_application.h @@ -124,6 +124,11 @@ public: const QString windowTitleString(QStringList title_parts); const QString windowTitleString(QString title_part) { return windowTitleString(QStringList() << title_part); } void applyCustomColorsFromRecent(); +#ifdef HAVE_SOFTWARE_UPDATE + void rejectSoftwareUpdate() { software_update_ok_ = false; } + bool softwareUpdateCanShutdown(); + void softwareUpdateShutdownRequest(); +#endif QTranslator translator; QTranslator translatorQt; @@ -145,6 +150,10 @@ private: static QString window_title_separator_; QList<AppSignal> app_signals_; int active_captures_; +#ifdef HAVE_SOFTWARE_UPDATE + bool software_update_ok_; +#endif + void storeCustomColorsInRecent(); protected: @@ -171,6 +180,12 @@ signals: void checkDisplayFilter(); void fieldsChanged(); void reloadLuaPlugins(); +#ifdef HAVE_SOFTWARE_UPDATE + // Each of these are called from a separate thread. + void softwareUpdateRequested(); + void softwareUpdateClose(); + void softwareUpdateQuit(); +#endif void openStatCommandDialog(const QString &menu_path, const char *arg, void *userdata); void openTapParameterDialog(const QString cfg_str, const QString arg, void *userdata); |