diff options
| author | James Turner <james.turner@kdab.com> | 2012-05-04 14:16:05 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-19 10:18:21 +0200 |
| commit | b8246f08e49eb672974fd3d3d972a5ff13c1524d (patch) | |
| tree | 509ab759670f0b24aa8d44ced0584fc2832f5e76 /src/plugins/platforms/cocoa/qcocoamenuloader.h | |
| parent | 899f1d35a435fd499c73b29aabb6a609d496e5ed (diff) | |
Cocoa implementation of QPA menu interface.
Implement the QPA platform menu interface for Cocoa,
including native menubar support and merging with the
predefined menus created from the bundled .nib. Cleanup
code previously used to maintain the menus, and add
a manual test of the menus code.
Change-Id: Ia99267ddb6485e18e05c540eb32c5aee6cbb85db
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoamenuloader.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenuloader.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoamenuloader.h b/src/plugins/platforms/cocoa/qcocoamenuloader.h index b0d61fa541..fe9d0e0af5 100644 --- a/src/plugins/platforms/cocoa/qcocoamenuloader.h +++ b/src/plugins/platforms/cocoa/qcocoamenuloader.h @@ -85,10 +85,11 @@ - (IBAction)hideOtherApplications:(id)sender; - (IBAction)unhideAllApplications:(id)sender; - (IBAction)hide:(id)sender; -- (IBAction)qtDispatcherToQAction:(id)sender; -- (void)qtUpdateMenubar; +- (IBAction)qtDispatcherToQPAMenuItem:(id)sender; - (void)orderFrontCharacterPalette:(id)sender; - (BOOL)validateMenuItem:(NSMenuItem*)menuItem; +- (void)qtTranslateApplicationMenu; +- (NSArray *)mergeable; @end void qt_mac_loadMenuNib(QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *qtMenuLoader); |