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') 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