From 281469e947e6b09a44c296a26db474db815f6238 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 31 Oct 2016 17:01:57 +0100 Subject: Doc: fix review findings for Popup Change-Id: I8494ffe1a46a05a01d31787783b5f8e9cc810f36 Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis --- .../controls/doc/images/qtquickcontrols2-popup.png | Bin 0 -> 21693 bytes .../controls/doc/images/qtquickcontrols2-popup.svg | 391 +++++++++++++++++++++ 2 files changed, 391 insertions(+) create mode 100644 src/imports/controls/doc/images/qtquickcontrols2-popup.png create mode 100644 src/imports/controls/doc/images/qtquickcontrols2-popup.svg (limited to 'src/imports/controls/doc') diff --git a/src/imports/controls/doc/images/qtquickcontrols2-popup.png b/src/imports/controls/doc/images/qtquickcontrols2-popup.png new file mode 100644 index 00000000..4514948d Binary files /dev/null and b/src/imports/controls/doc/images/qtquickcontrols2-popup.png differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-popup.svg b/src/imports/controls/doc/images/qtquickcontrols2-popup.svg new file mode 100644 index 00000000..1d78addf --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-popup.svg @@ -0,0 +1,391 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + Background + Content item + + Available height Available width Width + + Height Popup Bottom padding Top padding Right padding Left padding + -- cgit v1.2.3 From 154c5e32af4d59cd04ac907d3f66cb0807ff14e9 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 1 Nov 2016 12:26:22 +0100 Subject: Doc: fix review findings for ToolButton Change-Id: Id427520a390a2a8cb0bb4ac0f66fef5f96e5b39e Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis --- .../doc/images/qtquickcontrols2-toolbar.png | Bin 3358 -> 1186 bytes .../screenshots/qtquickcontrols2-toolbar.qml | 27 ++++++++++++++++----- 2 files changed, 21 insertions(+), 6 deletions(-) (limited to 'src/imports/controls/doc') diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbar.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbar.png index f4808ca9..1fe353cc 100644 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-toolbar.png and b/src/imports/controls/doc/images/qtquickcontrols2-toolbar.png differ diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-toolbar.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-toolbar.qml index fd6754f8..246f3ae5 100644 --- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-toolbar.qml +++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-toolbar.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2016 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -29,19 +29,34 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 import QtQuick.Controls 2.0 +Item { + width: children[0].implicitWidth * 2 + height: children[0].implicitHeight + Binding { + target: children[0] + property: "width" + value: width + } //! [1] ToolBar { RowLayout { anchors.fill: parent ToolButton { - text: qsTr("\u25C0 Qt") + text: qsTr("‹") onClicked: stack.pop() } - Item { Layout.fillWidth: true } - Switch { - checked: true - text: qsTr("Notifications") + Label { + text: "Title" + elide: Label.ElideRight + horizontalAlignment: Qt.AlignHCenter + verticalAlignment: Qt.AlignVCenter + Layout.fillWidth: true + } + ToolButton { + text: qsTr("⋮") + onClicked: menu.open() } } } //! [1] +} -- cgit v1.2.3 From 6f10ef6e167f4af68439f473842da3b5ea87e4a4 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 1 Nov 2016 14:40:50 +0100 Subject: Doc: add GIF animation for Drawer Change-Id: Ib4c8b5f80e63a322c20caa837632739a3bfee3ee Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis --- .../controls/doc/images/qtquickcontrols2-drawer.gif | Bin 0 -> 55780 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/imports/controls/doc/images/qtquickcontrols2-drawer.gif (limited to 'src/imports/controls/doc') diff --git a/src/imports/controls/doc/images/qtquickcontrols2-drawer.gif b/src/imports/controls/doc/images/qtquickcontrols2-drawer.gif new file mode 100644 index 00000000..736f34f6 Binary files /dev/null and b/src/imports/controls/doc/images/qtquickcontrols2-drawer.gif differ -- cgit v1.2.3 From 07ab335947b4a5cadb2fd1e440ca7db38b82ba1b Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 1 Nov 2016 15:07:51 +0100 Subject: Get rid of the remaining qdoc markers in the Default style Change-Id: Id90911cbac46d2d68284abca08dc7165ace71113 Reviewed-by: Mitch Curtis --- src/imports/controls/doc/qtquickcontrols2.qdocconf | 1 - 1 file changed, 1 deletion(-) (limited to 'src/imports/controls/doc') diff --git a/src/imports/controls/doc/qtquickcontrols2.qdocconf b/src/imports/controls/doc/qtquickcontrols2.qdocconf index e83e418e..a9a48343 100644 --- a/src/imports/controls/doc/qtquickcontrols2.qdocconf +++ b/src/imports/controls/doc/qtquickcontrols2.qdocconf @@ -35,7 +35,6 @@ depends = qtcore qtgui qtdoc qtqml qtquick qtquickdialogs qtquickcontrols qtquic # Note: paths passed to \example command must contain the parent directory, e.g. # \example controls/tabs exampledirs += ../../../../examples/quickcontrols2 \ - ../ \ ../../../quicktemplates2 \ ../../calendar \ ../../../../tests/auto/controls/data \ -- cgit v1.2.3 From c7fdb444a4a9f3cbcf4bbfe8d0deaeb7388e7f98 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 1 Nov 2016 15:53:52 +0100 Subject: Doc: add GIF to SwipeView detailed description The wireframe is still used on the "Navigation Controls" page. Change-Id: I8e8c2bf0f5d46179c115d548efda2ea114a4431e Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis --- .../controls/doc/images/qtquickcontrols2-swipeview.gif | Bin 0 -> 35983 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/imports/controls/doc/images/qtquickcontrols2-swipeview.gif (limited to 'src/imports/controls/doc') diff --git a/src/imports/controls/doc/images/qtquickcontrols2-swipeview.gif b/src/imports/controls/doc/images/qtquickcontrols2-swipeview.gif new file mode 100644 index 00000000..4af26c10 Binary files /dev/null and b/src/imports/controls/doc/images/qtquickcontrols2-swipeview.gif differ -- cgit v1.2.3 From 814601e9cdf5895152cedcd1968fd2a4eecd3cd3 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 2 Nov 2016 11:26:08 +0100 Subject: Doc: tweak BusyIndicator's GIF Make it running at start to ensure that the first frame serves as a good screenshot. When GIF animations were disabled (Qt Creator), the first frame was empty. Change-Id: I2a0acf0cf428a0175c141a7841ec327bc15dfade Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis --- .../doc/images/qtquickcontrols2-busyindicator.gif | Bin 3241 -> 17357 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'src/imports/controls/doc') diff --git a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator.gif b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator.gif index 31ab2d1c..653d200f 100644 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator.gif and b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator.gif differ -- cgit v1.2.3