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/main_window.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/main_window.h')
-rw-r--r-- | ui/qt/main_window.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h index cda9116ebb..a020befe12 100644 --- a/ui/qt/main_window.h +++ b/ui/qt/main_window.h @@ -182,6 +182,9 @@ private: QMenu *dock_menu_; #endif +#ifdef HAVE_SOFTWARE_UPDATE + QAction *update_action_; +#endif QWidget* getLayoutWidget(layout_pane_content_e type); @@ -358,6 +361,10 @@ private slots: void byteViewTabChanged(int tab_index); +#ifdef HAVE_SOFTWARE_UPDATE + void softwareUpdateRequested(); +#endif + // Automatically connected slots ("on_<object>_<signal>"). // // The slots below follow the naming conventaion described in |