Cocoa: QMenu refactor.

This change prepares for enabling native menus
on OS X.

Move code from src/widgets to cocoa:
- qcocoaapplicaiton
- qcocoaapplicaitondelegate
- qcocoamenuloader
- qcocoamenu
- qmenu_mac
- misc helpers to qcocoahelpers

Create a QNSApplication and
QCocoaApplicationDelegate at application startup.

New Lighthouse API:
- class QPlatformMenu
- class QPlatformMenuBar
- QPlatformIntegration::createPlatformMenu()
- QPlatformIntegration::createPlatformMenuBar()

Platforms that wants a native menu integration
subclasses QPlatformMenu[|Bar] and implements the
create function. The default implementation returns
0, which causes QMenu to use the standard Qt
menus.

This API is based on the current native menu
abstraction that Mac, Wince and S60 uses in Qt 4.
The main difference is that the platform classes are
proper standalone classes and not #ifdeffed into
QMenuPrivate.

Change-Id: I3da41f80b0ae903a476937908b1f9b88014b7954
Reviewed-on: http://codereview.qt.nokia.com/4068
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>

1 files changed, 36 insertions, 9 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index 1d06c182e6..e3e204226f 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -47,6 +47,11 @@
 #include "qcocoamenuloader.h"
 #include "qcocoaeventdispatcher.h"
 #include "qcocoahelpers.h"
+#include "qcocoaapplication.h"
+#include "qcocoaapplicationdelegate.h"
+#include "qmenu_mac.h"
+
+#include <QtCore/qcoreapplication.h>
 
 #include <QtPlatformSupport/private/qbasicunixfontdatabase_p.h>
 
@@ -78,9 +83,7 @@ QCocoaIntegration::QCocoaIntegration()
 {
     mPool = new QCocoaAutoReleasePool;
 
-    //Make sure we have a nsapplication :)
-    [NSApplication sharedApplication];
-//    [[OurApplication alloc] init];
+    QNSApplication *cocoaApplication = [QNSApplication sharedApplication];
 
     // Applications launched from plain executables (without an app
     // bundle) are "background" applications that does not take keybaord
@@ -93,12 +96,24 @@ QCocoaIntegration::QCocoaIntegration()
     // Ignoring other apps is neccessary (we must ignore the terminal), but makes
     // Qt apps play slightly less nice with other apps when lanching from Finder
     // (See the activateIgnoringOtherApps docs.)
-    [[NSApplication sharedApplication] activateIgnoringOtherApps : YES];
-
-    // Load the application menu. This menu contains Preferences, Hide, Quit.
-    QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *qtMenuLoader = [[QT_MANGLE_NAMESPACE(QCocoaMenuLoader) alloc] init];
-    qt_mac_loadMenuNib(qtMenuLoader);
-    [[NSApplication sharedApplication] setMenu:[qtMenuLoader menu]];
+    [cocoaApplication activateIgnoringOtherApps : YES];
+
+    // ### For AA_MacPluginApplication we don't want to load the menu nib.
+    // Qt 4 also does not set the application delegate, so that behavior
+    // is matched here.
+    if (!QCoreApplication::testAttribute(Qt::AA_MacPluginApplication)) {
+
+        // Set app delegate, link to the current delegate (if any)
+        QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) *newDelegate = [QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) sharedDelegate];
+        [newDelegate setReflectionDelegate:[cocoaApplication delegate]];
+        [cocoaApplication setDelegate:newDelegate];
+
+        // Load the application menu. This menu contains Preferences, Hide, Quit.
+        QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *qtMenuLoader = [[QT_MANGLE_NAMESPACE(QCocoaMenuLoader) alloc] init];
+        qt_mac_loadMenuNib(qtMenuLoader);
+        [cocoaApplication setMenu:[qtMenuLoader menu]];
+        [newDelegate setMenuLoader:qtMenuLoader];
+    }
 
     NSArray *screens = [NSScreen screens];
     for (uint i = 0; i < [screens count]; i++) {
@@ -149,6 +164,18 @@ QPlatformFontDatabase *QCocoaIntegration::fontDatabase() const
     return mFontDb;
 }
 
+QPlatformMenu *QCocoaIntegration::createPlatformMenu(QMenu *menu) const
+{
+    // return new QCocoaMenu(menu);
+    return 0;
+}
+
+QPlatformMenuBar *QCocoaIntegration::createPlatformMenuBar(QMenuBar *menuBar) const
+{
+    //return new QCocoaMenuBar(menuBar);
+    return 0;
+}
+
 QPlatformNativeInterface *QCocoaIntegration::nativeInterface() const
 {
     return new QCocoaNativeInterface();