From 3d68fa647ca2764a0149e45bc8ae63f2660a6db1 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 2 Jul 2020 18:06:43 +0200 Subject: [PATCH] Doc: Update info on using Custom Button wizard template ...to create buttons in Qt Design Studio Update some of the tutorial source files accordingly. Change-Id: Id8afc9bf66c30129701bf7951cbc48068137e145 Reviewed-by: Thomas Hartmann --- .../doc/images/loginui1-breadcrumb-bar.png | Bin 20872 -> 0 bytes .../examples/doc/images/loginui1-toolbar.png | Bin 15203 -> 0 bytes doc/qtdesignstudio/examples/doc/loginui1.qdoc | 83 ++++++------ doc/qtdesignstudio/examples/doc/loginui2.qdoc | 6 +- doc/qtdesignstudio/examples/doc/loginui3.qdoc | 29 ----- .../examples/loginui1/PushButton.ui.qml | 73 ++--------- .../examples/loginui1/Screen01.ui.qml | 88 +++---------- .../loginui1/imports/loginui1/Constants.qml | 64 ++-------- .../examples/loginui1/imports/loginui1/qmldir | 1 + .../examples/loginui1/loginui1.qml | 52 +------- .../examples/loginui1/loginui1.qmlproject | 6 +- .../loginui1/loginui1.qmlproject.qtds | 118 ------------------ .../loginui1.qmlproject.qtds.4.10-pre1 | 118 ------------------ .../examples/loginui2/PushButton.ui.qml | 77 +++--------- .../loginui2/loginui2.qmlproject.qtds | 19 +-- .../examples/loginui3/PushButton.ui.qml | 79 +++--------- .../loginui3/loginui3.qmlproject.qtds | 118 ------------------ .../examples/loginui4/PushButton.ui.qml | 81 +++--------- .../loginui4/loginui4.qmlproject.qtds | 118 ------------------ .../loginui4.qmlproject.qtds.4.10-pre1 | 118 ------------------ 20 files changed, 149 insertions(+), 1099 deletions(-) delete mode 100644 doc/qtdesignstudio/examples/doc/images/loginui1-breadcrumb-bar.png delete mode 100644 doc/qtdesignstudio/examples/doc/images/loginui1-toolbar.png delete mode 100644 doc/qtdesignstudio/examples/loginui1/loginui1.qmlproject.qtds delete mode 100644 doc/qtdesignstudio/examples/loginui1/loginui1.qmlproject.qtds.4.10-pre1 delete mode 100644 doc/qtdesignstudio/examples/loginui3/loginui3.qmlproject.qtds delete mode 100644 doc/qtdesignstudio/examples/loginui4/loginui4.qmlproject.qtds delete mode 100644 doc/qtdesignstudio/examples/loginui4/loginui4.qmlproject.qtds.4.10-pre1 diff --git a/doc/qtdesignstudio/examples/doc/images/loginui1-breadcrumb-bar.png b/doc/qtdesignstudio/examples/doc/images/loginui1-breadcrumb-bar.png deleted file mode 100644 index 99898235fe8d82cae7af4f8b8dc75dae495b6961..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20872 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 diff --git a/doc/qtdesignstudio/examples/doc/images/loginui1-toolbar.png b/doc/qtdesignstudio/examples/doc/images/loginui1-toolbar.png deleted file mode 100644 index 8968b021a425ac383ca2951bb51c7fe7a0f59332..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15203 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 - \uicontrol buttonBackground to move into the button background - component. - \li Select the button background in \uicontrol {Form Editor} or - \uicontrol Navigator to display its properties in the - \uicontrol Properties view. + \li Select the button background in \uicontrol Navigator to display its + properties in the \uicontrol Properties view. \li In the \uicontrol Color field, select \inlineimage icons/action-icon.png (\uicontrol Actions) > \uicontrol {Set Binding} and set the button background color to \e #41cd52. - \li Press \key Enter or select the tick button at the bottom of - the editor to save the new value. + \li Press \key Enter or select \uicontrol OK to save the new value. \image loginui1-binding-editor.png "Binding Editor" + \omit \li In the \uicontrol {Border Color} field, set the button border color to \e #21be2b. You could also use the color picker to change the button color. \li In the \uicontrol Radius field, enter 6 to give the button rounded corners. - \li Select \uicontrol Master > \uicontrol textItem, and set the - button text color to white (\e #ffffff). + \endomit + \li Select the text item in \uicontrol Navigator to display its + properties in \uicontrol Properties. + \li In the \uicontrol {Text color} field, set the button text + color to white (\e #ffffff). + \li In the \uicontrol States view, select the \e down state to set the + button text color to white and the background color to a darker + shade of green (\e #21be2b). \li Select \uicontrol File > \uicontrol Save or press \key {Ctrl+S} to save your changes. \endlist - To move back to the top level PushButton type in the - \uicontrol {Form Editor}, select - \uicontrol PushButton.ui.qml on the breadcrumb bar (1): - - \image loginui1-breadcrumb-bar.png "Breadcrumb bar in the Design mode." - Your button should now look something like this: \image loginui1-button-styled.png "Modified button in the Form Editor" @@ -376,7 +369,7 @@ \section1 Next Steps To learn how to add more UI controls and position them on the page using - anchors and layouts so that the UI is scalable, see the next example in + anchors and layouts so that the UI is scalable, see the next tutorial in the series, \l {Log In UI - Part 2}. For a more advanced example of creating a menu button and using it to diff --git a/doc/qtdesignstudio/examples/doc/loginui2.qdoc b/doc/qtdesignstudio/examples/doc/loginui2.qdoc index 97ca6a2cdd4..b1ed1e56029 100644 --- a/doc/qtdesignstudio/examples/doc/loginui2.qdoc +++ b/doc/qtdesignstudio/examples/doc/loginui2.qdoc @@ -56,9 +56,9 @@ First, you will add a new rectangle to \uicontrol {Form Editor} and move all the current UI components to it to create a new page. Then, you will \l {Setting Anchors and Margins}{anchor} the static elements on the - page, that is the logo image (\e logo) and page title (\e pageTitle), - to the page. When you created the project using the new project wizard - in Part 1 of this example, the wizard anchored \e pageTitle to the + page, that is the logo image (\e logo) and page title (\e pageTitle), to the + page. When you created the project using the new project wizard template + in Part 1 of this example, the wizard template anchored \e pageTitle to the vertical and horizontal center of the page. Therefore, you will only need to replace the vertical anchor of \e pageTitle with a top anchor to align it with \e logo on the page. diff --git a/doc/qtdesignstudio/examples/doc/loginui3.qdoc b/doc/qtdesignstudio/examples/doc/loginui3.qdoc index a49d211a1d1..d6182232436 100644 --- a/doc/qtdesignstudio/examples/doc/loginui3.qdoc +++ b/doc/qtdesignstudio/examples/doc/loginui3.qdoc @@ -214,11 +214,6 @@ \image loginui3.gif "Moving between login page and registration page" - The \e PushButton type also uses states to change the button background and - text color when the button is clicked. Now that clicking buttons performs - actions, you will change the background color for the button down state - from grey to green to match the color in the normal state that you changed - to green in Part 1. \section2 Learn Qt Quick - Signal and Event Handlers @@ -234,30 +229,6 @@ For more information, see \l{Signal and Handler Event System}. - Next, you will modify the properties of the \e PushButton type in the text - editor. - - \section1 Changing Button Background Color - - You will modify the button background color for the \e down state of the - \e PushButton type in the \e PushButton.ui.qml file. - - \list 1 - \li Right-click \e loginButton in the \uicontrol Navigator and select - \uicontrol {Go into Component} to open \e PushButton.ui.qml for - editing in the Design mode. - \li Open the \uicontrol {Text Editor}. - \li Edit the property values for the \e down state, to set the button - text color to white and the background and border colors to - darker shades of green by using the \c {Qt.darker()} function: - \quotefromfile loginui3/PushButton.ui.qml - \skipto states: - \printuntil ] - You could also specify all the colors here as fixed values. - \li Select \uicontrol File > \uicontrol Save or press \key {Ctrl+S} - to save your changes. - \endlist - \section1 Next Steps For a more complicated UI, you would typically use QML types that specify diff --git a/doc/qtdesignstudio/examples/loginui1/PushButton.ui.qml b/doc/qtdesignstudio/examples/loginui1/PushButton.ui.qml index 0feeed16187..cdfd98b3ef4 100644 --- a/doc/qtdesignstudio/examples/loginui1/PushButton.ui.qml +++ b/doc/qtdesignstudio/examples/loginui1/PushButton.ui.qml @@ -1,54 +1,3 @@ - - -/**************************************************************************** -** -** Copyright (C) 2019 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.10 import QtQuick.Templates 2.1 as T import loginui1 1.0 @@ -56,8 +5,6 @@ import loginui1 1.0 T.Button { id: control - text: qsTr("MyButton") - font: Constants.font implicitWidth: Math.max( background ? background.implicitWidth : 0, @@ -68,24 +15,27 @@ T.Button { leftPadding: 4 rightPadding: 4 - background: Rectangle { + text: "My Button" + + background: buttonBackground + Rectangle { id: buttonBackground color: "#41cd52" - radius: 6 implicitWidth: 100 implicitHeight: 40 opacity: enabled ? 1 : 0.3 + border.color: "gray" border.width: 1 - border.color: "#21be2b" + radius: 2 } - contentItem: Text { + contentItem: textItem + Text { id: textItem text: control.text - font: control.font opacity: enabled ? 1.0 : 0.3 - color: "white" + color: "#fdfdfd" horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter elide: Text.ElideRight @@ -104,14 +54,13 @@ T.Button { when: control.down PropertyChanges { target: textItem - color: "black" + color: "#fdfdfd" } PropertyChanges { target: buttonBackground - color: "#a2a2a2" + color: "#21be2b" border.color: "black" } } ] } - diff --git a/doc/qtdesignstudio/examples/loginui1/Screen01.ui.qml b/doc/qtdesignstudio/examples/loginui1/Screen01.ui.qml index cdfea9ce603..bdd37b0415f 100644 --- a/doc/qtdesignstudio/examples/loginui1/Screen01.ui.qml +++ b/doc/qtdesignstudio/examples/loginui1/Screen01.ui.qml @@ -1,96 +1,46 @@ - - -/**************************************************************************** -** -** Copyright (C) 2019 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.10 +import QtQuick 2.12 import loginui1 1.0 Rectangle { width: Constants.width height: Constants.height + color: "#fdfdfd" Text { id: pageTitle - x: 259 - y: 155 - width: 123 - height: 40 text: qsTr("Qt Account") font.pixelSize: 24 + anchors.verticalCenterOffset: -153 + anchors.horizontalCenterOffset: 1 + anchors.centerIn: parent + font.family: Constants.font.family } Image { id: logo - x: 8 - y: 8 + x: 13 + y: 0 width: 100 height: 100 source: "qt_logo_green_64x64px.png" fillMode: Image.PreserveAspectFit } - PushButton { - id: registerButton - x: 259 - y: 277 - width: 120 - height: 40 - text: qsTr("Create Account") - } - PushButton { id: loginButton - x: 259 - y: 231 + x: 262 + y: 343 width: 120 height: 40 text: qsTr("Log In") } + + PushButton { + id: registerButton + x: 262 + y: 389 + width: 120 + height: 40 + text: qsTr("Create Account") + } } diff --git a/doc/qtdesignstudio/examples/loginui1/imports/loginui1/Constants.qml b/doc/qtdesignstudio/examples/loginui1/imports/loginui1/Constants.qml index 83dbc40a9b9..26a0421c9b6 100644 --- a/doc/qtdesignstudio/examples/loginui1/imports/loginui1/Constants.qml +++ b/doc/qtdesignstudio/examples/loginui1/imports/loginui1/Constants.qml @@ -1,69 +1,27 @@ -/**************************************************************************** -** -** Copyright (C) 2019 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$ -** -****************************************************************************/ - pragma Singleton import QtQuick 2.10 QtObject { readonly property int width: 640 readonly property int height: 480 + readonly property FontLoader mySystemFont: FontLoader { name: "Arial" } + + property alias fontDirectory: directoryFontLoader.fontDirectory + property alias relativeFontDirectory: directoryFontLoader.relativeFontDirectory + /* Edit this comment to add your custom font */ - /* readonly property FontLoader myCustomFont: FontLoader { source: "MyCustomFont.ttf" } */ readonly property font font: Qt.font({ family: mySystemFont.name, - pointSize: Qt.application.font.pixelSize + pixelSize: Qt.application.font.pixelSize }) readonly property font largeFont: Qt.font({ family: mySystemFont.name, - pointSize: Qt.application.font.pixelSize * 1.6 + pixelSize: Qt.application.font.pixelSize * 1.6 }) readonly property color backgroundColor: "#c2c2c2" + + property DirectoryFontLoader directoryFontLoader: DirectoryFontLoader { + id: directoryFontLoader + } } diff --git a/doc/qtdesignstudio/examples/loginui1/imports/loginui1/qmldir b/doc/qtdesignstudio/examples/loginui1/imports/loginui1/qmldir index 616ac203530..69846237302 100644 --- a/doc/qtdesignstudio/examples/loginui1/imports/loginui1/qmldir +++ b/doc/qtdesignstudio/examples/loginui1/imports/loginui1/qmldir @@ -1 +1,2 @@ singleton Constants 1.0 Constants.qml +EventListSimulator 1.0 EventListSimulator.qml diff --git a/doc/qtdesignstudio/examples/loginui1/loginui1.qml b/doc/qtdesignstudio/examples/loginui1/loginui1.qml index 57796d12b4e..46f3994cdc7 100644 --- a/doc/qtdesignstudio/examples/loginui1/loginui1.qml +++ b/doc/qtdesignstudio/examples/loginui1/loginui1.qml @@ -1,54 +1,4 @@ -/**************************************************************************** -** -** Copyright (C) 2019 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.10 +import QtQuick 2.12 import loginui1 1.0 Item { diff --git a/doc/qtdesignstudio/examples/loginui1/loginui1.qmlproject b/doc/qtdesignstudio/examples/loginui1/loginui1.qmlproject index 7c9af71d7c7..322f9d6466d 100644 --- a/doc/qtdesignstudio/examples/loginui1/loginui1.qmlproject +++ b/doc/qtdesignstudio/examples/loginui1/loginui1.qmlproject @@ -28,13 +28,17 @@ Project { directory: "." } + Files { + filter: "*.ttf;*.otf" + } + Environment { QT_QUICK_CONTROLS_CONF: "qtquickcontrols2.conf" QT_AUTO_SCREEN_SCALE_FACTOR: "1" } /* List of plugin directories passed to QML runtime */ - importPaths: [ "imports" ] + importPaths: [ "imports", "asset_imports" ] /* Required for deployment */ targetDirectory: "/opt/loginui1" diff --git a/doc/qtdesignstudio/examples/loginui1/loginui1.qmlproject.qtds b/doc/qtdesignstudio/examples/loginui1/loginui1.qmlproject.qtds deleted file mode 100644 index 156d4a96ed7..00000000000 --- a/doc/qtdesignstudio/examples/loginui1/loginui1.qmlproject.qtds +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - EnvironmentId - {595d361f-de69-4ff2-b1f6-d89b95edfd27} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.Target.0 - - Desktop - Desktop - {8994bd34-5ed9-4c45-8c0a-94c8f33eca4a} - -1 - 0 - 0 - 0 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy Configuration - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - false - false - 1000 - - true - 0 - - - QML Scene - QmlProjectManager.QmlRunConfiguration.QmlScene - CurrentFile - - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 22 - - - Version - 22 - - diff --git a/doc/qtdesignstudio/examples/loginui1/loginui1.qmlproject.qtds.4.10-pre1 b/doc/qtdesignstudio/examples/loginui1/loginui1.qmlproject.qtds.4.10-pre1 deleted file mode 100644 index 5c5b6b4c9e0..00000000000 --- a/doc/qtdesignstudio/examples/loginui1/loginui1.qmlproject.qtds.4.10-pre1 +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - EnvironmentId - {595d361f-de69-4ff2-b1f6-d89b95edfd27} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.Target.0 - - Desktop - Desktop - {8994bd34-5ed9-4c45-8c0a-94c8f33eca4a} - -1 - 0 - 0 - 0 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy Configuration - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - false - false - 1000 - - true - 0 - - - QML Scene - QmlProjectManager.QmlRunConfiguration.QmlScene - CurrentFile - - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 21 - - - Version - 21 - - diff --git a/doc/qtdesignstudio/examples/loginui2/PushButton.ui.qml b/doc/qtdesignstudio/examples/loginui2/PushButton.ui.qml index 7138bb41d8c..6e013d48cf8 100644 --- a/doc/qtdesignstudio/examples/loginui2/PushButton.ui.qml +++ b/doc/qtdesignstudio/examples/loginui2/PushButton.ui.qml @@ -1,54 +1,3 @@ - - -/**************************************************************************** -** -** Copyright (C) 2019 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.10 import QtQuick.Templates 2.1 as T import loginui2 1.0 @@ -56,8 +5,6 @@ import loginui2 1.0 T.Button { id: control - text: qsTr("MyButton") - font: Constants.font implicitWidth: Math.max( background ? background.implicitWidth : 0, @@ -68,24 +15,27 @@ T.Button { leftPadding: 4 rightPadding: 4 - background: Rectangle { + text: "My Button" + + background: buttonBackground + Rectangle { id: buttonBackground color: "#41cd52" - radius: 6 implicitWidth: 100 implicitHeight: 40 opacity: enabled ? 1 : 0.3 + border.color: "gray" border.width: 1 - border.color: "#21be2b" + radius: 2 } - contentItem: Text { + contentItem: textItem + Text { id: textItem text: control.text - font: control.font opacity: enabled ? 1.0 : 0.3 - color: "white" + color: "#fdfdfd" horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter elide: Text.ElideRight @@ -104,14 +54,19 @@ T.Button { when: control.down PropertyChanges { target: textItem - color: "black" + color: "#fdfdfd" } PropertyChanges { target: buttonBackground - color: "#a2a2a2" + color: "#21be2b" border.color: "black" } } ] } +/*##^## +Designer { + D{i:0;autoSize:true;height:480;width:640} +} +##^##*/ diff --git a/doc/qtdesignstudio/examples/loginui2/loginui2.qmlproject.qtds b/doc/qtdesignstudio/examples/loginui2/loginui2.qmlproject.qtds index 083a067353f..5c5ff41596c 100644 --- a/doc/qtdesignstudio/examples/loginui2/loginui2.qmlproject.qtds +++ b/doc/qtdesignstudio/examples/loginui2/loginui2.qmlproject.qtds @@ -1,6 +1,6 @@ - + EnvironmentId @@ -70,12 +70,12 @@ 0 Deploy - + Deploy ProjectExplorer.BuildSteps.Deploy 1 - Deploy Configuration - + + false ProjectExplorer.DefaultDeployConfiguration 1 @@ -88,12 +88,15 @@ true 0 - QML Scene QmlProjectManager.QmlRunConfiguration.QmlScene + + en CurrentFile - 3768 + false + false + false true false @@ -109,10 +112,10 @@ ProjectExplorer.Project.Updater.FileVersion - 21 + 22 Version - 21 + 22 diff --git a/doc/qtdesignstudio/examples/loginui3/PushButton.ui.qml b/doc/qtdesignstudio/examples/loginui3/PushButton.ui.qml index e22e4216980..b225c50b542 100644 --- a/doc/qtdesignstudio/examples/loginui3/PushButton.ui.qml +++ b/doc/qtdesignstudio/examples/loginui3/PushButton.ui.qml @@ -1,53 +1,3 @@ - -/**************************************************************************** -** -** Copyright (C) 2019 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.10 import QtQuick.Templates 2.1 as T import loginui3 1.0 @@ -55,8 +5,6 @@ import loginui3 1.0 T.Button { id: control - text: qsTr("MyButton") - font: Constants.font implicitWidth: Math.max( background ? background.implicitWidth : 0, @@ -67,24 +15,27 @@ T.Button { leftPadding: 4 rightPadding: 4 - background: Rectangle { + text: "My Button" + + background: buttonBackground + Rectangle { id: buttonBackground color: "#41cd52" - radius: 6 implicitWidth: 100 implicitHeight: 40 opacity: enabled ? 1 : 0.3 + border.color: "gray" border.width: 1 - border.color: "#21be2b" + radius: 2 } - contentItem: Text { + contentItem: textItem + Text { id: textItem text: control.text - font: control.font opacity: enabled ? 1.0 : 0.3 - color: "white" + color: "#fdfdfd" horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter elide: Text.ElideRight @@ -103,13 +54,19 @@ T.Button { when: control.down PropertyChanges { target: textItem - color: "white" + color: "#fdfdfd" } PropertyChanges { target: buttonBackground - color: Qt.darker("#41cd52", 1.2) - border.color: Qt.darker("#21be2b", 1.2) + color: "#21be2b" + border.color: "black" } } ] } + +/*##^## +Designer { + D{i:0;autoSize:true;height:480;width:640} +} +##^##*/ diff --git a/doc/qtdesignstudio/examples/loginui3/loginui3.qmlproject.qtds b/doc/qtdesignstudio/examples/loginui3/loginui3.qmlproject.qtds deleted file mode 100644 index fafe88caea7..00000000000 --- a/doc/qtdesignstudio/examples/loginui3/loginui3.qmlproject.qtds +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - EnvironmentId - {595d361f-de69-4ff2-b1f6-d89b95edfd27} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.Target.0 - - Desktop - Desktop - {8994bd34-5ed9-4c45-8c0a-94c8f33eca4a} - -1 - 0 - 0 - 0 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy Configuration - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - false - false - 1000 - - true - 0 - - - QML Scene - QmlProjectManager.QmlRunConfiguration.QmlScene - CurrentFile - - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 21 - - - Version - 21 - - diff --git a/doc/qtdesignstudio/examples/loginui4/PushButton.ui.qml b/doc/qtdesignstudio/examples/loginui4/PushButton.ui.qml index 5d49d38abb4..569a92f2b47 100644 --- a/doc/qtdesignstudio/examples/loginui4/PushButton.ui.qml +++ b/doc/qtdesignstudio/examples/loginui4/PushButton.ui.qml @@ -1,53 +1,3 @@ - -/**************************************************************************** -** -** Copyright (C) 2019 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.10 import QtQuick.Templates 2.1 as T import loginui4 1.0 @@ -55,8 +5,6 @@ import loginui4 1.0 T.Button { id: control - text: qsTr("MyButton") - font: Constants.font implicitWidth: Math.max( background ? background.implicitWidth : 0, @@ -67,24 +15,27 @@ T.Button { leftPadding: 4 rightPadding: 4 - background: Rectangle { + text: "My Button" + + background: buttonBackground + Rectangle { id: buttonBackground color: "#41cd52" - radius: 6 implicitWidth: 100 implicitHeight: 40 opacity: enabled ? 1 : 0.3 + border.color: "gray" border.width: 1 - border.color: "#21be2b" + radius: 2 } - contentItem: Text { + contentItem: textItem + Text { id: textItem text: control.text - font: control.font opacity: enabled ? 1.0 : 0.3 - color: "white" + color: "#fdfdfd" horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter elide: Text.ElideRight @@ -103,21 +54,19 @@ T.Button { when: control.down PropertyChanges { target: textItem - color: "white" + color: "#fdfdfd" } PropertyChanges { target: buttonBackground - color: Qt.darker("#41cd52", 1.2) - border.color: Qt.darker("#21be2b", 1.2) + color: "#21be2b" + border.color: "black" } } ] } - - - -/*##^## Designer { +/*##^## +Designer { D{i:0;autoSize:true;height:480;width:640} } - ##^##*/ +##^##*/ diff --git a/doc/qtdesignstudio/examples/loginui4/loginui4.qmlproject.qtds b/doc/qtdesignstudio/examples/loginui4/loginui4.qmlproject.qtds deleted file mode 100644 index f062eb1fea4..00000000000 --- a/doc/qtdesignstudio/examples/loginui4/loginui4.qmlproject.qtds +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - EnvironmentId - {595d361f-de69-4ff2-b1f6-d89b95edfd27} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.Target.0 - - Desktop - Desktop - {8994bd34-5ed9-4c45-8c0a-94c8f33eca4a} - -1 - 0 - 0 - 0 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy Configuration - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - false - false - 1000 - - true - 0 - - - QML Scene - QmlProjectManager.QmlRunConfiguration.QmlScene - CurrentFile - - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 22 - - - Version - 22 - - diff --git a/doc/qtdesignstudio/examples/loginui4/loginui4.qmlproject.qtds.4.10-pre1 b/doc/qtdesignstudio/examples/loginui4/loginui4.qmlproject.qtds.4.10-pre1 deleted file mode 100644 index f4d9a761ec1..00000000000 --- a/doc/qtdesignstudio/examples/loginui4/loginui4.qmlproject.qtds.4.10-pre1 +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - EnvironmentId - {595d361f-de69-4ff2-b1f6-d89b95edfd27} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.Target.0 - - Desktop - Desktop - {8994bd34-5ed9-4c45-8c0a-94c8f33eca4a} - -1 - 0 - 0 - 0 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy Configuration - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - false - false - 1000 - - true - 0 - - - QML Scene - QmlProjectManager.QmlRunConfiguration.QmlScene - CurrentFile - - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 21 - - - Version - 21 - -