QPA menu abstraction, originally based on Morten's work

Create a QPA abstraction for native menus, derived from the
Cocoa support in 4.8, but with the expectation to support
other platforms too. Update the QtWidget QMenu and QMenuBar
code to maintain their QPA equivalents if they exist.

Change-Id: Id605de3da8811dc832bf48b35f9107778ad320ff
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>

5 files changed, 297 insertions, 14 deletions

diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri
index 525871c89b..0f46a8df52 100644
--- a/src/gui/kernel/kernel.pri
+++ b/src/gui/kernel/kernel.pri
@@ -25,6 +25,7 @@ HEADERS += \
         kernel/qplatformcursor.h \
         kernel/qplatformclipboard.h \
         kernel/qplatformnativeinterface.h \
+        kernel/qplatformmenu.h \
         kernel/qsurfaceformat.h \
         kernel/qguiapplication.h \
         kernel/qguiapplication_p.h \
@@ -79,6 +80,7 @@ SOURCES += \
         kernel/qplatformcursor_qpa.cpp \
         kernel/qplatformclipboard_qpa.cpp \
         kernel/qplatformnativeinterface_qpa.cpp \
+        kernel/qplatformmenu_qpa.cpp \
         kernel/qsessionmanager_qpa.cpp \
         kernel/qsurfaceformat.cpp \
         kernel/qguiapplication.cpp \
diff --git a/src/gui/kernel/qplatformmenu.h b/src/gui/kernel/qplatformmenu.h
new file mode 100755
index 0000000000..8779d028e3
--- /dev/null
+++ b/src/gui/kernel/qplatformmenu.h
@@ -0,0 +1,115 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author James Turner <james.turner@kdab.com>
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QPLATFORMMENU_H
+#define QPLATFORMMENU_H
+
+#include <QtCore/qglobal.h>
+#include <QtCore/qpointer.h>
+#include <QtGui/QFont>
+#include <QtGui/QKeySequence>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+class QPlatformMenu;
+class Q_GUI_EXPORT QPlatformMenuItem : public QObject
+{
+Q_OBJECT
+public:
+    // copied from, and must stay in sync with, QAction menu roles.
+    enum MenuRole { NoRole = 0, TextHeuristicRole, ApplicationSpecificRole, AboutQtRole,
+                    AboutRole, PreferencesRole, QuitRole };
+
+    virtual void setTag(quintptr tag);
+    virtual quintptr tag() const;
+
+    virtual void setText(const QString &text);
+    virtual void setIcon(const QImage &icon);
+    virtual void setMenu(QPlatformMenu *menu);
+    virtual void setVisible(bool isVisible);
+    virtual void setIsSeparator(bool isSeparator);
+    virtual void setFont(const QFont &font);
+    virtual void setRole(MenuRole role);
+    virtual void setChecked(bool isChecked);
+    virtual void setShortcut(const QKeySequence& shortcut);
+    virtual void setEnabled(bool enabled);
+Q_SIGNALS:
+    void activated();
+    void hovered();
+};
+
+class Q_GUI_EXPORT QPlatformMenu : public QPlatformMenuItem // Some (but not all) of the PlatformMenuItem API applies to QPlatformMenu as well.
+{
+Q_OBJECT
+public:
+    virtual void insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before);
+    virtual void removeMenuItem(QPlatformMenuItem *menuItem);
+    virtual void syncMenuItem(QPlatformMenuItem *menuItem);
+    virtual void syncSeparatorsCollapsible(bool enable);
+
+    virtual QPlatformMenuItem *menuItemAt(int position) const;
+    virtual QPlatformMenuItem *menuItemForTag(quintptr tag) const;
+Q_SIGNALS:
+    void aboutToShow();
+    void aboutToHide();
+};
+
+class Q_GUI_EXPORT QPlatformMenuBar : public QPlatformMenu
+{
+Q_OBJECT
+public:
+    virtual void insertMenu(QPlatformMenu *menu, QPlatformMenu *before);
+    virtual void removeMenu(QPlatformMenu *menu);
+    virtual void syncMenu(QPlatformMenuItem *menuItem);
+    virtual void handleReparent(QWindow *newParentWindow);
+
+    virtual QPlatformMenu *menuForTag(quintptr tag) const;
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif
+
diff --git a/src/gui/kernel/qplatformmenu_qpa.cpp b/src/gui/kernel/qplatformmenu_qpa.cpp
new file mode 100755
index 0000000000..050f11ec8d
--- /dev/null
+++ b/src/gui/kernel/qplatformmenu_qpa.cpp
@@ -0,0 +1,161 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author James Turner <james.turner@kdab.com>
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qplatformmenu.h"
+
+QT_BEGIN_NAMESPACE
+
+void QPlatformMenuItem::setText(const QString &text)
+{
+
+}
+
+void QPlatformMenuItem::setIcon(const QImage &icon)
+{
+
+}
+
+void QPlatformMenuItem::setMenu(QPlatformMenu *menu)
+{
+
+}
+
+void QPlatformMenuItem::setVisible(bool isVisible)
+{
+
+}
+
+void QPlatformMenuItem::setIsSeparator(bool isSeparator)
+{
+
+}
+
+void QPlatformMenuItem::setFont(const QFont &font)
+{
+
+}
+
+void QPlatformMenuItem::setRole(QPlatformMenuItem::MenuRole role)
+{
+
+}
+
+void QPlatformMenuItem::setChecked(bool isChecked)
+{
+
+}
+
+void QPlatformMenuItem::setShortcut(const QKeySequence& shortcut)
+{
+
+}
+
+void QPlatformMenuItem::setEnabled(bool enabled)
+{
+
+}
+
+void QPlatformMenuItem::setTag(quintptr tag)
+{
+}
+
+quintptr QPlatformMenuItem::tag() const
+{
+    return 0;
+}
+
+void QPlatformMenu::insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem* before)
+{
+
+}
+
+void QPlatformMenu::removeMenuItem(QPlatformMenuItem *menuItem)
+{
+
+}
+
+void QPlatformMenu::syncMenuItem(QPlatformMenuItem *menuItem)
+{
+
+}
+
+void QPlatformMenu::syncSeparatorsCollapsible(bool enable)
+{
+
+}
+
+QPlatformMenuItem* QPlatformMenu::menuItemAt(int position) const
+{
+    return 0;
+}
+
+QPlatformMenuItem* QPlatformMenu::menuItemForTag(quintptr tag) const
+{
+    return 0;
+}
+
+void QPlatformMenuBar::insertMenu(QPlatformMenu *menuItem, QPlatformMenu* before)
+{
+
+}
+
+void QPlatformMenuBar::removeMenu(QPlatformMenu *menuItem)
+{
+
+}
+
+void QPlatformMenuBar::syncMenu(QPlatformMenuItem *menuItem)
+{
+
+}
+
+void QPlatformMenuBar::handleReparent(QWindow *newParentWindow)
+{
+
+}
+
+QPlatformMenu *QPlatformMenuBar::menuForTag(quintptr tag) const
+{
+    Q_UNUSED(tag);
+    return 0;
+}
+
+QT_END_NAMESPACE
diff --git a/src/gui/kernel/qplatformtheme.h b/src/gui/kernel/qplatformtheme.h
index f4406ffabc..4a30898346 100644
--- a/src/gui/kernel/qplatformtheme.h
+++ b/src/gui/kernel/qplatformtheme.h
@@ -61,6 +61,7 @@ QT_BEGIN_NAMESPACE
 
 class QMenu;
 class QMenuBar;
+class QPlatformMenuItem;
 class QPlatformMenu;
 class QPlatformMenuBar;
 class QPlatformDialogHelper;
@@ -163,8 +164,9 @@ public:
 
     virtual ~QPlatformTheme();
 
-    virtual QPlatformMenu *createPlatformMenu(QMenu *menu = 0) const;
-    virtual QPlatformMenuBar *createPlatformMenuBar(QMenuBar *menuBar = 0) const;
+    virtual QPlatformMenuItem* createPlatformMenuItem() const;
+    virtual QPlatformMenu* createPlatformMenu() const;
+    virtual QPlatformMenuBar* createPlatformMenuBar() const;
 
     virtual bool usePlatformNativeDialog(DialogType type) const;
     virtual QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const;
diff --git a/src/gui/kernel/qplatformtheme_qpa.cpp b/src/gui/kernel/qplatformtheme_qpa.cpp
index c9ffbe248f..32204e6a26 100644
--- a/src/gui/kernel/qplatformtheme_qpa.cpp
+++ b/src/gui/kernel/qplatformtheme_qpa.cpp
@@ -109,18 +109,6 @@ QPlatformTheme::~QPlatformTheme()
 
 }
 
-QPlatformMenu *QPlatformTheme::createPlatformMenu(QMenu *menu) const
-{
-    Q_UNUSED(menu);
-    return 0;
-}
-
-QPlatformMenuBar *QPlatformTheme::createPlatformMenuBar(QMenuBar *menuBar) const
-{
-    Q_UNUSED(menuBar);
-    return 0;
-}
-
 bool QPlatformTheme::usePlatformNativeDialog(DialogType type) const
 {
     Q_UNUSED(type);
@@ -183,4 +171,19 @@ QVariant QPlatformTheme::themeHint(ThemeHint hint) const
     return QVariant();
 }
 
+QPlatformMenuItem *QPlatformTheme::createPlatformMenuItem() const
+{
+    return 0;
+}
+
+QPlatformMenu *QPlatformTheme::createPlatformMenu() const
+{
+    return 0;
+}
+
+QPlatformMenuBar *QPlatformTheme::createPlatformMenuBar() const
+{
+    return 0;
+}
+
 QT_END_NAMESPACE