summaryrefslogtreecommitdiff
path: root/doc/src/qtquick
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@theqtcompany.com>2015-10-27 09:20:43 +0100
committerLeena Miettinen <riitta-leena.miettinen@theqtcompany.com>2015-10-27 14:48:02 +0000
commit7ed574945a9ee1c6eca1829444d9b3cf24607f6d (patch)
tree73dd6a2bcded67350421ef27b958ef9f91971b2f /doc/src/qtquick
parent0e2d153efc31188703ba9614ac5730c6632f6df7 (diff)
downloadqt-creator-7ed574945a9ee1c6eca1829444d9b3cf24607f6d.tar.gz
Doc: add docs for ISO Icon Browser
A commercial Qt Quick Designer plugin for adding ISO 7000 icons to applications from an icon library. Change-Id: I96d740d63bc77da9817ce2d5ccdb1625dbc5caa6 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Diffstat (limited to 'doc/src/qtquick')
-rw-r--r--doc/src/qtquick/qtquick-app-development.qdoc5
-rw-r--r--doc/src/qtquick/qtquick-exporting-qml.qdoc2
-rw-r--r--doc/src/qtquick/qtquick-iso-icon-browser.qdoc82
-rw-r--r--doc/src/qtquick/qtquick-screens.qdoc2
4 files changed, 89 insertions, 2 deletions
diff --git a/doc/src/qtquick/qtquick-app-development.qdoc b/doc/src/qtquick/qtquick-app-development.qdoc
index c0becbe2df..12d5019a68 100644
--- a/doc/src/qtquick/qtquick-app-development.qdoc
+++ b/doc/src/qtquick/qtquick-app-development.qdoc
@@ -69,6 +69,11 @@
Dialogs, and Layouts (available since Qt 5.1) to create screens. You
can use states and transitions to navigate between screens.
+ \li \l {Browsing ISO 7000 Icons}
+
+ You can add ISO 7000 icons from a library delivered with \QC to Qt
+ Quick applications and change their color (commercial only).
+
\li \l {Exporting Designs from Graphics Software}
You can export designs from graphics software, such as Adobe
diff --git a/doc/src/qtquick/qtquick-exporting-qml.qdoc b/doc/src/qtquick/qtquick-exporting-qml.qdoc
index 8a7957713b..470033e7e3 100644
--- a/doc/src/qtquick/qtquick-exporting-qml.qdoc
+++ b/doc/src/qtquick/qtquick-exporting-qml.qdoc
@@ -25,7 +25,7 @@
/*!
\contentspage {Qt Creator Manual}
- \previouspage qmldesigner-connections.html
+ \previouspage qtquick-iso-icon-browser.html
\page quick-export-to-qml.html
\nextpage creator-qml-modules-with-plugins.html
diff --git a/doc/src/qtquick/qtquick-iso-icon-browser.qdoc b/doc/src/qtquick/qtquick-iso-icon-browser.qdoc
new file mode 100644
index 0000000000..73eed1b553
--- /dev/null
+++ b/doc/src/qtquick/qtquick-iso-icon-browser.qdoc
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing
+**
+** This file is part of Qt Creator.
+**
+** 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 Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+/*!
+ \contentspage {Qt Creator Manual}
+ \previouspage quick-screens.html
+ \page qtquick-iso-icon-browser.html
+ \nextpage quick-export-to-qml.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-screens.qdoc b/doc/src/qtquick/qtquick-screens.qdoc
index 264d93e53b..fa1cd9055a 100644
--- a/doc/src/qtquick/qtquick-screens.qdoc
+++ b/doc/src/qtquick/qtquick-screens.qdoc
@@ -27,7 +27,7 @@
\contentspage {Qt Creator Manual}
\previouspage quick-scalable-image.html
\page quick-screens.html
- \nextpage creator-qtquick-designer-extensions.html
+ \nextpage qtquick-iso-icon-browser.html
\title Creating Screens