From 8fe6fadece73d62f5fd25985f36a3bd1e92187d1 2013-06-17 05:10:38 From: Miikka Heikkinen Date: 2013-06-17 05:10:38 Subject: [PATCH] Fix various documentation issues Change-Id: I0963abda42a8273f058d51b3095740357f276ce9 Reviewed-by: Mika Salmela --- diff --git a/charts.pro b/charts.pro index c4e6816..ed20c6a 100644 --- a/charts.pro +++ b/charts.pro @@ -45,8 +45,8 @@ contains(QT_MAJOR_VERSION, 5) { HELPGENERATOR_CMD = qhelpgenerator } -QHP_FILE = doc/html/qtcommercialcharts.qhp -QCH_FILE = doc/qch/qtcommercialcharts.qch +QHP_FILE = doc/html/qtcharts.qhp +QCH_FILE = doc/qch/qtcharts.qch docs.target = docs docs.depends = qch_docs FORCE diff --git a/doc/images/qt-logo.png b/doc/images/qt-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..14ddf2a0289e64c686b34712b8754bc4baac2726 GIT binary patch literal 5149 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 Rw_N$(cXz<92j2L!{{x=&?K1!X literal 0 Hc$@<}LyquKA3(Ef&=!h@*2|qXP1(0n%D1QKe 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 diff --git a/doc/qchart-html-template.qdocconf b/doc/qchart-html-template.qdocconf index 3a5c10f..9f5a5c0 100644 --- a/doc/qchart-html-template.qdocconf +++ b/doc/qchart-html-template.qdocconf @@ -31,7 +31,7 @@ HTML.footer = \ " \n" \ "
\n" \ "

\n" \ - " © 2013 Digia ." \ + " © 2013 Digia." \ " Qt and Qt logos are trademarks of of Digia Corporation \n" \ " in Finland and/or other countries worldwide.

\n" \ "

\n" \ diff --git a/doc/qchart-html.qdocconf b/doc/qchart-html.qdocconf index 495eb13..b5f5d8b 100644 --- a/doc/qchart-html.qdocconf +++ b/doc/qchart-html.qdocconf @@ -12,7 +12,7 @@ HTML.scripts = # These also need to be listed in qhp.Qt.extraFiles with the correct # directory prefixes. -extraimages.HTML = qt_commercial_logo.png \ +extraimages.HTML = qt-logo.png \ digia_logo.png \ qcharts.png \ arrow_down.png \ diff --git a/doc/qchart-qch.qdocconf b/doc/qchart-qch.qdocconf index fb7f691..49f6f5c 100644 --- a/doc/qchart-qch.qdocconf +++ b/doc/qchart-qch.qdocconf @@ -1,33 +1,33 @@ -qhp.projects = QtCommercialCharts -qhp.QtCommercialCharts.file = qtcommercialcharts.qhp -qhp.QtCommercialCharts.namespace = com.digia.qtcommercialcharts.$QT_CHARTS_VERSION_TAG -qhp.QtCommercialCharts.virtualFolder = doc -qhp.QtCommercialCharts.indexTitle = QtCommercial Charts Reference $QT_CHARTS_VERSION -qhp.QtCommercialCharts.filterAttributes = qtcommercialcharts $QT_CHARTS_VERSION -qhp.QtCommercialCharts.customFilters.QtCommercialCharts.name = QtCommercial Charts $QT_CHARTS_VERSION -qhp.QtCommercialCharts.customFilters.QtCommercialCharts.filterAttributes = qtcommercialcharts $QT_CHARTS_VERSION -qhp.QtCommercialCharts.indexRoot = +qhp.projects = QtCharts +qhp.QtCharts.file = qtcharts.qhp +qhp.QtCharts.namespace = com.digia.qtcharts.$QT_CHARTS_VERSION_TAG +qhp.QtCharts.virtualFolder = doc +qhp.QtCharts.indexTitle = Qt Charts Reference $QT_CHARTS_VERSION +qhp.QtCharts.filterAttributes = qtcharts $QT_CHARTS_VERSION +qhp.QtCharts.customFilters.QtCharts.name = Qt Charts $QT_CHARTS_VERSION +qhp.QtCharts.customFilters.QtCharts.filterAttributes = qtcharts $QT_CHARTS_VERSION +qhp.QtCharts.indexRoot = -qhp.QtCommercialCharts.subprojects = gettingstarted classes qmlclasses examples demos +qhp.QtCharts.subprojects = gettingstarted classes qmlclasses examples demos -qhp.QtCommercialCharts.subprojects.gettingstarted.title = Getting Started -qhp.QtCommercialCharts.subprojects.gettingstarted.indexTitle = QtCommercial Charts getting started +qhp.QtCharts.subprojects.gettingstarted.title = Getting Started +qhp.QtCharts.subprojects.gettingstarted.indexTitle = Qt Charts getting started -qhp.QtCommercialCharts.subprojects.classes.title = API Classes -qhp.QtCommercialCharts.subprojects.classes.indexTitle = QtCommercial Charts API +qhp.QtCharts.subprojects.classes.title = API Classes +qhp.QtCharts.subprojects.classes.indexTitle = Qt Charts API -qhp.QtCommercialCharts.subprojects.qmlclasses.title = QML API -qhp.QtCommercialCharts.subprojects.qmlclasses.indexTitle = QtCommercial Charts QML API +qhp.QtCharts.subprojects.qmlclasses.title = QML API +qhp.QtCharts.subprojects.qmlclasses.indexTitle = Qt Charts QML API -qhp.QtCommercialCharts.subprojects.examples.title = Examples -qhp.QtCommercialCharts.subprojects.examples.indexTitle = QtCommercial Charts Examples +qhp.QtCharts.subprojects.examples.title = Examples +qhp.QtCharts.subprojects.examples.indexTitle = Qt Charts Examples -qhp.QtCommercialCharts.subprojects.demos.title = Demos -qhp.QtCommercialCharts.subprojects.demos.indexTitle = QtCommercial Charts Demos +qhp.QtCharts.subprojects.demos.title = Demos +qhp.QtCharts.subprojects.demos.indexTitle = Qt Charts Demos # Files not referenced in any qdoc file. # See also extraimages.HTML -qhp.QtCommercialCharts.extraFiles = index.html \ +qhp.QtCharts.extraFiles = index.html \ examples.html \ demos.html \ images/arrow_down.png \ @@ -40,5 +40,5 @@ qhp.QtCommercialCharts.extraFiles = index.html \ images/digia_logo.png \ images/horBar.png \ images/qcharts.png \ - images/qt_commercial_logo.png \ + images/qt-logo.png \ style/offline.css diff --git a/doc/src/classes.qdoc b/doc/src/classes.qdoc index 654e765..d95e7a3 100644 --- a/doc/src/classes.qdoc +++ b/doc/src/classes.qdoc @@ -1,10 +1,10 @@ /*! \page classes.html - \title Qt Enterprise Charts API + \title Qt Charts API \keyword All Classes Charts API is build on top of Qt Graphics View Framework. Charts can be displayed as QGraphicsWidget using QChart class. However - there is also convenience class QChartView which is QWidget based. These lets quickly use QCharts as normal Qt widget. + there is also convenience class QChartView which is QWidget based. These lets quickly use Qt Charts as normal Qt widget. Each chart type is represented by QAbstractSeries derived class. To create given chart type users have to use instance of related series class and add it to QChart instance. \code diff --git a/doc/src/demos-qmloscilloscope.qdoc b/doc/src/demos-qmloscilloscope.qdoc index 8c5a2cd..271df75 100644 --- a/doc/src/demos-qmloscilloscope.qdoc +++ b/doc/src/demos-qmloscilloscope.qdoc @@ -4,7 +4,7 @@ \image demos_qmloscilloscope.png - Oscilloscope application demonstrates how to use Qt Enterprise Charts QML API to implement an + Oscilloscope application demonstrates how to use Qt Charts QML API to implement an application with strict performance requirements. The application uses generated data with configurable characteristics to mimic a simple oscilloscope user interface. To find out the actual screen refresh performance of the application, you can set QML_SHOW_FRAMERATE = 1 to diff --git a/doc/src/demos-quick2chart.qdoc b/doc/src/demos-quick2chart.qdoc index 9720666..76f0c32 100644 --- a/doc/src/demos-quick2chart.qdoc +++ b/doc/src/demos-quick2chart.qdoc @@ -1,13 +1,15 @@ /*! \example demos/quick2chart - \title QtQuick 2 charts demo + \title Qt Quick 2 charts demo \subtitle \image demos_qmlchart1.png - This is a reimplementation of \l{Qml charts demo} in QtQuick 2. + This is a reimplementation of \l{Qml charts demo} in Qt Quick 2. - Only difference in qml files is importing the correct version of QtQuick: + The main difference in qml files is importing the correct version of Qt Quick: \snippet ../demos/quick2chart/qml/quick2chart/View1.qml 2 + + Additionally, antialiasing is set with qml property in Qt Quick 2. */ diff --git a/doc/src/demos-quick2oscilloscope.qdoc b/doc/src/demos-quick2oscilloscope.qdoc index e322760..09c1315 100644 --- a/doc/src/demos-quick2oscilloscope.qdoc +++ b/doc/src/demos-quick2oscilloscope.qdoc @@ -1,16 +1,16 @@ /*! \example demos/quick2oscilloscope - \title QtQuick 2 Oscilloscope + \title Qt Quick 2 Oscilloscope \image demos_qmloscilloscope.png - This is a reimplementation of \l{Oscilloscope} demo in QtQuick 2. + This is a reimplementation of \l{Oscilloscope} demo in Qt Quick 2. - Only difference in qml files is importing the correct version of QtQuick: + The main difference in qml files is importing the correct version of Qt Quick: \snippet ../demos/quick2oscilloscope/qml/quick2oscilloscope/main.qml 3 - \note QML_SHOW_FRAMERATE environment variable doesn't work with QtQuick 2. + \note QML_SHOW_FRAMERATE environment variable doesn't work with Qt Quick 2. Starting with Qt 5.1.0, QSG_RENDER_TIMING environment variable can be used similarly to display rendering time. */ diff --git a/doc/src/demos.qdoc b/doc/src/demos.qdoc index f9097a7..17dac0c 100644 --- a/doc/src/demos.qdoc +++ b/doc/src/demos.qdoc @@ -1,6 +1,6 @@ /*! \page demos.html - \title Qt Enterprise Charts Demos + \title Qt Charts Demos \keyword Demos \raw HTML @@ -65,17 +65,17 @@ Qml Polar Chart - QtQuick 2 Basic Charts + Qt Quick 2 Basic Charts Qml Polar Chart - QtQuick 2 Basic Charts + Qt Quick 2 Basic Charts - QtQuick 2 Oscilloscope + Qt Quick 2 Oscilloscope - QtQuick 2 Oscilloscope + Qt Quick 2 Oscilloscope

diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc index 998a811..a2c5e62 100644 --- a/doc/src/examples.qdoc +++ b/doc/src/examples.qdoc @@ -1,6 +1,6 @@ /*! \page examples.html - \title Qt Enterprise Charts Examples + \title Qt Charts Examples \keyword Examples \raw HTML diff --git a/doc/src/gettingstarted.qdoc b/doc/src/gettingstarted.qdoc index 72c2fea..d1b8fd5 100644 --- a/doc/src/gettingstarted.qdoc +++ b/doc/src/gettingstarted.qdoc @@ -1,6 +1,6 @@ /*! \page gettingstarted.html - \title Qt Enterprise Charts getting started + \title Qt Charts getting started \keyword Introduction Compiling: @@ -12,7 +12,7 @@ Depending on the OS and the compiler you are using "make" might need to be replaced with another command like: nmake, mingw32-make, etc. - To uninstall the Qt Enterprise Charts run: + To uninstall the Qt Charts run: \code make uninstall \endcode @@ -43,7 +43,7 @@ \bold {Widget project} - To use the QCharts classes add Qt Enterprise Charts namespace macro in your header file. + To use the Qt Charts classes add Qt Charts namespace macro in your header file. \code #include #include @@ -57,7 +57,7 @@ Add an import line to your *.qml file: \code - import QtCommercial.Chart 1.2 + import QtCommercial.Chart 1.3 \endcode \raw HTML diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index 1d990ef..5894388 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -4,12 +4,12 @@ \raw HTML
- qt_logo + qt-logo

- QCharts is a part of Qt Enterprise addons package. It provides a set of easy to use chart - components which are available for Qt Enterprise customers. It uses Qt Graphics View - Framework, therefore charts can be easily integrated to modern user interfaces. QCharts can + Qt Charts is a part of Qt addons package. It provides a set of easy to use chart + components which are available for Qt customers. It uses Qt Graphics View + Framework, therefore charts can be easily integrated to modern user interfaces. Qt Charts can be used as QWidgets, QGraphicsWidget or QML elements. Users can easily create impressive graphs by selecting one of the charts themes.

diff --git a/doc/src/qml.qdoc b/doc/src/qml.qdoc index ff957e0..076db5f 100644 --- a/doc/src/qml.qdoc +++ b/doc/src/qml.qdoc @@ -1,9 +1,9 @@ /*! \page qml.html - \title Qt Enterprise Charts QML API + \title Qt Charts QML API \keyword Charts QML API - Qt Enterprise Charts QML API is an intuitive and simple way to show charts in your QML + Qt Charts QML API is an intuitive and simple way to show charts in your QML applications. \table @@ -18,13 +18,13 @@ \o \inlineimage examples_qmlpiechart.png \endtable - \note Since Qt Enterprise Charts utilizes Qt Graphics View Framework for drawing, it works best - with QtQuick 1, which is based on the same framework. - As of release 1.3.0, Qt Enterprise Charts is also usable with QtQuick 2, though the performance - is slightly worse than with QtQuick 1 due to additional rendering step that is required. + \note Since Qt Charts utilizes Qt Graphics View Framework for drawing, it works best + with Qt Quick 1, which is based on the same framework. + As of release 1.3.0, Qt Charts is also usable with Qt Quick 2, though the performance + is slightly worse than with Qt Quick 1 due to additional rendering step that is required. - \note QtQuick 1 is supported from Qt 4.7.4 onwards because of missing - Q_REVISION macro in the earlier Qt releases. QtQuick 2 is supported with only Qt 5. + \note Qt Quick 1 is supported from Qt 4.7.4 onwards because of missing + Q_REVISION macro in the earlier Qt releases. Qt Quick 2 is supported with only Qt 5. \raw HTML diff --git a/plugins/declarative/declarativepolarchart.cpp b/plugins/declarative/declarativepolarchart.cpp index fd32786..1fd0c5c 100644 --- a/plugins/declarative/declarativepolarchart.cpp +++ b/plugins/declarative/declarativepolarchart.cpp @@ -39,8 +39,6 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE any line connecting the two points becomes meaningless, so choose the axis ranges accordingly when displaying line, spline, or area series. - \note Polar charts do not support multiple axes of same orientation. - The following QML shows how to create a polar chart with two series: \snippet ../demos/qmlpolarchart/qml/qmlpolarchart/View1.qml 1 diff --git a/plugins/designer/qchartsplugin.cpp b/plugins/designer/qchartsplugin.cpp index 489c46c..6e87f99 100644 --- a/plugins/designer/qchartsplugin.cpp +++ b/plugins/designer/qchartsplugin.cpp @@ -54,7 +54,7 @@ QString QChartsPlugin::includeFile() const QString QChartsPlugin::group() const { - return tr("QCharts Widgets"); + return tr("Qt Charts Widgets"); } QIcon QChartsPlugin::icon() const @@ -64,7 +64,7 @@ QIcon QChartsPlugin::icon() const QString QChartsPlugin::toolTip() const { - return tr("An qcharts view widget"); + return tr("An Qt Charts view widget"); } QString QChartsPlugin::whatsThis() const