From 2d218473e845e2b382baf6543fb89256992769ac Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Mon, 27 Jan 2014 10:45:38 +0100 Subject: Remove Controls Layouts demo and docs for Launcher Settings Remove Controls Layouts demo which is not very useful in a touch environment. Layouts themselves are covered by Qt examples and documentation. Also, stop showing Launcher Settings as an stand-alone example in Qt Creator. It's not functional as a stand-alone app (controls do nothing). Change-Id: I1c869b546b92ca911ee2ac268ee21fd3f078b709 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 11273 -> 0 bytes basicsuite/controls-layouts/title.txt | 1 - doc/b2qt-demos.qdoc | 9 +- 6 files changed, 2 insertions(+), 139 deletions(-) delete mode 100644 basicsuite/controls-layouts/controls-layouts.pro delete mode 100644 basicsuite/controls-layouts/description.txt delete mode 100644 basicsuite/controls-layouts/main.qml delete mode 100644 basicsuite/controls-layouts/preview_l.jpg delete mode 100644 basicsuite/controls-layouts/title.txt diff --git a/basicsuite/controls-layouts/controls-layouts.pro b/basicsuite/controls-layouts/controls-layouts.pro deleted file mode 100644 index bbf91d5..0000000 --- a/basicsuite/controls-layouts/controls-layouts.pro +++ /dev/null @@ -1,10 +0,0 @@ -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 deleted file mode 100644 index 393f0dd..0000000 --- a/basicsuite/controls-layouts/description.txt +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index b12b6c8..0000000 --- a/basicsuite/controls-layouts/main.qml +++ /dev/null @@ -1,118 +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.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 deleted file mode 100644 index 03df43a..0000000 Binary files a/basicsuite/controls-layouts/preview_l.jpg and /dev/null differ diff --git a/basicsuite/controls-layouts/title.txt b/basicsuite/controls-layouts/title.txt deleted file mode 100644 index 914d6c2..0000000 --- a/basicsuite/controls-layouts/title.txt +++ /dev/null @@ -1 +0,0 @@ -Controls: Layouts diff --git a/doc/b2qt-demos.qdoc b/doc/b2qt-demos.qdoc index 771b4c3..7e9e640 100644 --- a/doc/b2qt-demos.qdoc +++ b/doc/b2qt-demos.qdoc @@ -44,13 +44,6 @@ \brief Demonstrates using camera in a QML application. */ -/*! - \example controls-layouts - \title Controls Layouts - \ingroup b2qt-demos - \brief Demonstrates using Qt Quick Controls Layouts. -*/ - /*! \example controls-touch \title Controls Touch @@ -110,8 +103,10 @@ */ /*! + \omit \example launchersettings \title Launcher Settings \ingroup b2qt-demos \brief Displays information and settings available for the Boot to Qt launcher. + \endomit */ -- cgit v1.2.3