Wearable: merge MainContainer.qml into wearable.qml

Utilize the header-content-footer layout of AppWindow.

Change-Id: I50a53fd5c372161af738e5d53085c669cf2614b8
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

3 files changed, 28 insertions, 108 deletions

diff --git a/examples/quickcontrols2/wearable/qml/MainContainer.qml b/examples/quickcontrols2/wearable/qml/MainContainer.qml
deleted file mode 100644
index 6b6045d9..00000000
--- a/examples/quickcontrols2/wearable/qml/MainContainer.qml
+++ /dev/null
@@ -1,104 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** 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.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.7
-import QtQuick.Controls 2.0 as QQC2
-import "WatchFace"
-import "Fitness"
-import "Navigation"
-import "Style"
-
-Item {
-    NaviButton {
-        id: homeButton
-
-        z: 2
-
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-        edge: Qt.TopEdge
-        enabled: stackView.depth > 1
-        imageSource: "../images/home.png"
-
-        onClicked: stackView.pop(null)
-    }
-
-    QQC2.StackView {
-        id: stackView
-
-        anchors.top: homeButton.bottom
-        anchors.bottom: backButton.top
-
-        width: parent.width
-
-        focus: true
-
-        initialItem: LauncherMain {
-        }
-    }
-
-    NaviButton {
-        id: backButton
-
-        z: 2
-
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-        edge: Qt.BottomEdge
-        enabled: stackView.depth > 1
-        imageSource: "../images/back.png"
-
-        onClicked: stackView.pop()
-    }
-}
diff --git a/examples/quickcontrols2/wearable/wearable.qml b/examples/quickcontrols2/wearable/wearable.qml
index 8d596665..15c75494 100644
--- a/examples/quickcontrols2/wearable/wearable.qml
+++ b/examples/quickcontrols2/wearable/wearable.qml
@@ -49,11 +49,11 @@
 ****************************************************************************/
 
 import QtQuick 2.7
-import QtQuick.Controls 2.0
+import QtQuick.Controls 2.0 as QQC2
 import "qml"
 import "qml/Style"
 
-ApplicationWindow {
+QQC2.ApplicationWindow {
     id: window
 
     visible: true
@@ -67,7 +67,32 @@ ApplicationWindow {
         source: "images/background/HomeBackground.png"
     }
 
-    MainContainer {
+    header: NaviButton {
+        id: homeButton
+
+        edge: Qt.TopEdge
+        enabled: stackView.depth > 1
+        imageSource: "images/home.png"
+
+        onClicked: stackView.pop(null)
+    }
+
+    footer: NaviButton {
+        id: backButton
+
+        edge: Qt.BottomEdge
+        enabled: stackView.depth > 1
+        imageSource: "images/back.png"
+
+        onClicked: stackView.pop()
+    }
+
+    QQC2.StackView {
+        id: stackView
+
+        focus: true
         anchors.fill: parent
+
+        initialItem: LauncherMain { }
     }
 }
diff --git a/examples/quickcontrols2/wearable/wearable.qrc b/examples/quickcontrols2/wearable/wearable.qrc
index 312c09ff..f89f2494 100644
--- a/examples/quickcontrols2/wearable/wearable.qrc
+++ b/examples/quickcontrols2/wearable/wearable.qrc
@@ -6,7 +6,6 @@
         <file>qml/Fitness/fitness.js</file>
         <file>qml/Fitness/FitnessMain.qml</file>
         <file>qml/LauncherMain.qml</file>
-        <file>qml/MainContainer.qml</file>
         <file>qml/NaviButton.qml</file>
         <file>qml/Navigation/navigation.js</file>
         <file>qml/Navigation/NavigationMain.qml</file>