From e343d463dbf5f95f3d0fc7f837ee6a58f1855ebc Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sun, 2 Oct 2016 15:40:36 +0200 Subject: Doc: add a TabBar example with explicitly sized tabs Task-number: QTBUG-55129 Change-Id: I0770996f741b431f9b003810df94fab8416b4cd3 Reviewed-by: Mitch Curtis --- .../images/qtquickcontrols2-tabbar-explicit.png | Bin 0 -> 2701 bytes .../qtquickcontrols2-tabbar-explicit.qml | 52 +++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 src/imports/controls/doc/images/qtquickcontrols2-tabbar-explicit.png create mode 100644 src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tabbar-explicit.qml (limited to 'src/imports/controls/doc') diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tabbar-explicit.png b/src/imports/controls/doc/images/qtquickcontrols2-tabbar-explicit.png new file mode 100644 index 00000000..cdfee3d0 Binary files /dev/null and b/src/imports/controls/doc/images/qtquickcontrols2-tabbar-explicit.png differ diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tabbar-explicit.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tabbar-explicit.qml new file mode 100644 index 00000000..f3e24f10 --- /dev/null +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tabbar-explicit.qml @@ -0,0 +1,52 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import QtQuick.Controls 2.0 + +Item { + width: 360 + height: childrenRect.height + +//! [1] +TabBar { + width: parent.width + TabButton { + text: "First" + width: implicitWidth + } + TabButton { + text: "Second" + width: implicitWidth + } + TabButton { + text: "Third" + width: implicitWidth + } +} +//! [1] +} -- cgit v1.2.3 From 6efa95c46dfdbbfb6d87ba286d19b3580830ba60 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Mon, 3 Oct 2016 12:55:30 +0200 Subject: Replace image state table with GIF in buttons doc Change-Id: I8b09b2e1c96fe2dec21bb0aa7b4f8ce4a2a862ab Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi --- src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/imports/controls/doc') diff --git a/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc index 48b0097d..d6a9ac78 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc @@ -50,16 +50,7 @@ to perform an action. The most common examples are Apply, Cancel, Save, Close and Help. - \table - \row \li \image qtquickcontrols2-button-normal.png - \li A button in its normal state. - \row \li \image qtquickcontrols2-button-pressed.png - \li A button that is pressed. - \row \li \image qtquickcontrols2-button-focused.png - \li A button that has active focus. - \row \li \image qtquickcontrols2-button-disabled.png - \li A button that is disabled. - \endtable + \image qtquickcontrols2-button.gif Recommendations: -- cgit v1.2.3 From 51451e23039de6611dbd67534a24ab080cdb5588 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Mon, 3 Oct 2016 12:37:54 +0200 Subject: Add missing button and popup doc images It looks like I forgot to add the popup image in e1b1191, and accidentally deleted the button image in b749f00. Change-Id: I57e1fa6afaebb67487bd86fd90a6ea9942b2643a Reviewed-by: J-P Nurmi --- .../doc/images/qtquickcontrols2-button-custom.png | Bin 0 -> 1512 bytes .../doc/images/qtquickcontrols2-popup-custom.png | Bin 0 -> 630 bytes .../screenshots/qtquickcontrols2-popup-custom.qml | 3 ++- 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 src/imports/controls/doc/images/qtquickcontrols2-button-custom.png create mode 100644 src/imports/controls/doc/images/qtquickcontrols2-popup-custom.png (limited to 'src/imports/controls/doc') diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-button-custom.png new file mode 100644 index 00000000..e418da04 Binary files /dev/null and b/src/imports/controls/doc/images/qtquickcontrols2-button-custom.png differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-popup-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-popup-custom.png new file mode 100644 index 00000000..aa07d53a Binary files /dev/null and b/src/imports/controls/doc/images/qtquickcontrols2-popup-custom.png differ diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-popup-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-popup-custom.qml index 32025cc7..6b427611 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-popup-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-popup-custom.qml @@ -35,12 +35,13 @@ Item { height: 200 Binding { - target: root + target: popup property: "visible" value: root.Window.active } //! [1] Popup { + id: popup background: Rectangle { implicitWidth: 200 implicitHeight: 200 -- cgit v1.2.3 From 736bf3dc886701c60fea755f5a58793e6b2e0ca5 Mon Sep 17 00:00:00 2001 From: Frederik Schwarzer Date: Tue, 4 Oct 2016 11:48:22 +0200 Subject: Fix example customization code for Dial Now it also works when copied into a file inside other elements. Change-Id: I715724ed8c5ff5171680192630f02e029478fd03 Reviewed-by: J-P Nurmi Reviewed-by: Mitch Curtis --- .../doc/snippets/screenshots/qtquickcontrols2-dial-custom.qml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/imports/controls/doc') diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-dial-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-dial-custom.qml index 658acc4b..efe061d3 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-dial-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-dial-custom.qml @@ -44,8 +44,8 @@ Dial { handle: Rectangle { id: handleItem - x: background.x + background.width / 2 - handle.width / 2 - y: background.y + background.height / 2 - handle.height / 2 + x: control.background.x + control.background.width / 2 - width / 2 + y: control.background.y + control.background.height / 2 - height / 2 width: 16 height: 16 color: control.pressed ? "#17a81a" : "#21be2b" @@ -54,12 +54,12 @@ Dial { opacity: control.enabled ? 1 : 0.3 transform: [ Translate { - y: -Math.min(background.width, background.height) * 0.4 + handle.height / 2 + y: -Math.min(control.background.width, control.background.height) * 0.4 + handleItem.height / 2 }, Rotation { angle: control.angle - origin.x: handle.width / 2 - origin.y: handle.height / 2 + origin.x: handleItem.width / 2 + origin.y: handleItem.height / 2 } ] } -- cgit v1.2.3 From 7417cd314165144d3eff5cc6fdf87bd2f1acd84e Mon Sep 17 00:00:00 2001 From: Frederik Schwarzer Date: Tue, 4 Oct 2016 14:42:39 +0200 Subject: Fix example customization code for ProgressBar Now it also works when copied into a file inside other elements. Change-Id: I1008466f956bac192950fa2d5d13b9b978aa6984 Reviewed-by: J-P Nurmi --- .../screenshots/qtquickcontrols2-progressbar-custom.qml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/imports/controls/doc') diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-custom.qml index 00c9ae67..88faed20 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-custom.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-custom.qml @@ -32,22 +32,21 @@ import QtQuick.Controls 2.0 ProgressBar { id: control value: 0.5 + padding: 2 background: Rectangle { implicitWidth: 200 - implicitHeight: 4 - x: control.leftPadding - y: parent.height / 2 - height / 2 + implicitHeight: 6 color: "#e6e6e6" - radius: 2 + radius: 3 } contentItem: Item { - implicitWidth: background.implicitWidth - implicitHeight: background.implicitHeight + implicitWidth: 200 + implicitHeight: 4 Rectangle { - width: control.visualPosition * background.width + width: control.visualPosition * parent.width height: parent.height radius: 2 color: "#17a81a" -- cgit v1.2.3 From 9e454f556b73c06d935a8059b4374d67655db047 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Thu, 6 Oct 2016 12:29:41 +0200 Subject: ScrollBar: replace PNGs with GIFs Change-Id: I0c0f23b88c0ce36d43bc31321371508ec63c2903 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi --- .../controls/doc/images/qtquickcontrols2-scrollbar.gif | Bin 0 -> 32067 bytes .../controls/doc/images/qtquickcontrols2-scrollbar.png | Bin 680 -> 0 bytes .../controls/doc/src/qtquickcontrols2-indicators.qdoc | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 src/imports/controls/doc/images/qtquickcontrols2-scrollbar.gif delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-scrollbar.png (limited to 'src/imports/controls/doc') diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar.gif b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar.gif new file mode 100644 index 00000000..ed3ab607 Binary files /dev/null and b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar.gif differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar.png deleted file mode 100644 index b1abafb5..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar.png and /dev/null differ diff --git a/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc index 010ff444..47e6be82 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc @@ -54,7 +54,7 @@ \section1 ScrollBar Control - \image qtquickcontrols2-scrollbar.png + \image qtquickcontrols2-scrollbar.gif \l ScrollBar is an interactive bar that indicates the current scroll position, and can be used to scroll to a specific position in a -- cgit v1.2.3 From 88969bdbd66b0829fe5e5b90eeb605c663d1b887 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Thu, 6 Oct 2016 11:09:04 +0200 Subject: RangeSlider: update GIFs and replace PNGs with them Change-Id: Iafc4c1b088cfa51aee7bf1a91c165b74bf2da599 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi --- .../qtquickcontrols2-rangeslider-disabled.png | Bin 1106 -> 0 bytes ...kcontrols2-rangeslider-first-handle-focused.png | Bin 1266 -> 0 bytes .../qtquickcontrols2-rangeslider-first-handle.png | Bin 1230 -> 0 bytes .../images/qtquickcontrols2-rangeslider-normal.png | Bin 1266 -> 0 bytes ...controls2-rangeslider-second-handle-focused.png | Bin 1266 -> 0 bytes .../qtquickcontrols2-rangeslider-second-handle.png | Bin 1385 -> 0 bytes .../doc/images/qtquickcontrols2-rangeslider.gif | Bin 18024 -> 17402 bytes .../doc/images/qtquickcontrols2-rangeslider.png | Bin 1204 -> 0 bytes .../qtquickcontrols2-rangeslider-disabled.qml | 35 ------------------ ...kcontrols2-rangeslider-first-handle-focused.qml | 35 ------------------ .../qtquickcontrols2-rangeslider-first-handle.qml | 39 --------------------- .../qtquickcontrols2-rangeslider-normal.qml | 34 ------------------ ...controls2-rangeslider-second-handle-focused.qml | 35 ------------------ .../qtquickcontrols2-rangeslider-second-handle.qml | 39 --------------------- .../controls/doc/src/qtquickcontrols2-input.qdoc | 2 +- 15 files changed, 1 insertion(+), 218 deletions(-) delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-rangeslider-disabled.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle-focused.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-rangeslider-normal.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle-focused.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-rangeslider.png delete mode 100644 src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-disabled.qml delete mode 100644 src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-first-handle-focused.qml delete mode 100644 src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-first-handle.qml delete mode 100644 src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-normal.qml delete mode 100644 src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-second-handle-focused.qml delete mode 100644 src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-second-handle.qml (limited to 'src/imports/controls/doc') diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-disabled.png deleted file mode 100644 index 8406fca6..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-disabled.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle-focused.png deleted file mode 100644 index c5f658d5..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle-focused.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle.png deleted file mode 100644 index 535362bf..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-normal.png deleted file mode 100644 index c5f658d5..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-normal.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle-focused.png deleted file mode 100644 index c5f658d5..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle-focused.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle.png deleted file mode 100644 index 44509959..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider.gif b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider.gif index 394e8085..d35b1502 100644 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider.gif and b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider.gif differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider.png deleted file mode 100644 index abb033c2..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider.png and /dev/null differ diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-disabled.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-disabled.qml deleted file mode 100644 index e239b72f..00000000 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-disabled.qml +++ /dev/null @@ -1,35 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -RangeSlider { - first.value: 0.25 - second.value: 0.75 - enabled: false -} diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-first-handle-focused.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-first-handle-focused.qml deleted file mode 100644 index a05c8291..00000000 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-first-handle-focused.qml +++ /dev/null @@ -1,35 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -RangeSlider { - first.value: 0.25 - second.value: 0.75 - first.handle.focus: true -} diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-first-handle.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-first-handle.qml deleted file mode 100644 index c5f064b0..00000000 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-first-handle.qml +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -RangeSlider { - first.value: 0.25 - second.value: 0.75 - Rectangle { - anchors.fill: first.handle - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-normal.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-normal.qml deleted file mode 100644 index a41fbfad..00000000 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-normal.qml +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -RangeSlider { - first.value: 0.25 - second.value: 0.75 -} diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-second-handle-focused.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-second-handle-focused.qml deleted file mode 100644 index ec19d0c0..00000000 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-second-handle-focused.qml +++ /dev/null @@ -1,35 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -RangeSlider { - first.value: 0.25 - second.value: 0.75 - second.handle.focus: true -} diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-second-handle.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-second-handle.qml deleted file mode 100644 index 2e2123de..00000000 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-second-handle.qml +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -RangeSlider { - first.value: 0.25 - second.value: 0.75 - Rectangle { - anchors.fill: second.handle - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc index 681a9d89..70d5f54c 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc @@ -91,7 +91,7 @@ \section1 RangeSlider Control - \image qtquickcontrols2-rangeslider.png + \image qtquickcontrols2-rangeslider.gif \l RangeSlider is used to select a range specified by two values, by sliding each handle along a track. -- cgit v1.2.3 From 563c2b9e3a515818484451b7752b3c4ef7ac3b71 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Thu, 6 Oct 2016 10:25:51 +0200 Subject: ProgressBar: replace PNGs with GIFs Change-Id: I8d11eae7e853b0aa8175e4cffd3520777713d50b Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi --- .../qtquickcontrols2-progressbar-disabled.png | Bin 133 -> 0 bytes .../qtquickcontrols2-progressbar-indeterminate.gif | Bin 0 -> 5882 bytes .../qtquickcontrols2-progressbar-indeterminate.png | Bin 229 -> 0 bytes .../images/qtquickcontrols2-progressbar-normal.png | Bin 133 -> 0 bytes .../doc/images/qtquickcontrols2-progressbar.gif | Bin 0 -> 2072 bytes .../qtquickcontrols2-progressbar-disabled.qml | 34 --------------------- .../qtquickcontrols2-progressbar-normal.qml | 33 -------------------- 7 files changed, 67 deletions(-) delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-progressbar-disabled.png create mode 100644 src/imports/controls/doc/images/qtquickcontrols2-progressbar-indeterminate.gif delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-progressbar-indeterminate.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-progressbar-normal.png create mode 100644 src/imports/controls/doc/images/qtquickcontrols2-progressbar.gif delete mode 100644 src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-disabled.qml delete mode 100644 src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-normal.qml (limited to 'src/imports/controls/doc') diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-disabled.png deleted file mode 100644 index 9ce19e92..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-disabled.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-indeterminate.gif b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-indeterminate.gif new file mode 100644 index 00000000..d6756d16 Binary files /dev/null and b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-indeterminate.gif differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-indeterminate.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-indeterminate.png deleted file mode 100644 index ec2e9ae9..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-indeterminate.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-normal.png deleted file mode 100644 index 9ce19e92..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-normal.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar.gif b/src/imports/controls/doc/images/qtquickcontrols2-progressbar.gif new file mode 100644 index 00000000..49af5f45 Binary files /dev/null and b/src/imports/controls/doc/images/qtquickcontrols2-progressbar.gif differ diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-disabled.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-disabled.qml deleted file mode 100644 index 81c9f4ac..00000000 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-disabled.qml +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -ProgressBar { - value: 0.5 - enabled: false -} diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-normal.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-normal.qml deleted file mode 100644 index a332d4c5..00000000 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-normal.qml +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -ProgressBar { - value: 0.5 -} -- cgit v1.2.3 From ba4698af31a0e15658f1068ed25dfeae88255c8d Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Thu, 6 Oct 2016 13:42:59 +0200 Subject: Delegates: update GIFs and add CheckDelegate tri-state GIF There have been some styling improvements since the last GIFs were taken. Change-Id: I84db1a588f42eb5ceb8899b959150b009d2269ed Reviewed-by: J-P Nurmi --- .../images/qtquickcontrols2-checkbox-tristate.gif | Bin 4033 -> 8784 bytes .../qtquickcontrols2-checkdelegate-tristate.gif | Bin 0 -> 10487 bytes .../doc/images/qtquickcontrols2-checkdelegate.gif | Bin 14330 -> 15290 bytes .../doc/images/qtquickcontrols2-itemdelegate.gif | Bin 14448 -> 16287 bytes .../doc/images/qtquickcontrols2-radiodelegate.gif | Bin 16357 -> 16859 bytes 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-tristate.gif (limited to 'src/imports/controls/doc') diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-tristate.gif b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-tristate.gif index 50986f1b..56a15867 100644 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-tristate.gif and b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-tristate.gif differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-tristate.gif b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-tristate.gif new file mode 100644 index 00000000..8d058d6c Binary files /dev/null and b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-tristate.gif differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate.gif b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate.gif index d379f63c..da3fab98 100644 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate.gif and b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate.gif differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate.gif b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate.gif index 0e8554ff..dccb6efc 100644 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate.gif and b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate.gif differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate.gif b/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate.gif index 851064e9..b6afd6fe 100644 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate.gif and b/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate.gif differ -- cgit v1.2.3 From 18920258393030124186dc589c99d1164b576108 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Thu, 6 Oct 2016 14:19:14 +0200 Subject: Improve CheckBox GIF and add RadioButton GIF - Make the presses a bit more obvious. - Remove unused QML/PNG files. Change-Id: Id5e64c737d4c2c72aeca953f8e876c287f5e426d Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi --- .../doc/images/qtquickcontrols2-checkbox.gif | Bin 2864 -> 6403 bytes .../doc/images/qtquickcontrols2-checkbox.png | Bin 2573 -> 0 bytes .../qtquickcontrols2-radiobutton-checked.png | Bin 2591 -> 0 bytes .../qtquickcontrols2-radiobutton-disabled.png | Bin 2179 -> 0 bytes .../qtquickcontrols2-radiobutton-focused.png | Bin 2328 -> 0 bytes .../images/qtquickcontrols2-radiobutton-normal.png | Bin 2027 -> 0 bytes .../doc/images/qtquickcontrols2-radiobutton.gif | Bin 0 -> 7993 bytes .../doc/images/qtquickcontrols2-radiobutton.png | Bin 3491 -> 0 bytes .../qtquickcontrols2-radiobutton-checked.qml | 34 --------------------- .../qtquickcontrols2-radiobutton-disabled.qml | 34 --------------------- .../qtquickcontrols2-radiobutton-focused.qml | 34 --------------------- .../qtquickcontrols2-radiobutton-normal.qml | 33 -------------------- .../controls/doc/src/qtquickcontrols2-buttons.qdoc | 4 +-- 13 files changed, 2 insertions(+), 137 deletions(-) delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-checkbox.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.png create mode 100644 src/imports/controls/doc/images/qtquickcontrols2-radiobutton.gif delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-radiobutton.png delete mode 100644 src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-checked.qml delete mode 100644 src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-disabled.qml delete mode 100644 src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-focused.qml delete mode 100644 src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-normal.qml (limited to 'src/imports/controls/doc') diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox.gif b/src/imports/controls/doc/images/qtquickcontrols2-checkbox.gif index beacdb37..d70c0ee4 100644 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-checkbox.gif and b/src/imports/controls/doc/images/qtquickcontrols2-checkbox.gif differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox.png deleted file mode 100644 index a824949c..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-checkbox.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.png deleted file mode 100644 index d22a595b..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png deleted file mode 100644 index 11a99d6f..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.png deleted file mode 100644 index d7c79ed1..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.png deleted file mode 100644 index 8a49bf58..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton.gif b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton.gif new file mode 100644 index 00000000..4cbf3ed9 Binary files /dev/null and b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton.gif differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton.png deleted file mode 100644 index 6c217968..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton.png and /dev/null differ diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-checked.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-checked.qml deleted file mode 100644 index c1b1acce..00000000 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-checked.qml +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -RadioButton { - text: "Checked" - checked: true -} diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-disabled.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-disabled.qml deleted file mode 100644 index 7ab68910..00000000 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-disabled.qml +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -RadioButton { - text: "Disabled" - enabled: false -} diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-focused.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-focused.qml deleted file mode 100644 index 316a4653..00000000 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-focused.qml +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -RadioButton { - text: "Focused" - focus: true -} diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-normal.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-normal.qml deleted file mode 100644 index b5ea853b..00000000 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-normal.qml +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -RadioButton { - text: "Normal" -} diff --git a/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc index d6a9ac78..5e2c9370 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc @@ -66,7 +66,7 @@ \section1 CheckBox Control - \image qtquickcontrols2-checkbox.png + \image qtquickcontrols2-checkbox.gif \l CheckBox is used to build multi-selection option lists. Any number of options can be selected, including none, but the options should @@ -102,7 +102,7 @@ \section1 RadioButton Control - \image qtquickcontrols2-radiobutton.png + \image qtquickcontrols2-radiobutton.gif \l RadioButton is used to select only one option from a set of options. Selecting one option automatically deselects the one selected before. -- cgit v1.2.3 From 78179e8b77fddbc6f017e5007fe157425a8eb6e4 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Thu, 6 Oct 2016 12:44:04 +0200 Subject: ScrollIndicator: replace PNGs with GIFs Change-Id: I04d55b0e2e089cb55c26b921409ff2e5e58f55d9 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi --- .../doc/images/qtquickcontrols2-scrollindicator.gif | Bin 0 -> 42352 bytes .../doc/images/qtquickcontrols2-scrollindicator.png | Bin 387 -> 0 bytes .../controls/doc/src/qtquickcontrols2-indicators.qdoc | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 src/imports/controls/doc/images/qtquickcontrols2-scrollindicator.gif delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-scrollindicator.png (limited to 'src/imports/controls/doc') diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator.gif b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator.gif new file mode 100644 index 00000000..73007820 Binary files /dev/null and b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator.gif differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator.png deleted file mode 100644 index ea0923cc..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator.png and /dev/null differ diff --git a/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc index 47e6be82..03750844 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc @@ -62,7 +62,7 @@ \section1 ScrollIndicator Control - \image qtquickcontrols2-scrollindicator.png + \image qtquickcontrols2-scrollindicator.gif \l ScrollIndicator is a non-interactive indicator that indicates the current scroll position, and can be used to scroll to a specific position in a -- cgit v1.2.3 From cd425eb9b6674da0f3e920dc9829cb20ebe2ca95 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Tue, 4 Oct 2016 15:31:44 +0200 Subject: Fix some of the ApplicationWindow documentation review findings Change-Id: Ifa4ae65923f3073ced1c46dd56725e00b34a689d Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi --- .../doc/src/qtquickcontrols2-customize.qdoc | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'src/imports/controls/doc') diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc index f37519de..71ffe350 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc @@ -335,6 +335,38 @@ \l {Customizing a Control} section. The code can be used as a starting point to implement a custom look and feel. + \section2 Customizing ApplicationWindow + + ApplicationWindow consists of one visual item: + \l {ApplicationWindow::background}{background}. It is also possible + to customize the \l {ApplicationWindow::overlay}{modal} and + \l {ApplicationWindow::overlay}{modeless} items. + + \code + import QtQuick 2.7 + import QtQuick.Controls 2.0 + + ApplicationWindow { + visible: true + + background: Rectangle { + gradient: Gradient { + GradientStop { position: 0; color: "#ffffff" } + GradientStop { position: 1; color: "#c1bbf9" } + } + } + + overlay.modal: Rectangle { + color: "#8f28282a" + } + + overlay.modeless: Rectangle { + color: "#2f28282a" + } + } + \endcode + + \section2 Customizing BusyIndicator BusyIndicator consists of two visual items: \l {Control::background}{background} -- cgit v1.2.3 From 59813165989da88f7d4ecec97f952b691636d683 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Fri, 7 Oct 2016 11:34:15 +0200 Subject: Slider: add GIFs to demonstrate snap modes Change-Id: I19d436cd9b48e3ab2498029d4b306f6a0e9ff977 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi --- .../doc/images/qtquickcontrols2-slider-nosnap.gif | Bin 0 -> 18138 bytes .../doc/images/qtquickcontrols2-slider-snapalways.gif | Bin 0 -> 7201 bytes .../images/qtquickcontrols2-slider-snaponrelease.gif | Bin 0 -> 18377 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/imports/controls/doc/images/qtquickcontrols2-slider-nosnap.gif create mode 100644 src/imports/controls/doc/images/qtquickcontrols2-slider-snapalways.gif create mode 100644 src/imports/controls/doc/images/qtquickcontrols2-slider-snaponrelease.gif (limited to 'src/imports/controls/doc') diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-nosnap.gif b/src/imports/controls/doc/images/qtquickcontrols2-slider-nosnap.gif new file mode 100644 index 00000000..ab233c5b Binary files /dev/null and b/src/imports/controls/doc/images/qtquickcontrols2-slider-nosnap.gif differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-snapalways.gif b/src/imports/controls/doc/images/qtquickcontrols2-slider-snapalways.gif new file mode 100644 index 00000000..8eb4011f Binary files /dev/null and b/src/imports/controls/doc/images/qtquickcontrols2-slider-snapalways.gif differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-snaponrelease.gif b/src/imports/controls/doc/images/qtquickcontrols2-slider-snaponrelease.gif new file mode 100644 index 00000000..f3b1d5c7 Binary files /dev/null and b/src/imports/controls/doc/images/qtquickcontrols2-slider-snaponrelease.gif differ -- cgit v1.2.3 From bd1080e6a1c78bc65d01f5504bec82ad971d866f Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Fri, 7 Oct 2016 12:21:07 +0200 Subject: Slider: fix documentation review findings Expand detailed description. Also updated the GIF after the styling changes, and removed the PNGs. Change-Id: I6dee232f6766d6ee9595b1043a4bca78c2a09d78 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi --- .../images/qtquickcontrols2-slider-disabled.png | Bin 1019 -> 0 bytes .../doc/images/qtquickcontrols2-slider-focused.png | Bin 1154 -> 0 bytes .../doc/images/qtquickcontrols2-slider-normal.png | Bin 1154 -> 0 bytes .../doc/images/qtquickcontrols2-slider.gif | Bin 16972 -> 13697 bytes .../doc/images/qtquickcontrols2-slider.png | Bin 1117 -> 0 bytes .../qtquickcontrols2-slider-disabled.qml | 34 --------------------- .../qtquickcontrols2-slider-focused.qml | 34 --------------------- .../screenshots/qtquickcontrols2-slider-normal.qml | 33 -------------------- .../controls/doc/src/qtquickcontrols2-input.qdoc | 2 +- 9 files changed, 1 insertion(+), 102 deletions(-) delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-slider-focused.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-slider-normal.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-slider.png delete mode 100644 src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-disabled.qml delete mode 100644 src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-focused.qml delete mode 100644 src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-normal.qml (limited to 'src/imports/controls/doc') diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.png deleted file mode 100644 index 919a9a2b..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-focused.png deleted file mode 100644 index e6c4179c..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-slider-focused.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-normal.png deleted file mode 100644 index e6c4179c..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-slider-normal.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider.gif b/src/imports/controls/doc/images/qtquickcontrols2-slider.gif index 7cb84b56..2ee56334 100644 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-slider.gif and b/src/imports/controls/doc/images/qtquickcontrols2-slider.gif differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider.png b/src/imports/controls/doc/images/qtquickcontrols2-slider.png deleted file mode 100644 index 2e27a604..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-slider.png and /dev/null differ diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-disabled.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-disabled.qml deleted file mode 100644 index bde161aa..00000000 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-disabled.qml +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Slider { - value: 0.5 - enabled: false -} diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-focused.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-focused.qml deleted file mode 100644 index b32f8b5a..00000000 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-focused.qml +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Slider { - value: 0.5 - focus: true -} diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-normal.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-normal.qml deleted file mode 100644 index 8363e862..00000000 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-normal.qml +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Slider { - value: 0.5 -} diff --git a/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc index 70d5f54c..c3583fd1 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc @@ -85,7 +85,7 @@ \section1 Slider Control - \image qtquickcontrols2-slider.png + \image qtquickcontrols2-slider.gif \l Slider is used to select a value by sliding a handle along a track. -- cgit v1.2.3