diff options
| author | Roland Knall <rknall@gmail.com> | 2018-04-09 17:39:49 +0800 |
|---|---|---|
| committer | Roland Knall <rknall@gmail.com> | 2018-04-09 15:44:22 +0000 |
| commit | d347091da962a3bb095c62339fc6faa07d189a9f (patch) | |
| tree | 73aad2fe50975b92451a21dfb0ba4ec5bbfd8615 /wireshark-qt.cpp | |
| parent | 31aece5d75aac59396ed194cdd94f654cb0c0f7e (diff) | |
Qt: Fix MacOSX menu entries
Remove various menu items added automatically on Mac OS X. The following
menu items have been removed:
- Edit / Start Dictation
- Edit / Emoji & Symbols
- View / Enter Fullscreen Mode
- View / Show Tab Bar - Hide Tab Bar
Bug: 13366
Change-Id: I44deae7ee8ea7a43926820e4f5d0517ece246939
Reviewed-on: https://code.wireshark.org/review/26823
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'wireshark-qt.cpp')
| -rw-r--r-- | wireshark-qt.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp index b56c4bbdb7..2972dcf50d 100644 --- a/wireshark-qt.cpp +++ b/wireshark-qt.cpp @@ -110,6 +110,11 @@ #include "epan/crypt/dot11decrypt_ws.h" +/* Handle the addition of View menu items without request */ +#if defined(Q_OS_MAC) +#include <ui/macosx/cocoa_bridge.h> +#endif + #include <ui/qt/utils/qt_ui_utils.h> #define INVALID_OPTION 1 @@ -397,6 +402,11 @@ int main(int argc, char *qt_argv[]) #endif /* DEBUG_STARTUP_TIME */ cmdarg_err_init(wireshark_cmdarg_err, wireshark_cmdarg_err_cont); +#if defined(Q_OS_MAC) + /* Disable automatic addition of tab menu entries in view menu */ + CocoaBridge::cleanOSGeneratedMenuItems(); +#endif + /* Set the C-language locale to the native environment. */ setlocale(LC_ALL, ""); |