Introduce MenuBar

MenuBar is an ordinary Item. It can be located basically anywhere, but
the idea is to introduce a new ApplicationWindow::menuBar property in a
follow-up commit. Currently the example snippets are using the header
property.

[ChangeLog][Controls][MenuBar] Introduced a MenuBar control.

Task-number: QTBUG-60350
Change-Id: Ie66dc457a3d8edbe8362fab2a591dc49442c95e2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

6 files changed, 179 insertions, 0 deletions

diff --git a/src/imports/controls/doc/images/qtquickcontrols2-menubar-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-menubar-custom.png
new file mode 100644
index 00000000..3903e31d
--- /dev/null
+++ b/src/imports/controls/doc/images/qtquickcontrols2-menubar-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-menubar.png b/src/imports/controls/doc/images/qtquickcontrols2-menubar.png
new file mode 100644
index 00000000..94e3676f
--- /dev/null
+++ b/src/imports/controls/doc/images/qtquickcontrols2-menubar.png
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menubar-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menubar-custom.qml
new file mode 100644
index 00000000..f328d0e5
--- /dev/null
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menubar-custom.qml
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.9
+import QtQuick.Controls 2.3
+
+ApplicationWindow {
+    id: window
+    visible: true
+    width: menuBar.implicitWidth
+    height: menuBar.height
+
+    Component.onCompleted: menuBar.itemAt(1).highlighted = true
+
+    header:
+
+// Indent it like this so that the indenting in the generated doc is normal.
+MenuBar {
+    id: menuBar
+
+    Menu { title: qsTr("File") }
+    Menu { title: qsTr("Edit") }
+    Menu { title: qsTr("View") }
+    Menu { title: qsTr("Help") }
+
+    delegate: MenuBarItem {
+        id: menuBarItem
+
+        contentItem: Text {
+            text: menuBarItem.text
+            font: menuBarItem.font
+            opacity: enabled ? 1.0 : 0.3
+            color: menuBarItem.highlighted ? "#ffffff" : "#21be2b"
+            horizontalAlignment: Text.AlignLeft
+            verticalAlignment: Text.AlignVCenter
+            elide: Text.ElideRight
+        }
+
+        background: Rectangle {
+            implicitWidth: 40
+            implicitHeight: 40
+            opacity: enabled ? 1 : 0.3
+            color: menuBarItem.highlighted ? "#21be2b" : "transparent"
+        }
+    }
+
+    background: Rectangle {
+        implicitWidth: 40
+        implicitHeight: 40
+        color: "#ffffff"
+
+        Rectangle {
+            color: "#21be2b"
+            width: parent.width
+            height: 1
+            anchors.bottom: parent.bottom
+        }
+    }
+}
+} //! [eof]
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml
new file mode 100644
index 00000000..94d1dc7a
--- /dev/null
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.9
+import QtQuick.Controls 2.3
+
+//! [begin]
+ApplicationWindow {
+    id: window
+    width: 320
+    height: 260
+    visible: true
+
+    //! [skipfrom]
+    Component.onCompleted: {
+        header.itemAt(0).triggered()
+        header.itemAt(0).menu.itemAt(2).highlighted = true
+    }
+    //! [skipto]
+
+    header: MenuBar {
+        Menu {
+            title: qsTr("File")
+            Action { text: qsTr("New...") }
+            Action { text: qsTr("Open...") }
+            Action { text: qsTr("Save") }
+            Action { text: qsTr("Save As...") }
+            MenuSeparator { }
+            Action { text: qsTr("Quit") }
+        }
+        Menu {
+            title: qsTr("Edit")
+            Action { text: qsTr("Cut") }
+            Action { text: qsTr("Copy") }
+            Action { text: qsTr("Paste") }
+        }
+        Menu {
+            title: qsTr("Help")
+            Action { text: qsTr("About") }
+        }
+    }
+}
+//! [end]
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
index 46d8a0c6..a1d65396 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
@@ -560,6 +560,21 @@
         \printto eof
 
 
+    \section2 Customizing MenuBar
+
+        MenuBar can have a visual \l {Control::background}{background} item,
+        and MenuBarItem consists of two visual items: \l {Control::background}
+        {background} and \l {Control::contentItem}{content item}.
+
+        \image qtquickcontrols2-menubar-custom.png
+
+        \quotefromfile qtquickcontrols2-menubar-custom.qml
+        \skipto import QtQuick 2.9
+        \printuntil import QtQuick.Controls 2.3
+        \skipto MenuBar
+        \printto eof
+
+
     \section2 Customizing PageIndicator
 
         PageIndicator consists of a \l {Control::background}{background}, \l {Control::contentItem}{content item}, and \l {PageIndicator::delegate}{delegate}.
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-menus.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-menus.qdoc
index 3c30ed38..43db2092 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-menus.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-menus.qdoc
@@ -52,4 +52,17 @@
     \li is highlighted (for example, on keyboard navigation)
     \li performs some action on activation
     \endlist
+
+    \section1 MenuBar Control
+
+    \image qtquickcontrols2-menubar.png
+
+    \l MenuBar control can be used for window menu bars.
+
+    \l MenuBarItem is an item in the MenuBar control. Each item in a menu bar:
+    \list
+    \li displays text to the user
+    \li is highlighted (for example, on keyboard navigation)
+    \li pops up the respective menu on activation
+    \endlist
 */