summaryrefslogtreecommitdiffstats
path: root/src/chartsqml2/declarativemargins.cpp
diff options
context:
space:
mode:
authorTitta Heikkala <titta.heikkala@digia.com>2014-07-01 07:10:00 +0300
committerTitta Heikkala <titta.heikkala@theqtcompany.com>2014-10-14 13:04:52 +0300
commitc544258484ff4fd5d2b88402fbaa5d154b89a3a2 (patch)
tree7659625abb566dec55d3783ed820b928542d9b2b /src/chartsqml2/declarativemargins.cpp
parent76339f714f088645e911cee65bdb66055fe029aa (diff)
Qt Charts project file structure change
Charts repository structure is changed to follow the structure of a Qt Add-On module. The task includes following changes: - All macros and definitions named 'commercial' have been renamed. - Compile errors related to QString and qSort usage have been fixed. - Old demos are moved under examples. The QML examples now support only Qt Quick 2.0, the support for Qt Quick 1 is removed. - The QML examples with multiple views are updated so that they are usable also with touch devices. - Unnecessary version checks are removed from examples. - The build stamp has been removed as it was only meant for Charts development purposes and it's no longer needed. Also development build related debug prints are removed as __DATE__ can't be used for all OS thus it doesn't make much sense. - Documentation structure has been updated based on the new module structure. The raw HTML files have been removed. Demos are combined to examples. - Unnecessary .qdocinc files are no longer needed. The content is moved to the corresponding .cpp files. - The Charts widget designer plugin is updated according to the module change. - The test cases updated according to the project structure change. Tests are added also for version 2.0. - cmake modules generation is not needed with Qt 5.4 and Qt Charts so it's disabled. - The new module name and version are updated to the plugin.qmltypes file. Task-number: QTRD-2844, QTRD-3217, QTRD-3218, QTRD-3277, QTRD-3228, QTRD-2526, QTRD-3233, QTRD-3222 Change-Id: Ib7fb26057cde710ffaf6bc780c8bf52a16f45160 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Diffstat (limited to 'src/chartsqml2/declarativemargins.cpp')
-rw-r--r--src/chartsqml2/declarativemargins.cpp113
1 files changed, 113 insertions, 0 deletions
diff --git a/src/chartsqml2/declarativemargins.cpp b/src/chartsqml2/declarativemargins.cpp
new file mode 100644
index 00000000..f9a913c8
--- /dev/null
+++ b/src/chartsqml2/declarativemargins.cpp
@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the Qt Enterprise Charts Add-on.
+**
+** $QT_BEGIN_LICENSE$
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "declarativemargins.h"
+#include <QDataStream>
+#include <QDebug>
+
+QT_CHARTS_BEGIN_NAMESPACE
+
+/*!
+ \qmltype Margins
+ \inqmlmodule QtCharts
+
+ Uncreatable type that is used to define top, bottom, left and right margins.
+*/
+
+/*!
+ \qmlproperty int Margins::top
+ The top margin.
+*/
+
+/*!
+ \qmlproperty int Margins::bottom
+ The bottom margin.
+*/
+
+/*!
+ \qmlproperty int Margins::left
+ The left margin.
+*/
+
+/*!
+ \qmlproperty int Margins::right
+ The right margin.
+*/
+
+DeclarativeMargins::DeclarativeMargins(QObject *parent) :
+ QObject(parent)
+{
+ QMargins::setTop(0);
+ QMargins::setBottom(0);
+ QMargins::setLeft(0);
+ QMargins::setRight(0);
+}
+
+void DeclarativeMargins::setTop(int top)
+{
+ if (top < 0) {
+ qWarning() << "Cannot set top margin to a negative value:" << top;
+ } else {
+ if (top != QMargins::top()) {
+ QMargins::setTop(top);
+ emit topChanged(QMargins::top(), QMargins::bottom(), QMargins::left(), QMargins::right());
+ }
+ }
+}
+
+void DeclarativeMargins::setBottom(int bottom)
+{
+ if (bottom < 0) {
+ qWarning() << "Cannot set bottom margin to a negative value:" << bottom;
+ } else {
+ if (bottom != QMargins::bottom()) {
+ QMargins::setBottom(bottom);
+ emit bottomChanged(QMargins::top(), QMargins::bottom(), QMargins::left(), QMargins::right());
+ }
+ }
+}
+
+void DeclarativeMargins::setLeft(int left)
+{
+ if (left < 0) {
+ qWarning() << "Cannot set left margin to a negative value:" << left;
+ } else {
+ if (left != QMargins::left()) {
+ QMargins::setLeft(left);
+ emit leftChanged(QMargins::top(), QMargins::bottom(), QMargins::left(), QMargins::right());
+ }
+ }
+}
+
+void DeclarativeMargins::setRight(int right)
+{
+ if (right < 0) {
+ qWarning() << "Cannot set left margin to a negative value:" << right;
+ } else {
+ if (right != QMargins::right()) {
+ QMargins::setRight(right);
+ emit rightChanged(QMargins::top(), QMargins::bottom(), QMargins::left(), QMargins::right());
+ }
+ }
+}
+
+#include "moc_declarativemargins.cpp"
+
+QT_CHARTS_END_NAMESPACE