From ca01d5f9f5e960337a044be6e00de58fd4fbdb05 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Fri, 24 Jan 2014 13:22:02 +0100 Subject: Make basicsuite demos run stand-alone This change will make the demos run standalone when built in Qt Creator. - Rename example directories to lowercase/non-whitespace to avoid build & deployment problems - Add title.txt files so titles remain displayed correctly in the launcher - Add a common shared source files used for the standalone apps, and .pro-files for each example - Remove .qmlproject files (not needed) - Adjust documentation to match the new directory structure Change-Id: Ib24e461952da3b2c88aab0363249115ea44ee0f2 Reviewed-by: Eirik Aavitsland --- basicsuite/controls-layouts/controls-layouts.pro | 10 ++ basicsuite/controls-layouts/description.txt | 3 + basicsuite/controls-layouts/main.qml | 118 +++++++++++++++++++++++ basicsuite/controls-layouts/preview_l.jpg | Bin 0 -> 11273 bytes basicsuite/controls-layouts/title.txt | 1 + 5 files changed, 132 insertions(+) create mode 100644 basicsuite/controls-layouts/controls-layouts.pro create mode 100644 basicsuite/controls-layouts/description.txt create mode 100644 basicsuite/controls-layouts/main.qml create mode 100644 basicsuite/controls-layouts/preview_l.jpg create mode 100644 basicsuite/controls-layouts/title.txt (limited to 'basicsuite/controls-layouts') diff --git a/basicsuite/controls-layouts/controls-layouts.pro b/basicsuite/controls-layouts/controls-layouts.pro new file mode 100644 index 0000000..bbf91d5 --- /dev/null +++ b/basicsuite/controls-layouts/controls-layouts.pro @@ -0,0 +1,10 @@ +TARGET = controls-layouts + +include(../shared/shared.pri) + +content.files = *.qml +content.path = $$DESTPATH + +OTHER_FILES += $${content.files} + +INSTALLS += target content \ No newline at end of file diff --git a/basicsuite/controls-layouts/description.txt b/basicsuite/controls-layouts/description.txt new file mode 100644 index 0000000..393f0dd --- /dev/null +++ b/basicsuite/controls-layouts/description.txt @@ -0,0 +1,3 @@ +The "Controls Layout" demonstration aims to show some of the features available in the layout system of the Qt Quick Controls. The layout system in Qt Quick Controls adds GridLayout, RowLayout and ColumnLayout which interact with size-hints from individual controls, making it possible to create interfaces that adapt to various dimensions and still look good. + +The example has been adapted slightly to run inside this launcher, the original is available in the Qt Quick Controls repository. diff --git a/basicsuite/controls-layouts/main.qml b/basicsuite/controls-layouts/main.qml new file mode 100644 index 0000000..b12b6c8 --- /dev/null +++ b/basicsuite/controls-layouts/main.qml @@ -0,0 +1,118 @@ +/**************************************************************************** +** +** 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.1 +import QtQuick.Controls 1.0 +import QtQuick.Layouts 1.0 + +Rectangle { + + gradient: Gradient { + GradientStop { position: 0; color: "white" } + GradientStop { position: 1; color: "lightgray" } + } + + property int margin: 11 + width: 1280 + height: 720 + + ColumnLayout { + id: mainLayout + anchors.fill: parent + anchors.margins: margin + GroupBox { + id: rowBox + title: "Row layout" + Layout.fillWidth: true + + RowLayout { + id: rowLayout + anchors.fill: parent + TextField { + placeholderText: "This wants to grow horizontally" + Layout.fillWidth: true + } + Button { + text: "Button" + } + } + } + + GroupBox { + id: gridBox + title: "Grid layout" + Layout.fillWidth: true + + GridLayout { + id: gridLayout + rows: 3 + flow: GridLayout.TopToBottom + anchors.fill: parent + + Label { text: "Line 1" } + Label { text: "Line 2" } + Label { text: "Line 3" } + + TextField { } + TextField { } + TextField { } + + TextArea { + text: "This widget spans over three rows in the GridLayout.\n" + + "All items in the GridLayout are implicitly positioned from top to bottom." + Layout.rowSpan: 3 + Layout.fillHeight: true + Layout.fillWidth: true + } + } + } + TextArea { + id: t3 + text: "This fills the whole cell" + Layout.minimumHeight: 30 + Layout.fillHeight: true + Layout.fillWidth: true + } + } +} diff --git a/basicsuite/controls-layouts/preview_l.jpg b/basicsuite/controls-layouts/preview_l.jpg new file mode 100644 index 0000000..03df43a Binary files /dev/null and b/basicsuite/controls-layouts/preview_l.jpg differ diff --git a/basicsuite/controls-layouts/title.txt b/basicsuite/controls-layouts/title.txt new file mode 100644 index 0000000..914d6c2 --- /dev/null +++ b/basicsuite/controls-layouts/title.txt @@ -0,0 +1 @@ +Controls: Layouts -- cgit v1.2.3