diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-04-29 08:53:44 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2016-04-29 22:41:20 +0000 |
| commit | 69714b7457dc02a80e7ca453b60d5f5432756158 (patch) | |
| tree | 4ddc18ed7f94b15b1c8fa36d23b5f762a5528c2b /ui/qt/main_window.h | |
| parent | 5efb45231671baa2db2011d8f67f9d6e72bc455b (diff) | |
| download | wireshark-69714b7457dc02a80e7ca453b60d5f5432756158.tar.gz | |
Qt: Add recent items to the OS X dock menu.
Qt 5.2 added QMenu::setAsDockMenu. Use it to add recent items to the
Wireshark dock menu.
Add QWinJumpList code which does something similar. Comment it out
because it does it slowly and not-quite-correctly.
Change-Id: I801b1037b998516eacab695f982d7d6e889bafb6
Reviewed-on: https://code.wireshark.org/review/15166
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/main_window.h')
| -rw-r--r-- | ui/qt/main_window.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h index 72bf460479..f1f84f4c1e 100644 --- a/ui/qt/main_window.h +++ b/ui/qt/main_window.h @@ -129,7 +129,6 @@ private: }; Ui::MainWindow *main_ui_; - QMenu *open_recent_menu_; QSplitter master_split_; QSplitter extra_split_; QVector<unsigned> cur_layout_; @@ -175,6 +174,11 @@ private: QSocketNotifier *pipe_notifier_; #endif +#if defined(Q_OS_MAC) && QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + QMenu *dock_menu_; +#endif + + QWidget* getLayoutWidget(layout_pane_content_e type); void freeze(); |