Unity 8

Merge lp:~nick-dedekind/unity8/menus.local.global into lp:unity8

menus.local.global
Merge into trunk

Proposed by Nick Dedekind on 2017-01-25

Status:	Work in progress
Proposed branch:	lp:~nick-dedekind/unity8/menus.local.global
Merge into:	lp:unity8
Prerequisite:	lp:~nick-dedekind/unity8/menu.overflow
Diff against target:	733 lines (+234/-111) 13 files modified data/com.canonical.Unity8.gschema.xml (+5/-0) qml/Panel/Panel.qml (+96/-57) qml/Panel/PanelBar.qml (+1/-2) qml/Panel/PanelItemRow.qml (+8/-28) qml/Panel/PanelMenu.qml (+2/-3) qml/Shell.qml (+4/-1) qml/Stage/DecoratedWindow.qml (+6/-4) qml/Stage/Stage.qml (+2/-0) tests/mocks/GSettings.1.0/fake_gsettings.cpp (+33/-0) tests/mocks/GSettings.1.0/fake_gsettings.h (+9/-0) tests/qmltests/Panel/tst_Panel.qml (+53/-15) tests/qmltests/Stage/tst_DesktopStage.qml (+1/-0) tests/qmltests/tst_Shell.qml (+14/-1)
To merge this branch:	bzr merge lp:~nick-dedekind/unity8/menus.local.global
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Lukáš Tinkl (community)		2017-01-25	Needs Fixing on 2017-01-27
Unity8 CI Bot	continuous-integration		Approve on 2017-01-26
Review via email: mp+315556@code.launchpad.net

Commit message

Added global menu support.

Description of the change

* Are there any related MPs required for this MP to build/function as expected? Please list.
No

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

* If you changed the UI, has there been a design review?
No. need to confirm defualt for global/LIM option.

lp:~nick-dedekind/unity8/menus.local.global updated on 2017-01-25

2785. By Nick Dedekind on 2017-01-25: merged with parent

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-25:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3017/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-25:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3019/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2017-01-26:

Text conflict in data/com.canonical.Unity8.gschema.xml
Text conflict in plugins/Utils/CMakeLists.txt
Text conflict in plugins/Utils/plugin.cpp
Text conflict in qml/Stage/DecoratedWindow.qml
Text conflict in tests/mocks/GSettings.1.0/fake_gsettings.cpp
Text conflict in tests/mocks/GSettings.1.0/fake_gsettings.h
Text conflict in tests/mocks/Utils/CMakeLists.txt
Text conflict in tests/mocks/Utils/plugin.cpp
Text conflict in tests/qmltests/ApplicationMenus/tst_MenuBar.qml
9 conflicts encountered.

lp:~nick-dedekind/unity8/menus.local.global updated on 2017-01-26

2786. By Nick Dedekind on 2017-01-26: merged with parent

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-26:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3045/rebuild

review: Needs Fixing (continuous-integration)

lp:~nick-dedekind/unity8/menus.local.global updated on 2017-01-26

2787. By Nick Dedekind on 2017-01-26: fixed tests

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-26:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3051/rebuild

review: Approve (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2017-01-27:

Just a couple of minor issues inline, otherwise the code looks good; haven't tested yet

review: Needs Fixing

Albert Astals Cid (aacid) wrote on 2017-02-21:

Text conflict in qml/Stage/Stage.qml
1 conflicts encountered

Albert Astals Cid (aacid) wrote on 2017-03-24:

A month without merging → WiP

Unmerged revisions

2787. By Nick Dedekind on 2017-01-26: fixed tests
2786. By Nick Dedekind on 2017-01-26: merged with parent
2785. By Nick Dedekind on 2017-01-25: merged with parent
2784. By Nick Dedekind on 2017-01-25: shader for long title names
2783. By Nick Dedekind on 2017-01-25: fixed animation duration
2782. By Nick Dedekind on 2017-01-25: merged with parent
2781. By Nick Dedekind on 2017-01-25: Global/LI Menus
2780. By Nick Dedekind on 2017-01-24: merged with parent
2779. By Nick Dedekind on 2017-01-24: global menus

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Mohammad Rakibul Hasan

Nick Dedekind

Unity Team

 === modified file 'data/com.canonical.Unity8.gschema.xml'
 --- data/com.canonical.Unity8.gschema.xml	2016-12-10 14:06:18 +0000
 +++ data/com.canonical.Unity8.gschema.xml	2017-01-26 14:02:24 +0000
@@ -58,6 +58,11 @@
        <summary>The uri to the app store</summary>
        <description>This will be used whenever the user triggers an action to open the app store.</description>
      </key>
++    <key type="b" name="enable-global-menus">
++      <default>true</default>
++      <summary>Enable/disable global application menus.</summary>
++      <description>When this is enabled, the application menus will always be shown in the top panel. Otherwise they will appear in the window decoration.</description>
++    </key>
    </schema>
    <schema path="/com/canonical/unity8/greeter/" id="com.canonical.Unity8.Greeter" gettext-domain="unity8">
 === modified file 'qml/Panel/Panel.qml'
 --- qml/Panel/Panel.qml	2017-01-26 14:02:23 +0000
 +++ qml/Panel/Panel.qml	2017-01-26 14:02:24 +0000
@@ -1,4 +1,4 @@
--/*
++/*
   * Copyright (C) 2013-2016 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,7 @@
   */
  import QtQuick 2.4
++import QtGraphicalEffects 1.0
  import Ubuntu.Components 1.3
  import Ubuntu.Layouts 1.0
  import Unity.Application 0.1
@@ -41,6 +42,7 @@
      property real expandedPanelHeight: units.gu(7)
      property real indicatorMenuWidth: width
      property real applicationMenuWidth: width
++    property bool globalMenus: true
      property alias applicationMenus: __applicationMenus
      property alias indicators: __indicators
@@ -87,7 +89,9 @@
                                                      PanelState.decorationsAlwaysVisible
          property bool showPointerMenu: revealControls &&
--                                       (PanelState.decorationsVisible || mode == "staged")
++                                       (PanelState.decorationsVisible || root.globalMenus || mode == "staged")
++
++        property bool showPointerMenuApplicationTitle: showPointerMenu && !showWindowDecorationControls
          property bool enablePointerMenu: revealControls &&
                                           applicationMenus.available &&
@@ -178,59 +182,95 @@
+                 }
+             }
--            Row {
--                anchors.fill: parent
--                spacing: units.gu(2)
--
--                // WindowControlButtons inside the mouse area, otherwise QML doesn't grok nested hover events :/
--                // cf. https://bugreports.qt.io/browse/QTBUG-32909
--                WindowControlButtons {
--                    id: windowControlButtons
--                    objectName: "panelWindowControlButtons"
--                    height: indicators.minimizedPanelHeight
--                    opacity: d.showWindowDecorationControls ? 1 : 0
--                    visible: opacity != 0
--                    Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
--
--                    active: PanelState.decorationsVisible || PanelState.decorationsAlwaysVisible
--                    windowIsMaximized: true
--                    onCloseClicked: PanelState.closeClicked()
--                    onMinimizeClicked: PanelState.minimizeClicked()
--                    onMaximizeClicked: PanelState.restoreClicked()
--                    closeButtonShown: PanelState.closeButtonShown
++            WindowControlButtons {
++                id: windowControlButtons
++                objectName: "panelWindowControlButtons"
++                height: parent.height
++
++                opacity: d.showWindowDecorationControls ? 1 : 0
++                visible: opacity !== 0
++                Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
++
++                active: PanelState.decorationsVisible || PanelState.decorationsAlwaysVisible
++                windowIsMaximized: true
++                onCloseClicked: PanelState.closeClicked()
++                onMinimizeClicked: PanelState.minimizeClicked()
++                onMaximizeClicked: PanelState.restoreClicked()
++                closeButtonShown: PanelState.closeButtonShown
++            }
++
++            Label {
++                id: titleLabel
++                anchors.verticalCenter: parent.verticalCenter
++                anchors.left: parent.left
++                anchors.leftMargin: units.gu(1)
++
++                maximumLineCount: 1
++                fontSize: "medium"
++                font.weight: Font.Medium
++                text: PanelState.title
++                visible: false
++            }
++
++            LinearGradient  {
++                id: titleGradient
++                objectName: "panelTitle"
++                width: titleLabel.width
++                height: titleLabel.height
++                anchors.verticalCenter: parent.verticalCenter
++                anchors.left: parent.left
++                anchors.leftMargin: units.gu(1)
++
++                source: titleLabel
++                gradient: Gradient {
++                    GradientStop { position: 0; color: theme.palette.selected.backgroundText }
++                    GradientStop { position: 0.7; color: theme.palette.selected.backgroundText }
++                    GradientStop { position: 1; color: "transparent" }
+                 }
--
--                Loader {
--                    id: menuBarLoader
--                    height: parent.height
--                    enabled: d.enablePointerMenu
--                    opacity: d.showPointerMenu ? 1 : 0
--                    visible: opacity != 0
--                    Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
--                    active: __applicationMenus.model
--
--                    width: parent.width - windowControlButtons.width - units.gu(2) - __indicators.barWidth
--
--                    property bool menusRequested: menuBarLoader.item ? menuBarLoader.item.showRequested : false
--
--                    sourceComponent: MenuBar {
--                        id: bar
--                        objectName: "menuBar"
--                        anchors.left: parent.left
--                        anchors.margins: units.gu(1)
--                        height: menuBarLoader.height
--                        enableKeyFilter: valid && PanelState.decorationsVisible
--                        unityMenuModel: __applicationMenus.model
--
--                        Connections {
--                            target: __applicationMenus
--                            onShownChanged: bar.dismiss();
--                        }
--
--                        Connections {
--                            target: __indicators
--                            onShownChanged: bar.dismiss();
--                        }
++                start: Qt.point(0, 0)
++                end: Qt.point(endpoint, 0)
++
++                property real endpoint: d.showPointerMenuApplicationTitle ? menuBarLoader.anchors.leftMargin :
++                                        parent.width - __indicators.barWidth
++
++                opacity: d.showTouchMenu || d.showPointerMenuApplicationTitle ? 1 : 0
++                visible: opacity !== 0
++                Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
++            }
++
++            Loader {
++                id: menuBarLoader
++                anchors.left: parent.left
++                anchors.leftMargin: d.showPointerMenuApplicationTitle ? units.gu(8) : (windowControlButtons.width + units.gu(2))
++                height: parent.height
++                enabled: d.enablePointerMenu
++                active: __applicationMenus.model
++
++                opacity: d.showPointerMenu ? 1 : 0
++                visible: opacity !== 0
++                Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
++
++                width: parent.width - anchors.leftMargin - __indicators.barWidth
++
++                property bool menusRequested: menuBarLoader.item ? menuBarLoader.item.showRequested : false
++
++                sourceComponent: MenuBar {
++                    id: bar
++                    objectName: "menuBar"
++                    anchors.left: parent.left
++                    anchors.margins: units.gu(1)
++                    height: menuBarLoader.height
++                    enableKeyFilter: valid && PanelState.decorationsVisible
++                    unityMenuModel: __applicationMenus.model
++
++                    Connections {
++                        target: __applicationMenus
++                        onShownChanged: bar.dismiss();
++                    }
++
++                    Connections {
++                        target: __indicators
++                        onShownChanged: bar.dismiss();
+                     }
+                 }
+             }
@@ -259,6 +299,7 @@
              enableHint: !callHint.active && !fullscreenMode
              showOnClick: false
              panelColor: panelAreaBackground.color
++            barWidth: Math.max(titleLabel.width, units.gu(10))
              onShowTapped: {
                  if (callHint.active) {
@@ -266,8 +307,7 @@
+                 }
+             }
--            showRowTitle: !expanded
--            rowTitle: PanelState.title
++            showRow: expanded
              rowItemDelegate: ActionItem {
                  id: actionItem
                  property int ownIndex: index
@@ -300,7 +340,6 @@
              enabled: d.enableTouchMenus
              opacity: d.showTouchMenu ? 1 : 0
--            visible: opacity != 0
              Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
              onEnabledChanged: {
 === modified file 'qml/Panel/PanelBar.qml'
 --- qml/Panel/PanelBar.qml	2017-01-16 08:51:52 +0000
 +++ qml/Panel/PanelBar.qml	2017-01-26 14:02:24 +0000
@@ -30,8 +30,7 @@
      property real lateralPosition: -1
      property int alignment: Qt.AlignRight
--    property alias showRowTitle: row.showRowTitle
--    property alias rowTitle: row.rowTitle
++    property alias showRow: row.showRow
      property alias rowItemDelegate: row.delegate
      implicitWidth: flickable.contentWidth
 === modified file 'qml/Panel/PanelItemRow.qml'
 --- qml/Panel/PanelItemRow.qml	2017-01-10 00:44:47 +0000
 +++ qml/Panel/PanelItemRow.qml	2017-01-26 14:02:24 +0000
@@ -16,29 +16,28 @@
  import QtQuick 2.4
  import Ubuntu.Components 1.3
++import QtGraphicalEffects 1.0
  import "../Components"
  Item {
      id: root
--    implicitWidth: showRowTitle && !expanded ? rowTitle != "" ? rowLabel.width : 0 : row.width
++    implicitWidth: row.width
      implicitHeight: units.gu(3)
--    property bool showRowTitle: false
--    property alias rowTitle: rowLabel.text
++    property bool showRow: true
      property QtObject model: null
      property real overFlowWidth: width
      property bool expanded: false
--    readonly property alias currentItem: row.currentItem
--    readonly property alias currentItemIndex: row.currentIndex
--
      property real unitProgress: 0.0
      property real selectionChangeBuffer: units.gu(2)
      property bool enableLateralChanges: false
      property color hightlightColor: "#ffffff"
--
      property alias delegate: row.delegate
--
      property real lateralPosition: -1
++
++    readonly property alias currentItem: row.currentItem
++    readonly property alias currentItemIndex: row.currentIndex
++
      onLateralPositionChanged: {
          updateItemFromLateralPosition();
+     }
@@ -138,31 +137,12 @@
          d.previousItem = currentItem;
+     }
--    Label {
--        id: rowLabel
--        objectName: "panelTitle"
--        anchors {
--            left: parent.left
--            leftMargin: units.gu(1)
--            verticalCenter: parent.verticalCenter
--        }
--        width: implicitWidth + units.gu(2)
--        elide: Text.ElideRight
--        maximumLineCount: 1
--        fontSize: "medium"
--        font.weight: Font.Medium
--        color: Theme.palette.selected.backgroundText
--        opacity: showRowTitle ? 1 : 0
--        visible: opacity != 0
--        Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.SnapDuration } }
--    }
--
      ListView {
          id: row
          objectName: "panelRow"
          orientation: ListView.Horizontal
          model: root.model
--        opacity: showRowTitle ? 0 : 1
++        opacity: showRow ? 1 : 0
          // dont set visible on basis of opacity; otherwise width will not be calculated correctly
          anchors {
              top: parent.top
 === modified file 'qml/Panel/PanelMenu.qml'
 --- qml/Panel/PanelMenu.qml	2017-01-16 08:51:52 +0000
 +++ qml/Panel/PanelMenu.qml	2017-01-26 14:02:24 +0000
@@ -35,8 +35,7 @@
      property color panelColor: theme.palette.normal.background
      property alias alignment: bar.alignment
--    property alias rowTitle: bar.rowTitle
--    property alias showRowTitle: bar.showRowTitle
++    property alias showRow: bar.showRow
      property alias rowItemDelegate: bar.rowItemDelegate
      property alias pageDelegate: content.pageDelegate
@@ -45,7 +44,7 @@
      readonly property bool partiallyOpened: unitProgress > 0 && unitProgress < 1.0
      readonly property bool fullyClosed: unitProgress == 0
      readonly property alias expanded: bar.expanded
--    readonly property int barWidth: Math.min(bar.width, bar.implicitWidth)
++    property int barWidth: Math.min(bar.width, bar.implicitWidth)
      signal showTapped()
 === modified file 'qml/Shell.qml'
 --- qml/Shell.qml	2017-01-24 07:43:54 +0000
 +++ qml/Shell.qml	2017-01-26 14:02:24 +0000
@@ -314,6 +314,7 @@
              altTabPressed: physicalKeysMapper.altTabPressed
              oskEnabled: shell.oskEnabled
              spreadEnabled: tutorial.spreadEnabled && (!greeter || (!greeter.hasLockedApp && !greeter.shown))
++            globalMenus : settings.enableGlobalMenus
              onSpreadShownChanged: {
                  panel.indicators.hide();
@@ -492,12 +493,14 @@
              id: panel
              objectName: "panel"
              anchors.fill: parent //because this draws indicator menus
++            z: shell.usageScenario === "desktop" ? 1 : 0 // otherwise the menus are drawn below the panel.
--            mode: shell.usageScenario == "desktop" ? "windowed" : "staged"
++            mode: shell.usageScenario === "desktop" ? "windowed" : "staged"
              minimizedPanelHeight: units.gu(3)
              expandedPanelHeight: units.gu(7)
              indicatorMenuWidth: parent.width > units.gu(60) ? units.gu(40) : parent.width
              applicationMenuWidth: parent.width > units.gu(60) ? units.gu(40) : parent.width
++            globalMenus: settings.enableGlobalMenus
              indicators {
                  hides: [launcher]
 === modified file 'qml/Stage/DecoratedWindow.qml'
 --- qml/Stage/DecoratedWindow.qml	2017-01-18 17:34:57 +0000
 +++ qml/Stage/DecoratedWindow.qml	2017-01-26 14:02:24 +0000
@@ -48,6 +48,7 @@
      property int highlightSize: units.gu(1)
      property real shadowOpacity: 0
      property bool darkening: false
++    property bool enableMenus: false
      property real requestedWidth
      property real requestedHeight
@@ -224,11 +225,12 @@
          onMinimizeClicked: root.minimizeClicked();
          enableMenus: {
--            return active &&
--                     surface &&
--                      (PanelState.focusedPersistentSurfaceId === surface.persistentId && !PanelState.decorationsVisible)
++            return root.enableMenus &&
++                   active &&
++                   surface &&
++                   (PanelState.focusedPersistentSurfaceId === surface.persistentId && !PanelState.decorationsVisible)
+         }
--        menu: sharedAppModel.model
++        menu: root.enableMenus ? sharedAppModel.model : undefined
          Indicators.SharedUnityMenuModel {
              id: sharedAppModel
 === modified file 'qml/Stage/Stage.qml'
 --- qml/Stage/Stage.qml	2017-01-03 12:04:08 +0000
 +++ qml/Stage/Stage.qml	2017-01-26 14:02:24 +0000
@@ -46,6 +46,7 @@
      property int leftMargin: 0
      property bool oskEnabled: false
      property rect inputMethodRect
++    property bool globalMenus: true
      // Configuration
      property string mode: "staged"
@@ -1550,6 +1551,7 @@
                      highlightSize: windowInfoItem.iconMargin / 2
                      stageWidth: appContainer.width
                      stageHeight: appContainer.height
++                    enableMenus: !root.globalMenus
                      requestedWidth: appDelegate.requestedWidth
                      requestedHeight: appDelegate.requestedHeight
 === modified file 'tests/mocks/GSettings.1.0/fake_gsettings.cpp'
 --- tests/mocks/GSettings.1.0/fake_gsettings.cpp	2016-12-10 14:06:18 +0000
 +++ tests/mocks/GSettings.1.0/fake_gsettings.cpp	2017-01-26 14:02:24 +0000
@@ -29,6 +29,7 @@
      , m_edgeDragWidth(2)
      , m_enableLauncher(true)
      , m_enableIndicatorMenu(true)
++    , m_enableGlobalMenus(true)
      , m_appstoreUri("http://uappexplorer.com")
+ {
+ }
@@ -179,6 +180,19 @@
      return m_appstoreUri;
+ }
++bool GSettingsControllerQml::enableGlobalMenus() const
++{
++    return m_enableGlobalMenus;
++}
++
++void GSettingsControllerQml::setEnableGlobalMenus(bool enableGlobalMenus)
++{
++    if (m_enableGlobalMenus != enableGlobalMenus) {
++        m_enableGlobalMenus = enableGlobalMenus;
++        Q_EMIT enableGlobalMenusChanged(enableGlobalMenus);
++    }
++}
++
  GSettingsSchemaQml::GSettingsSchemaQml(QObject *parent): QObject(parent) {
+ }
@@ -247,6 +261,8 @@
              this, &GSettingsQml::enableLauncherChanged);
      connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::enableIndicatorMenuChanged,
              this, &GSettingsQml::enableIndicatorMenuChanged);
++    connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::enableGlobalMenusChanged,
++            this, &GSettingsQml::enableGlobalMenusChanged);
      Q_EMIT disableHeightChanged();
      Q_EMIT pictureUriChanged();
@@ -258,6 +274,7 @@
      Q_EMIT edgeDragWidthChanged();
      Q_EMIT enableLauncherChanged();
      Q_EMIT enableIndicatorMenuChanged();
++    Q_EMIT enableGlobalMenusChanged();
+ }
  GSettingsSchemaQml * GSettingsQml::schema() const {
@@ -390,6 +407,15 @@
      return QVariant();
+ }
++QVariant GSettingsQml::enableGlobalMenus() const
++{
++    if (m_valid && m_schema->id() == "com.canonical.Unity8") {
++        return GSettingsControllerQml::instance()->enableGlobalMenus();
++    } else {
++        return QVariant();
++    }
++}
++
  void GSettingsQml::setLifecycleExemptAppids(const QVariant &appIds)
+ {
      if (m_valid && m_schema->id() == "com.canonical.qtmir") {
@@ -431,3 +457,10 @@
          GSettingsControllerQml::instance()->setEnableIndicatorMenu(enableIndicatorMenu.toBool());
+     }
+ }
++
++void GSettingsQml::setEnableGlobalMenus(const QVariant &enableGlobalMenus)
++{
++    if (m_valid && m_schema->id() == "com.canonical.Unity8") {
++        GSettingsControllerQml::instance()->setEnableGlobalMenus(enableGlobalMenus.toBool());
++    }
++}
 === modified file 'tests/mocks/GSettings.1.0/fake_gsettings.h'
 --- tests/mocks/GSettings.1.0/fake_gsettings.h	2016-12-10 14:06:18 +0000
 +++ tests/mocks/GSettings.1.0/fake_gsettings.h	2017-01-26 14:02:24 +0000
@@ -59,6 +59,7 @@
      Q_PROPERTY(QVariant edgeDragWidth READ edgeDragWidth WRITE setEdgeDragWidth NOTIFY edgeDragWidthChanged)
      Q_PROPERTY(QVariant enableLauncher READ enableLauncher WRITE setEnableLauncher NOTIFY enableLauncherChanged)
      Q_PROPERTY(QVariant enableIndicatorMenu READ enableIndicatorMenu WRITE setEnableIndicatorMenu NOTIFY enableIndicatorMenuChanged)
++    Q_PROPERTY(QVariant enableGlobalMenus READ enableGlobalMenus WRITE setEnableGlobalMenus NOTIFY enableGlobalMenusChanged)
      Q_PROPERTY(QVariant appstoreUri READ appstoreUri NOTIFY appstoreUriChanged)
  public:
@@ -78,6 +79,7 @@
      QVariant edgeDragWidth() const;
      QVariant enableLauncher() const;
      QVariant enableIndicatorMenu() const;
++    QVariant enableGlobalMenus() const;
      QVariant appstoreUri() const;
      void setDisableHeight(const QVariant &val);
@@ -90,6 +92,7 @@
      void setEdgeDragWidth(const QVariant &edgeDragWidth);
      void setEnableLauncher(const QVariant &enableLauncher);
      void setEnableIndicatorMenu(const QVariant &enableIndicatorMenu);
++    void setEnableGlobalMenus(const QVariant &enableGlobalMenus);
  Q_SIGNALS:
      void disableHeightChanged();
@@ -103,6 +106,7 @@
      void edgeDragWidthChanged();
      void enableLauncherChanged();
      void enableIndicatorMenuChanged();
++    void enableGlobalMenusChanged();
      void appstoreUriChanged();
  private:
@@ -150,6 +154,9 @@
      bool enableIndicatorMenu() const;
      Q_INVOKABLE void setEnableIndicatorMenu(bool enableIndicatorMenu);
++    bool enableGlobalMenus() const;
++    Q_INVOKABLE void setEnableGlobalMenus(bool enableGlobalMenus);
++
      QString appstoreUri() const;
  Q_SIGNALS:
@@ -163,6 +170,7 @@
      void edgeDragWidthChanged(uint edgeDragWidth);
      void enableLauncherChanged(bool enableLauncher);
      void enableIndicatorMenuChanged(bool enableIndicatorMenu);
++    void enableGlobalMenusChanged(bool enableGlobalMenus);
      void appstoreUriChanged(const QString &appstoreUri);
  private:
@@ -178,6 +186,7 @@
      uint m_edgeDragWidth;
      bool m_enableLauncher;
      bool m_enableIndicatorMenu;
++    bool m_enableGlobalMenus;
      QString m_appstoreUri;
      static GSettingsControllerQml* s_controllerInstance;
 === modified file 'tests/qmltests/Panel/tst_Panel.qml'
 --- tests/qmltests/Panel/tst_Panel.qml	2017-01-24 07:44:18 +0000
 +++ tests/qmltests/Panel/tst_Panel.qml	2017-01-26 14:02:24 +0000
@@ -78,6 +78,7 @@
                      id: panel
                      anchors.fill: parent
                      mode: modeSelector.model[modeSelector.selectedIndex]
++                    globalMenus: false
                      indicatorMenuWidth: parent.width > units.gu(60) ? units.gu(40) : parent.width
                      applicationMenuWidth: parent.width > units.gu(60) ? units.gu(40) : parent.width
@@ -225,6 +226,18 @@
                      color: "white"
+                 }
+             }
++
++            RowLayout {
++                Layout.fillWidth: true
++                CheckBox {
++                    checked: panel.globalMenus
++                    onCheckedChanged: panel.globalMenus = checked
++                }
++                Label {
++                    text: "Global Menus"
++                    color: "white"
++                }
++            }
+         }
+     }
@@ -251,6 +264,7 @@
          function init() {
              panel.mode = "staged";
++            panel.globalMenus = true;
              mouseEmulation.checked = true;
              panel.fullscreenMode = false;
              callManager.foregroundCall = null;
@@ -269,12 +283,13 @@
              compare(windowControlButtonsSpy.valid, true);
              waitForRendering(panel);
++            waitForAllAnimationToComplete("initial");
+         }
          function cleanup() {
              panel.indicators.hide();
              panel.applicationMenus.hide();
--            waitForAllAnimationToComplete("initial");
++            mouseMove(panel, -1, -1);
+         }
          function get_indicator_item(index) {
@@ -761,44 +776,67 @@
+             }
+         }
--        function test_stagedApplicationMenuBarShowOnMouseHover() {
++        function test_stagedApplicationMenuBarShowOnMouseHover_data() {
++            return [
++                { tag: "windowed-global", mode: "windowed", global: true },
++                { tag: "windowed-local", mode: "windowed", global: false },
++                { tag: "staged-global", mode: "staged", global: true },
++                { tag: "staged-local", mode: "staged", global: false },
++            ];
++        }
++
++        function test_stagedApplicationMenuBarShowOnMouseHover(data) {
              PanelState.title = "Fake Title";
--            panel.mode = "staged";
++            panel.mode = data.mode;
++            panel.globalMenus = data.global;
              mouseEmulation.checked = false;
--            var appTitle = findChild(panel.applicationMenus, "panelTitle"); verify(appTitle);
++            var panelTitle = findChild(panel, "panelTitle"); verify(panelTitle);
              var appMenuRow = findChild(panel.applicationMenus, "panelRow"); verify(appMenuRow);
              var appMenuBar = findChild(panel, "menuBar"); verify(appMenuBar);
--            tryCompare(appTitle, "visible", true, undefined, "App title should be visible");
++            tryCompare(panelTitle, "visible", true, undefined, "App title should be visible");
              tryCompare(appMenuBar, "visible", false, undefined, "App menu bar should not be visible");
              mouseMove(panel, panel.width/2, panel.panelHeight);
--            tryCompare(appTitle, "visible", false, undefined, "App title should not be visible on mouse hover");
--            tryCompare(appMenuBar, "visible", true, undefined, "App menu bar should be visible on mouse hover");
--        }
--
--        function test_windowedApplicationMenuShowOnMouseHoverWhenDecorationsShown() {
++            tryCompare(panelTitle, "visible", true, undefined, "App title should be visible");
++            tryCompare(appMenuBar, "visible", data.mode == "staged" || data.global, undefined, "App menu bar should be visible on mouse hover");
++
++            mouseMove(panel, panel.width/2, panel.panelHeight * 2);
++
++            tryCompare(panelTitle, "visible", true, undefined, "App title should be visible");
++            tryCompare(appMenuBar, "visible", false, undefined, "App menu bar should not be visible");
++        }
++
++        function test_windowedApplicationMenuShowOnMouseHoverWhenDecorationsShown_data() {
++            return [
++                { tag: "global", global: true },
++                { tag: "local", global: false }
++            ];
++        }
++
++        function test_windowedApplicationMenuShowOnMouseHoverWhenDecorationsShown(data) {
              PanelState.title = "Fake Title";
              panel.mode = "windowed";
++            panel.globalMenus = data.global;
              mouseEmulation.checked = false;
--            var appTitle = findChild(panel.applicationMenus, "panelTitle"); verify(appTitle);
++            var panelTitle = findChild(panel, "panelTitle"); verify(panelTitle);
              var appMenuRow = findChild(panel.applicationMenus, "panelRow"); verify(appMenuRow);
              var appMenuBar = findChild(panel, "menuBar"); verify(appMenuBar);
--            tryCompare(appTitle, "visible", true, undefined, "App title should be visible");
++            tryCompare(panelTitle, "visible", true, undefined, "App title should be visible");
              tryCompare(appMenuBar, "visible", false, undefined, "App menu bar should not be visible");
              mouseMove(panel, panel.width/2, panel.panelHeight);
--            tryCompare(appTitle, "visible", true, undefined, "App title should still be visible on mouse hover when panel decorations are not visible");
--            tryCompare(appMenuBar, "visible", false, undefined, "App menu bar should be visible on mouse hover when panel decorations are not visible");
++            tryCompare(panelTitle, "visible", true, undefined, "App title should still be visible on mouse hover when panel decorations are not visible");
++            tryCompare(appMenuBar, "visible", data.global, undefined, "App menu bar should only be visible on mouse hover if using globl menus");
              PanelState.decorationsVisible = true;
--            tryCompare(appTitle, "visible", false, undefined, "App title should still be visible on mouse hover when panel decorations are visible");
++            tryCompare(panelTitle, "visible", false, undefined, "App title should still be visible on mouse hover when panel decorations are visible");
              tryCompare(appMenuBar, "visible", true, undefined, "App menu bar should be visible on mouse hover when panel decorations not visible");
+         }
 === modified file 'tests/qmltests/Stage/tst_DesktopStage.qml'
 --- tests/qmltests/Stage/tst_DesktopStage.qml	2017-01-10 14:44:29 +0000
 +++ tests/qmltests/Stage/tst_DesktopStage.qml	2017-01-26 14:02:24 +0000
@@ -84,6 +84,7 @@
          property bool itemDestroyed: false
          sourceComponent: Component {
              Stage {
++                globalMenus: false
                  anchors.fill: parent
                  background: "/usr/share/backgrounds/warty-final-ubuntu.png"
                  focus: true
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2017-01-24 07:43:54 +0000
 +++ tests/qmltests/tst_Shell.qml	2017-01-26 14:02:24 +0000
@@ -308,6 +308,19 @@
+                     }
+                 }
++                Row {
++                    anchors { left: parent.left; right: parent.right }
++                    CheckBox {
++                        checked: GSettingsController.enableGlobalMenus
++                        onCheckedChanged:  {
++                            GSettingsController.setEnableGlobalMenus(checked)
++                        }
++                    }
++                    Label {
++                        text: "Enable Global Menus"
++                    }
++                }
++
                  Label { text: "Applications"; font.bold: true }
                  Button {
@@ -2744,7 +2757,7 @@
              loadShell(data.tag);
              var panel = findChild(shell, "panel"); verify(panel);
--            var panelTitle = findChild(panel.applicationMenus, "panelTitle"); verify(panelTitle);
++            var panelTitle = findChild(panel, "panelTitle"); verify(panelTitle);
              compare(panelTitle.visible, false, "Panel title should not be visible when greeter is shown");
              swipeAwayGreeter();