From 14504441cf06c556d95552f99e4160f94b9d3f2f Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 13 May 2019 13:37:31 +0200 Subject: Doc: Make "Browsing ISO 7000 Icons" topic creator-only While this works in Qt Design Studio, it is easier to use a dedicated Qt Quick Studio component called Iso for this purpose. Change-Id: I6f2d430ae050b7e0a204077f92ae54987c47f6b7 Reviewed-by: Thomas Hartmann --- .../creator-only/qtquick-iso-icon-browser.qdoc | 78 ++++++++++++++++++++ doc/src/qtquick/qtquick-iso-icon-browser.qdoc | 83 ---------------------- doc/src/qtquick/qtquick-pathview-editor.qdoc | 4 +- doc/src/qtquick/qtquick-ui-forms.qdoc | 3 +- 4 files changed, 83 insertions(+), 85 deletions(-) create mode 100644 doc/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc delete mode 100644 doc/src/qtquick/qtquick-iso-icon-browser.qdoc diff --git a/doc/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc b/doc/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc new file mode 100644 index 0000000000..c84529b298 --- /dev/null +++ b/doc/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc @@ -0,0 +1,78 @@ +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Creator documentation. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** 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: https://www.gnu.org/licenses/fdl-1.3.html. +** +****************************************************************************/ + +/*! + \contentspage index.html + \page qtquick-iso-icon-browser.html + \previouspage qmldesigner-pathview-editor.html + \nextpage creator-quick-ui-forms.html + + \title Browsing ISO 7000 Icons + + \commercial + + You can add icons from an ISO 7000 icon library that is installed with \QC + to Qt Quick applications (commercial only). You can use the + \uicontrol {ISO Icon Browser} to add a \l {Picture} type and select the + icon to use for the type. You can change the default color of the icon. + + \image qtcreator-iso-icon-browser.png + + \section1 Using ISO Icons in Applications + + \list 1 + + \li Create a new Qt Quick Application or open an application in \QC. + + \li Open the Qt Quick UI form in the \uicontrol Design mode. + + \li In the \uicontrol Library, select \uicontrol Imports > + \uicontrol {Add Import} > \uicontrol {QtQuick.Extras} to import the + \l {Qt Quick Extras} module. + + \li Drag and drop a \uicontrol Picture element from the library to the + canvas. + + \li Right-click the picture element and select \uicontrol {Choose Icon} + to open the \uicontrol {ISO Icon Browser}. + + \li To find icons, select a criterion for filtering icons and enter a + search string. + + \li Select an icon in the list, and then select \uicontrol OK to add + the icon. + + \li To view the icon you added, press \key {Ctrl+R} (or \key {Cmd+R}) + to run the application. + + \li To adjust the icon color, select the icon on the canvas, and then + select \uicontrol {Edit Color} in the context menu. + + \endlist + + \QC generates a Qt resource file called \c iso-icons.qrc that adds the + icons as a part of your project for delivery with your application. + + */ diff --git a/doc/src/qtquick/qtquick-iso-icon-browser.qdoc b/doc/src/qtquick/qtquick-iso-icon-browser.qdoc deleted file mode 100644 index efc216a7f6..0000000000 --- a/doc/src/qtquick/qtquick-iso-icon-browser.qdoc +++ /dev/null @@ -1,83 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Creator documentation. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** 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: https://www.gnu.org/licenses/fdl-1.3.html. -** -****************************************************************************/ - -/*! - \contentspage index.html - \page qtquick-iso-icon-browser.html - \if defined(qtdesignstudio) - \previouspage qmldesigner-pathview-editor.html - \nextpage creator-quick-ui-forms.html - \else - \previouspage quick-states.html - \nextpage quick-export-to-qml.html - \endif - - \title Browsing ISO 7000 Icons - - \commercial - - You can add icons from an ISO 7000 icon library that is installed with \QC - to Qt Quick applications (commercial only). You can use the - \uicontrol {ISO Icon Browser} to add a \l {Picture} type and select the - icon to use for the type. You can change the default color of the icon. - - \image qtcreator-iso-icon-browser.png - - \section1 Using ISO Icons in Applications - - \list 1 - - \li Create a new Qt Quick Application or open an application in \QC. - - \li Open the Qt Quick UI form in the \uicontrol Design mode. - - \li In the \uicontrol Library, select \uicontrol Imports > - \uicontrol {Add Import} > \uicontrol {QtQuick.Extras} to import the - \l {Qt Quick Extras} module. - - \li Drag and drop a \uicontrol Picture element from the library to the - canvas. - - \li Right-click the picture element and select \uicontrol {Choose Icon} - to open the \uicontrol {ISO Icon Browser}. - - \li To find icons, select a criterion for filtering icons and enter a - search string. - - \li Select an icon in the list, and then select \uicontrol OK to add - the icon. - - \li To view the icon you added, press \key {Ctrl+R} (or \key {Cmd+R}) - to run the application. - - \li To adjust the icon color, select the icon on the canvas, and then - select \uicontrol {Edit Color} in the context menu. - - \endlist - - \QC generates a Qt resource file called \c iso-icons.qrc that adds the - icons as a part of your project for delivery with your application. - - */ diff --git a/doc/src/qtquick/qtquick-pathview-editor.qdoc b/doc/src/qtquick/qtquick-pathview-editor.qdoc index bd4f4bd851..745ebc1b55 100644 --- a/doc/src/qtquick/qtquick-pathview-editor.qdoc +++ b/doc/src/qtquick/qtquick-pathview-editor.qdoc @@ -28,10 +28,12 @@ \page qmldesigner-pathview-editor.html \if defined(qtdesignstudio) \previouspage studio-fonts.html + \nextpage creator-quick-ui-forms.html \else \previouspage quick-states.html - \endif \nextpage qtquick-iso-icon-browser.html + \endif + \title Editing PathView Properties diff --git a/doc/src/qtquick/qtquick-ui-forms.qdoc b/doc/src/qtquick/qtquick-ui-forms.qdoc index 16ce57a7e7..6ec6313ccf 100644 --- a/doc/src/qtquick/qtquick-ui-forms.qdoc +++ b/doc/src/qtquick/qtquick-ui-forms.qdoc @@ -33,10 +33,11 @@ \contentspage index.html \page creator-quick-ui-forms.html - \previouspage qtquick-iso-icon-browser.html \if defined(qtdesignstudio) + \previouspage qmldesigner-pathview-editor.html \nextpage studio-live-preview.html \else + \previouspage qtquick-iso-icon-browser.html \nextpage quick-export-to-qml.html \endif -- cgit v1.2.3