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 +-- src/quicktemplates2/qquickradiobutton.cpp | 13 ++------ 14 files changed, 4 insertions(+), 148 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') 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. diff --git a/src/quicktemplates2/qquickradiobutton.cpp b/src/quicktemplates2/qquickradiobutton.cpp index 2aafbfbd..6037ff0d 100644 --- a/src/quicktemplates2/qquickradiobutton.cpp +++ b/src/quicktemplates2/qquickradiobutton.cpp @@ -50,21 +50,12 @@ QT_BEGIN_NAMESPACE \ingroup qtquickcontrols2-buttons \brief An option button that can be toggled on or off. + \image qtquickcontrols2-radiobutton.gif + RadioButton presents an option button that can be toggled on (checked) or off (unchecked). Radio buttons are typically used to select one option from a set of options. - \table - \row \li \image qtquickcontrols2-radiobutton-normal.png - \li A radio button in its normal state. - \row \li \image qtquickcontrols2-radiobutton-checked.png - \li A radio button that is checked. - \row \li \image qtquickcontrols2-radiobutton-focused.png - \li A radio button that has active focus. - \row \li \image qtquickcontrols2-radiobutton-disabled.png - \li A radio button that is disabled. - \endtable - Radio buttons are \l {AbstractButton::autoExclusive}{auto-exclusive} by default. Only one button can be checked at any time amongst radio buttons that belong to the same parent item; checking another button -- cgit v1.2.3