summaryrefslogtreecommitdiff
path: root/src/extras/Private
diff options
context:
space:
mode:
Diffstat (limited to 'src/extras/Private')
-rw-r--r--src/extras/Private/CircularButton.qml8
-rw-r--r--src/extras/Private/CircularButtonStyleHelper.qml2
-rw-r--r--src/extras/Private/CircularTickmarkLabel.qml4
-rw-r--r--src/extras/Private/Handle.qml4
-rw-r--r--src/extras/Private/PieMenuIcon.qml2
-rw-r--r--src/extras/Private/private.pri2
-rw-r--r--src/extras/Private/qquickstylesettings.cpp157
-rw-r--r--src/extras/Private/qquickstylesettings_p.h79
8 files changed, 10 insertions, 248 deletions
diff --git a/src/extras/Private/CircularButton.qml b/src/extras/Private/CircularButton.qml
index b2baf5a2..5c7f2b7e 100644
--- a/src/extras/Private/CircularButton.qml
+++ b/src/extras/Private/CircularButton.qml
@@ -35,15 +35,15 @@
****************************************************************************/
import QtQuick 2.2
-import QtQuick.Controls 1.1
-import QtQuick.Extras 1.3
+import QtQuick.Controls 1.4
+import QtQuick.Controls.Styles 1.4
+import QtQuick.Extras 1.4
import QtQuick.Extras.Private 1.0
-import QtQuick.Extras.Styles 1.3
/*!
\internal
*/
Button {
id: button
- style: Qt.createComponent(StyleSettings.style + "/CircularButtonStyle.qml", button)
+ style: Settings.styleComponent(Settings.style, "CircularButtonStyle.qml", button)
}
diff --git a/src/extras/Private/CircularButtonStyleHelper.qml b/src/extras/Private/CircularButtonStyleHelper.qml
index fedd3a37..77bdc9ef 100644
--- a/src/extras/Private/CircularButtonStyleHelper.qml
+++ b/src/extras/Private/CircularButtonStyleHelper.qml
@@ -35,7 +35,7 @@
****************************************************************************/
import QtQuick 2.2
-import QtQuick.Extras 1.3
+import QtQuick.Extras 1.4
import QtQuick.Extras.Private 1.0
QtObject {
diff --git a/src/extras/Private/CircularTickmarkLabel.qml b/src/extras/Private/CircularTickmarkLabel.qml
index 05554878..0e45f7b9 100644
--- a/src/extras/Private/CircularTickmarkLabel.qml
+++ b/src/extras/Private/CircularTickmarkLabel.qml
@@ -38,12 +38,12 @@ import QtQuick 2.2
// Workaround for QTBUG-37751; we need this import for RangeModel, although we shouldn't.
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
-import QtQuick.Extras 1.3
+import QtQuick.Extras 1.4
import QtQuick.Extras.Private 1.0
Control {
id: label
- style: Qt.createComponent(StyleSettings.style + "/CircularTickmarkLabelStyle.qml", label)
+ style: Settings.styleComponent(Settings.style, "CircularTickmarkLabelStyle.qml", label)
property alias minimumValue: range.minimumValue
diff --git a/src/extras/Private/Handle.qml b/src/extras/Private/Handle.qml
index 12e2804d..31b4543f 100644
--- a/src/extras/Private/Handle.qml
+++ b/src/extras/Private/Handle.qml
@@ -36,8 +36,8 @@
import QtQuick 2.0
import QtGraphicalEffects 1.0
+import QtQuick.Controls.Styles 1.4
import QtQuick.Controls.Private 1.0
-import QtQuick.Extras.Styles 1.3
import QtQuick.Extras.Private 1.1
import QtQuick.Extras.Private.CppUtils 1.0
@@ -46,7 +46,7 @@ Control {
x: handleArea.centerOfHandle.x - width / 2
y: handleArea.centerOfHandle.y - height / 2
- style: Qt.createComponent(StyleSettings.style + "/HandleStyle.qml", root)
+ style: Settings.styleComponent(Settings.style, "HandleStyle.qml", root)
/*!
The angle of the handle along the circumference of \l rotationRadius in
diff --git a/src/extras/Private/PieMenuIcon.qml b/src/extras/Private/PieMenuIcon.qml
index f54e035f..17304c94 100644
--- a/src/extras/Private/PieMenuIcon.qml
+++ b/src/extras/Private/PieMenuIcon.qml
@@ -35,7 +35,7 @@
****************************************************************************/
import QtQuick 2.3
-import QtQuick.Extras 1.3
+import QtQuick.Extras 1.4
import QtQuick.Extras.Private 1.0
import QtQuick.Extras.Private.CppUtils 1.0
diff --git a/src/extras/Private/private.pri b/src/extras/Private/private.pri
index 4f394412..0e4f7a12 100644
--- a/src/extras/Private/private.pri
+++ b/src/extras/Private/private.pri
@@ -4,14 +4,12 @@ HEADERS += \
$$PWD/qquickcircularprogressbar_p.h \
$$PWD/qquickflatprogressbar_p.h \
$$PWD/qquickmousethief_p.h \
- $$PWD/qquickstylesettings_p.h \
$$PWD/qquickmathutils_p.h
SOURCES += \
$$PWD/qquickcircularprogressbar.cpp \
$$PWD/qquickflatprogressbar.cpp \
$$PWD/qquickmousethief.cpp \
- $$PWD/qquickstylesettings.cpp \
$$PWD/qquickmathutils.cpp
OTHER_FILES += \
diff --git a/src/extras/Private/qquickstylesettings.cpp b/src/extras/Private/qquickstylesettings.cpp
deleted file mode 100644
index 0936e55e..00000000
--- a/src/extras/Private/qquickstylesettings.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt Quick Extras module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** 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 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qquickstylesettings_p.h"
-#include <qqmlengine.h>
-#include <qfileinfo.h>
-#include <qdebug.h>
-#include <qdir.h>
-
-QT_BEGIN_NAMESPACE
-
-static QString defaultStyleName()
-{
- return QLatin1String("Base");
-}
-
-static QString styleImportName()
-{
- QString name = qgetenv("QT_QUICK_CONTROLS_STYLE");
- if (name.isEmpty())
- name = defaultStyleName();
- return QFileInfo(name).fileName();
-}
-
-static bool isResource(const QString &path)
-{
- return path.startsWith(":/");
-}
-
-static QString styleImportPath(QQmlEngine *engine, const QString &styleName)
-{
- static const char * const stylePaths[] = { "/QtQuick/Extras/Styles", "/QtQuick/Controls/Styles" };
- QString path = qgetenv("QT_QUICK_CONTROLS_STYLE");
- QFileInfo info(path);
- if (isResource(path)) {
- path = info.path();
- } else if (info.isRelative()) {
- bool found = false;
- QStringList importPaths = engine->importPathList();
- importPaths.prepend(QStringLiteral(":/ExtrasImports/"));
-
- foreach (const QString &import, importPaths) {
- for (unsigned i = 0; i < sizeof(stylePaths) / sizeof(stylePaths[0]); i++) {
- QDir dir(import + QLatin1String(stylePaths[i]));
- if (dir.exists(styleName)) {
- found = true;
- path = dir.absolutePath();
- break;
- }
- }
- if (found)
- break;
- }
- if (!found)
- path = QLatin1String(":/ExtrasImports/QtQuick/Extras/Styles");
- } else {
- path = info.absolutePath();
- }
- return path;
-}
-
-QQuickStyleSettings::QQuickStyleSettings(QQmlEngine *engine)
-{
- m_name = styleImportName();
- m_path = styleImportPath(engine, m_name);
-
- QString path = styleFilePath();
-
- if (!QDir(path).exists()) {
- QString unknownStyle = m_name;
- m_name = defaultStyleName();
- m_path = styleImportPath(engine, m_name);
- qWarning() << "WARNING: Cannot find style" << unknownStyle << "- fallback:" << styleFilePath();
- }
-
- connect(this, SIGNAL(styleNameChanged()), SIGNAL(styleChanged()));
- connect(this, SIGNAL(stylePathChanged()), SIGNAL(styleChanged()));
-}
-
-QUrl QQuickStyleSettings::style() const
-{
- QUrl result;
- QString path = styleFilePath();
- if (isResource(path)) {
- result.setScheme("qrc");
- path.remove(0, 1); // remove ':' prefix
- result.setPath(path);
- } else
- result = QUrl::fromLocalFile(path);
- return result;
-}
-
-QString QQuickStyleSettings::styleName() const
-{
- return m_name;
-}
-
-void QQuickStyleSettings::setStyleName(const QString &name)
-{
- if (m_name != name) {
- m_name = name;
- emit styleNameChanged();
- }
-}
-
-QString QQuickStyleSettings::stylePath() const
-{
- return m_path;
-}
-
-void QQuickStyleSettings::setStylePath(const QString &path)
-{
- if (m_path != path) {
- m_path = path;
- emit stylePathChanged();
- }
-}
-
-QString QQuickStyleSettings::styleFilePath() const
-{
- return m_path + QLatin1Char('/') + m_name;
-}
-
-QT_END_NAMESPACE
diff --git a/src/extras/Private/qquickstylesettings_p.h b/src/extras/Private/qquickstylesettings_p.h
deleted file mode 100644
index 3cb157a8..00000000
--- a/src/extras/Private/qquickstylesettings_p.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt Quick Extras module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** 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 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef STYLESETTINGS_P_H
-#define STYLESETTINGS_P_H
-
-#include <QtCore/qurl.h>
-#include <QtCore/qobject.h>
-
-QT_BEGIN_NAMESPACE
-
-class QQmlEngine;
-
-class QQuickStyleSettings : public QObject
-{
- Q_OBJECT
- Q_PROPERTY(QUrl style READ style NOTIFY styleChanged)
- Q_PROPERTY(QString styleName READ styleName WRITE setStyleName NOTIFY styleNameChanged)
- Q_PROPERTY(QString stylePath READ stylePath WRITE setStylePath NOTIFY stylePathChanged)
-
-public:
- QQuickStyleSettings(QQmlEngine *engine);
-
- QUrl style() const;
-
- QString styleName() const;
- void setStyleName(const QString &name);
-
- QString stylePath() const;
- void setStylePath(const QString &path);
-
-signals:
- void styleChanged();
- void styleNameChanged();
- void stylePathChanged();
-
-private:
- QString styleFilePath() const;
-
- QString m_name;
- QString m_path;
-};
-
-QT_END_NAMESPACE
-
-#endif // STYLESETTINGS_P_H
View Lorry Controller Status