aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@digia.com>2014-08-04 13:44:09 +0200
committerThomas Hartmann <Thomas.Hartmann@digia.com>2014-08-11 13:53:25 +0200
commit75d9ce0f96404ca0cafb46b47b2eddb2b1299134 (patch)
treedfff9f5399906fd4d681db9dbe0ffebd44b029c8 /share
parent13987a92ab786d23452dfcd4d3323e29806b8de0 (diff)
QmlDesigner.NodeInstances: improve mockup for Window
The window mockup now contains some support for the toolbar of ApplicationWindow. The status bar is always invisble and just a place holder. I reduced the import for QtQuick 2 to support Qt 5.1. Change-Id: Ic2241bf3fdd0d2967f988add06075a9e145a1cbc Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/qml/qmlpuppet/mockfiles/Window.qml41
1 files changed, 40 insertions, 1 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/Window.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/Window.qml
index e04c067cf8..e9788e4bea 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/Window.qml
+++ b/share/qtcreator/qml/qmlpuppet/mockfiles/Window.qml
@@ -1,5 +1,44 @@
-import QtQuick 2.2
+import QtQuick 2.1
+import QtQuick.Controls 1.0
Rectangle {
property string title
+
+ property Item toolBar
+ property Item statusBar
+
+ property alias contentItem : contentArea
+ default property alias data: contentArea.data
+
+ onStatusBarChanged: { if (statusBar) { statusBar.parent = statusBarArea } }
+ onToolBarChanged: { if (toolBar) { toolBar.parent = toolBarArea } }
+
+ Item {
+ id: contentArea
+ anchors.top: toolBarArea.bottom
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.bottom: statusBarArea.top
+ }
+
+ Item {
+ id: toolBarArea
+ anchors.top: parent.top
+ anchors.left: parent.left
+ anchors.right: parent.right
+ implicitHeight: childrenRect.height
+ height: visibleChildren.length > 0 ? implicitHeight: 0
+ }
+
+ Item {
+ id: statusBarArea
+ anchors.bottom: parent.bottom
+ anchors.left: parent.left
+ anchors.right: parent.right
+ implicitHeight: childrenRect.height
+ height: 0
+ //The status bar is not visible for now
+ //height: visibleChildren.length > 0 ? implicitHeight: 0
+ }
+
}