summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2014-10-03 13:46:52 +0200
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2014-10-06 17:41:21 +0200
commit479cbf54810ae548362775fe138f86ded4b5f1cb (patch)
tree2935b1aac6dcd6fad402b33b9aaa1f331b54caca /examples
parenta6f0c8dad5f7e341339ba2b44a5cc1aafa704364 (diff)
downloadqtquickcontrols-479cbf54810ae548362775fe138f86ded4b5f1cb.tar.gz
gallery: get rid of the dummy child window
This is material for a manual _desktop_ test application. Change-Id: I9fe10ca05184410b53331bdd7b3157daaceb7640 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/quick/controls/gallery/content/ChildWindow.qml120
-rw-r--r--examples/quick/controls/gallery/gallery.pro1
-rw-r--r--examples/quick/controls/gallery/images/window-new.pngbin671 -> 0 bytes
-rw-r--r--examples/quick/controls/gallery/main.qml8
-rw-r--r--examples/quick/controls/gallery/resources.qrc3
5 files changed, 0 insertions, 132 deletions
diff --git a/examples/quick/controls/gallery/content/ChildWindow.qml b/examples/quick/controls/gallery/content/ChildWindow.qml
deleted file mode 100644
index 334b11e5..00000000
--- a/examples/quick/controls/gallery/content/ChildWindow.qml
+++ /dev/null
@@ -1,120 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Quick Controls module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** 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 Digia Plc and its Subsidiary(-ies) 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.2
-import QtQuick.Window 2.1
-import QtQuick.Controls 1.2
-
-Window {
- id: window1
-
- width: 400
- height: 400
-
- title: "child window"
- flags: Qt.Dialog
- color: syspal.window
-
- SystemPalette { id: syspal }
-
- Label {
- id: dimensionsText
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.top: parent.top
- width: parent.width
- horizontalAlignment: Text.AlignHCenter
- }
-
- Label {
- id: availableDimensionsText
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.top: dimensionsText.bottom
- width: parent.width
- horizontalAlignment: Text.AlignHCenter
- }
-
- Label {
- id: closeText
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.top: availableDimensionsText.bottom
- text: "This is a new Window, press the\nbutton below to close it again."
- }
- Button {
- anchors.horizontalCenter: closeText.horizontalCenter
- anchors.top: closeText.bottom
- id: closeWindowButton
- text:"Close"
- width: 98
- tooltip:"Press me, to close this window again"
- onClicked: window1.visible = false
- }
- Button {
- anchors.horizontalCenter: closeText.horizontalCenter
- anchors.top: closeWindowButton.bottom
- id: maximizeWindowButton
- text:"Maximize"
- width: 98
- tooltip:"Press me, to maximize this window again"
- onClicked: window1.visibility = Window.Maximized;
- }
- Button {
- anchors.horizontalCenter: closeText.horizontalCenter
- anchors.top: maximizeWindowButton.bottom
- id: normalizeWindowButton
- text:"Normalize"
- width: 98
- tooltip:"Press me, to normalize this window again"
- onClicked: window1.visibility = Window.Windowed;
- }
- Button {
- anchors.horizontalCenter: closeText.horizontalCenter
- anchors.top: normalizeWindowButton.bottom
- id: minimizeWindowButton
- text:"Minimize"
- width: 98
- tooltip:"Press me, to minimize this window again"
- onClicked: window1.visibility = Window.Minimized;
- }
-}
-
diff --git a/examples/quick/controls/gallery/gallery.pro b/examples/quick/controls/gallery/gallery.pro
index e10e9763..992dd891 100644
--- a/examples/quick/controls/gallery/gallery.pro
+++ b/examples/quick/controls/gallery/gallery.pro
@@ -8,7 +8,6 @@ include(../shared/shared.pri)
OTHER_FILES += \
main.qml \
content/AboutDialog.qml \
- content/ChildWindow.qml \
content/Controls.qml \
content/ImageViewer.qml \
content/ModelView.qml \
diff --git a/examples/quick/controls/gallery/images/window-new.png b/examples/quick/controls/gallery/images/window-new.png
deleted file mode 100644
index e091702e..00000000
--- a/examples/quick/controls/gallery/images/window-new.png
+++ /dev/null
Binary files differ
diff --git a/examples/quick/controls/gallery/main.qml b/examples/quick/controls/gallery/main.qml
index c1d61a68..9d0c344f 100644
--- a/examples/quick/controls/gallery/main.qml
+++ b/examples/quick/controls/gallery/main.qml
@@ -103,20 +103,12 @@ ApplicationWindow {
onTriggered: activeFocusItem.paste()
}
- ChildWindow { id: window1 }
-
toolBar: ToolBar {
id: toolbar
RowLayout {
id: toolbarLayout
spacing: 0
anchors.fill: parent
- ToolButton {
- iconSource: "images/window-new.png"
- onClicked: window1.visible = !window1.visible
- Accessible.name: "New window"
- tooltip: "Toggle visibility of the second window"
- }
ToolButton { action: openAction }
ToolButton {
Accessible.name: "Save as"
diff --git a/examples/quick/controls/gallery/resources.qrc b/examples/quick/controls/gallery/resources.qrc
index f6c53bdf..57d803b2 100644
--- a/examples/quick/controls/gallery/resources.qrc
+++ b/examples/quick/controls/gallery/resources.qrc
@@ -2,7 +2,6 @@
<qresource prefix="/">
<file>main.qml</file>
<file>content/AboutDialog.qml</file>
- <file>content/ChildWindow.qml</file>
<file>content/Controls.qml</file>
<file>content/ImageViewer.qml</file>
<file>content/ModelView.qml</file>
@@ -14,8 +13,6 @@
<file>images/folder_new.png</file>
<file>images/tab.png</file>
<file>images/tab_selected.png</file>
- <file>images/window-new.png</file>
- <file>images/window-new@2x.png</file>
<file>images/bubble.png</file>
<file>images/button-pressed.png</file>
<file>images/button.png</file>