diff --git a/src/controls/Button.qml b/src/controls/Button.qml
index cf725085c54733ad987a4ae0c20797dfa35aa2b9..2418bfa2dbe8ff0bad03f71929e8460c4645f59f 100644
--- a/src/controls/Button.qml
+++ b/src/controls/Button.qml
@@ -102,7 +102,7 @@ BasicButton {
Accessible.name: text
- style: Qt.createComponent(Settings.theme() + "/ButtonStyle.qml", button)
+ style: Qt.createComponent(Settings.style + "/ButtonStyle.qml", button)
Binding {
target: menu
diff --git a/src/controls/CheckBox.qml b/src/controls/CheckBox.qml
index 46f9068d267e6fb04c71d056de8d97abbbd3ed44..ad82a948702b189e2ff35f9d92abe9019d7d235a 100644
--- a/src/controls/CheckBox.qml
+++ b/src/controls/CheckBox.qml
@@ -129,7 +129,7 @@ AbstractCheckable {
*/
property bool __ignoreChecked: false
- style: Qt.createComponent(Settings.theme() + "/CheckBoxStyle.qml", checkBox)
+ style: Qt.createComponent(Settings.style + "/CheckBoxStyle.qml", checkBox)
activeFocusOnTab: true
diff --git a/src/controls/ComboBox.qml b/src/controls/ComboBox.qml
index 219dc3b36213fcf601adb16d324cbee36f5511e9..4d20736047e5eb1a7718929574664c788a463d55 100644
--- a/src/controls/ComboBox.qml
+++ b/src/controls/ComboBox.qml
@@ -97,7 +97,7 @@ Control {
/*! \internal */
property var __popup: popup
- style: Qt.createComponent(Settings.theme() + "/ComboBoxStyle.qml", comboBox)
+ style: Qt.createComponent(Settings.style + "/ComboBoxStyle.qml", comboBox)
activeFocusOnTab: true
diff --git a/src/controls/GroupBox.qml b/src/controls/GroupBox.qml
index 6342d2789066f4ecb1fb84e53ad9ba41e6a37d84..e358dd9d00bdd19249c513bdda318cdc158fbdcf 100644
--- a/src/controls/GroupBox.qml
+++ b/src/controls/GroupBox.qml
@@ -151,7 +151,7 @@ Item {
readonly property alias contentItem: container
/*! \internal */
- property Component style: Qt.createComponent(Settings.theme() + "/GroupBoxStyle.qml", groupbox)
+ property Component style: Qt.createComponent(Settings.style + "/GroupBoxStyle.qml", groupbox)
/*! \internal */
property alias __checkbox: check
diff --git a/src/controls/Menu.qml b/src/controls/Menu.qml
index 8b6a35b99c26637662936cae9e320edd9d24fdd6..e89099db402750042747c7c1c4a62aa6126741fe 100644
--- a/src/controls/Menu.qml
+++ b/src/controls/Menu.qml
@@ -130,7 +130,7 @@ MenuPrivate {
property Component __selfComponent: null
/*! \internal */
- property Component style: Qt.createComponent(Settings.theme() + "/MenuStyle.qml", root)
+ property Component style: Qt.createComponent(Settings.style + "/MenuStyle.qml", root)
/*! \internal */
property var __menuBar: null
diff --git a/src/controls/MenuBar.qml b/src/controls/MenuBar.qml
index cee2139630f745bb07cc63e50c8928414959c733..65af1c124cda7eadc91e5299a7998a0294d42ff1 100644
--- a/src/controls/MenuBar.qml
+++ b/src/controls/MenuBar.qml
@@ -74,7 +74,7 @@ MenuBarPrivate {
id: root
/*! \internal */
- property Component style: Qt.createComponent(Settings.theme() + "/MenuBarStyle.qml", root)
+ property Component style: Qt.createComponent(Settings.style + "/MenuBarStyle.qml", root)
/*! \internal */
__contentItem: Loader {
diff --git a/src/controls/ProgressBar.qml b/src/controls/ProgressBar.qml
index 92181df17366b02ad1b00498e0655d0aec48ed7f..1e78ed92a3a33309707ae0b2c72b62649f4948ff 100644
--- a/src/controls/ProgressBar.qml
+++ b/src/controls/ProgressBar.qml
@@ -97,7 +97,7 @@ Control {
property int orientation: Qt.Horizontal
/*! \internal */
- style: Qt.createComponent(Settings.theme() + "/ProgressBarStyle.qml", progressbar)
+ style: Qt.createComponent(Settings.style + "/ProgressBarStyle.qml", progressbar)
/*! \internal */
property bool __initialized: false
diff --git a/src/controls/RadioButton.qml b/src/controls/RadioButton.qml
index 7fb4decdaa5260142b7d8e3e72168081bc817879..963d085cb0cfb3fb97467e0319216de93069bfbc 100644
--- a/src/controls/RadioButton.qml
+++ b/src/controls/RadioButton.qml
@@ -87,7 +87,7 @@ AbstractCheckable {
\codeline Qt.createComponent("path/to/style.qml", radioButtonId);
*/
- style: Qt.createComponent(Settings.theme() + "/RadioButtonStyle.qml", radioButton)
+ style: Qt.createComponent(Settings.style + "/RadioButtonStyle.qml", radioButton)
__cycleStatesHandler: function() { checked = !checked; }
}
diff --git a/src/controls/ScrollView.qml b/src/controls/ScrollView.qml
index 4d06c3f3fec0a6a262d301d0912c8dcd98a29374..bbd21b24d84252308a20bf94e5ff531b356fef1e 100644
--- a/src/controls/ScrollView.qml
+++ b/src/controls/ScrollView.qml
@@ -144,7 +144,7 @@ FocusScope {
/*! \internal */
property alias __verticalScrollBar: scroller.verticalScrollBar
/*! \internal */
- property Component style: Qt.createComponent(Settings.theme() + "/ScrollViewStyle.qml", root)
+ property Component style: Qt.createComponent(Settings.style + "/ScrollViewStyle.qml", root)
/* \internal */
property Style __style: styleLoader.item
diff --git a/src/controls/Slider.qml b/src/controls/Slider.qml
index d53255a3ccd6b6093365fa6f95bd85b2573fabc2..469843c6ea82c227b4f5b166bb6ce7e7f72fc2a4 100644
--- a/src/controls/Slider.qml
+++ b/src/controls/Slider.qml
@@ -187,7 +187,7 @@ Control {
return Math.round(v);
}
- style: Qt.createComponent(Settings.theme() + "/SliderStyle.qml", slider)
+ style: Qt.createComponent(Settings.style + "/SliderStyle.qml", slider)
Keys.onRightPressed: value += (maximumValue - minimumValue)/10.0
Keys.onLeftPressed: value -= (maximumValue - minimumValue)/10.0
diff --git a/src/controls/SpinBox.qml b/src/controls/SpinBox.qml
index ab0eeb0b2ea108877dc4731d57c325b706e29e66..bf8e66473c7a7be09caa2e1d4222d2144d92bab4 100644
--- a/src/controls/SpinBox.qml
+++ b/src/controls/SpinBox.qml
@@ -131,7 +131,7 @@ Control {
*/
property bool activeFocusOnPress: true
- style: Qt.createComponent(Settings.theme() + "/SpinBoxStyle.qml", spinbox)
+ style: Qt.createComponent(Settings.style + "/SpinBoxStyle.qml", spinbox)
/*! \internal */
function __increment() {
diff --git a/src/controls/StatusBar.qml b/src/controls/StatusBar.qml
index 248c16eeba09bff61e1934e1942c7016835df72d..13edc5eff4bcfef2d4efeaac0fc8b44423c73c1b 100644
--- a/src/controls/StatusBar.qml
+++ b/src/controls/StatusBar.qml
@@ -73,7 +73,7 @@ Item {
width: parent ? parent.width : implicitWidth
implicitWidth: loader.item.implicitHeight
implicitHeight: loader.item ? loader.item.implicitHeight : 0
- property Component style: Qt.createComponent(Settings.theme() + "/StatusBarStyle.qml", statusbar)
+ property Component style: Qt.createComponent(Settings.style + "/StatusBarStyle.qml", statusbar)
Loader {
id: loader
anchors.fill: parent
diff --git a/src/controls/TabView.qml b/src/controls/TabView.qml
index 7871cdd68866f64bf98ccf3b3c7ae435c74420ee..98c2466b864ccbae320574fed4282e6d8be87f33 100644
--- a/src/controls/TabView.qml
+++ b/src/controls/TabView.qml
@@ -141,7 +141,7 @@ FocusScope {
property ListModel __tabs: ListModel { }
/*! \internal */
- property Component style: Qt.createComponent(Settings.theme() + "/TabViewStyle.qml", root)
+ property Component style: Qt.createComponent(Settings.style + "/TabViewStyle.qml", root)
/*! \internal */
property var __styleItem: loader.item
diff --git a/src/controls/TableView.qml b/src/controls/TableView.qml
index 5d7a3472fcc82cc254b2f9ed20e69eef2bb4d42b..6efee30db5d7475070817490cffb8d7f0089b474 100644
--- a/src/controls/TableView.qml
+++ b/src/controls/TableView.qml
@@ -279,7 +279,7 @@ ScrollView {
}
- style: Qt.createComponent(Settings.theme() + "/TableViewStyle.qml", root)
+ style: Qt.createComponent(Settings.style + "/TableViewStyle.qml", root)
Accessible.role: Accessible.Table
diff --git a/src/controls/TextField.qml b/src/controls/TextField.qml
index e374c83dddf10f206fdeac87de3c260204618a72..81c30fc14dcd9ad41d998418239cdb39faa19ad8 100644
--- a/src/controls/TextField.qml
+++ b/src/controls/TextField.qml
@@ -533,7 +533,7 @@ Control {
/*! \internal */
property alias __contentWidth: textInput.contentWidth
- style: Qt.createComponent(Settings.theme() + "/TextFieldStyle.qml", textInput)
+ style: Qt.createComponent(Settings.style + "/TextFieldStyle.qml", textInput)
activeFocusOnTab: true
diff --git a/src/controls/ToolBar.qml b/src/controls/ToolBar.qml
index 71ef30a514c65810a1d8f07ebc4bc42f5b06da05..d2adea56a2d9a92ea4281b9288b8a27fed94f1e1 100644
--- a/src/controls/ToolBar.qml
+++ b/src/controls/ToolBar.qml
@@ -76,7 +76,7 @@ Item {
width: parent ? parent.width : implicitWidth
implicitWidth: loader.item ? loader.item.implicitWidth : 0
implicitHeight: loader.item ? loader.item.implicitHeight : 0
- property Component style: Qt.createComponent(Settings.theme() + "/ToolBarStyle.qml", toolbar)
+ property Component style: Qt.createComponent(Settings.style + "/ToolBarStyle.qml", toolbar)
Loader {
id: loader
anchors.fill: parent
diff --git a/src/controls/ToolButton.qml b/src/controls/ToolButton.qml
index 106a947f453c31f28ca29c830e141a41eeaf3da3..d6607d2835a408e7976b6b9a2a5782fcf8d825f6 100644
--- a/src/controls/ToolButton.qml
+++ b/src/controls/ToolButton.qml
@@ -78,5 +78,5 @@ BasicButton {
Accessible.name: text
- style: Qt.createComponent(Settings.theme() + "/ToolButtonStyle.qml", button)
+ style: Qt.createComponent(Settings.style + "/ToolButtonStyle.qml", button)
}
diff --git a/src/private/FocusFrame.qml b/src/private/FocusFrame.qml
index 52c114387ddd9ae2d21eab81c6a791b37224b46c..3a07701c5d2a1afe4f3d0b17ec3d38f6f3363272 100644
--- a/src/private/FocusFrame.qml
+++ b/src/private/FocusFrame.qml
@@ -62,6 +62,6 @@ Item {
id: loader
z: 2
anchors.fill: parent
- sourceComponent: Qt.createComponent( "../" + Settings.theme() + "/FocusFrameStyle.qml", root)
+ sourceComponent: Qt.createComponent(Settings.style + "/FocusFrameStyle.qml", root)
}
}
diff --git a/src/private/plugin.cpp b/src/private/plugin.cpp
index e45371b26e7a3fb11fbff2a1a43762b241dbbd9f..0392a2494431432b2156d1c6964e25ca87b79849 100644
--- a/src/private/plugin.cpp
+++ b/src/private/plugin.cpp
@@ -66,7 +66,7 @@ static QObject *registerSettingsModule(QQmlEngine *engine, QJSEngine *jsEngine)
{
Q_UNUSED(engine);
Q_UNUSED(jsEngine);
- return new QQuickControlSettings();
+ return new QQuickControlSettings(engine);
}
class QtQuickControlsPrivatePlugin : public QQmlExtensionPlugin
diff --git a/src/private/qquickcontrolsettings.cpp b/src/private/qquickcontrolsettings.cpp
index 01456b2a169d63a2628f68e72d8e12efa284e07e..44db49c209c1fe5e5f82491d14bdff41f0810897 100644
--- a/src/private/qquickcontrolsettings.cpp
+++ b/src/private/qquickcontrolsettings.cpp
@@ -42,34 +42,95 @@
#include "qquickcontrolsettings_p.h"
#include <qquickitem.h>
#include <qcoreapplication.h>
+#include <qqmlengine.h>
+#include <qdir.h>
QT_BEGIN_NAMESPACE
-QQuickControlSettings::QQuickControlSettings(QObject *parent)
- : QObject(parent)
+static QString defaultStyleName()
{
+ //Only enable QStyle support when we are using QApplication
+ if (QCoreApplication::instance()->inherits("QApplication"))
+ return QLatin1String("Desktop");
+ return QLatin1String("Base");
}
-QString QQuickControlSettings::theme()
+static QString styleImportName()
{
- static QString currentTheme;
- if (currentTheme.isEmpty()) {
- //Following variable is for internal use only. It is very possible
- //that it will disappear in future releases.
- currentTheme = qgetenv("QT_QUICK_CONTROLS_STYLE");
+ QString name = qgetenv("QT_QUICK_CONTROLS_STYLE");
+ if (name.isEmpty())
+ name = defaultStyleName();
+ return QFileInfo(name).fileName();
+}
- if (currentTheme.isEmpty()) {
- //Only enable QStyle support when we are using QApplication
- if (QCoreApplication::instance()->inherits("QApplication"))
- currentTheme = QLatin1String("Desktop");
- else
- currentTheme = QLatin1String("Base");
+static QString styleImportPath(QQmlEngine *engine, const QString &styleName)
+{
+ QString path = qgetenv("QT_QUICK_CONTROLS_STYLE");
+ QFileInfo info(path);
+ if (info.isRelative()) {
+ foreach (const QString &import, engine->importPathList()) {
+ QDir dir(import + QLatin1String("/QtQuick/Controls/Styles"));
+ if (dir.exists(styleName)) {
+ path = dir.absolutePath();
+ break;
+ }
}
+ } else {
+ path = info.absolutePath();
+ }
+ return path;
+}
- if (!currentTheme.startsWith(QLatin1String("Styles/")))
- currentTheme.prepend(QLatin1String("Styles/"));
+QQuickControlSettings::QQuickControlSettings(QQmlEngine *engine)
+{
+ m_name = styleImportName();
+ m_path = styleImportPath(engine, m_name);
+
+ if (!QFile::exists(styleFilePath())) {
+ QString unknownStyle = m_name;
+ m_name = defaultStyleName();
+ m_path = styleImportPath(engine, m_name);
+ qWarning() << "WARNING: Cannot find style" << unknownStyle << "- fallback:" << styleFilePath();
}
- return currentTheme;
+
+ connect(this, SIGNAL(styleNameChanged()), SIGNAL(styleChanged()));
+ connect(this, SIGNAL(stylePathChanged()), SIGNAL(styleChanged()));
+}
+
+QUrl QQuickControlSettings::style() const
+{
+ return QUrl::fromLocalFile(styleFilePath());
+}
+
+QString QQuickControlSettings::styleName() const
+{
+ return m_name;
+}
+
+void QQuickControlSettings::setStyleName(const QString &name)
+{
+ if (m_name != name) {
+ m_name = name;
+ emit styleNameChanged();
+ }
+}
+
+QString QQuickControlSettings::stylePath() const
+{
+ return m_path;
+}
+
+void QQuickControlSettings::setStylePath(const QString &path)
+{
+ if (m_path != path) {
+ m_path = path;
+ emit stylePathChanged();
+ }
+}
+
+QString QQuickControlSettings::styleFilePath() const
+{
+ return m_path + QLatin1Char('/') + m_name;
}
QT_END_NAMESPACE
diff --git a/src/private/qquickcontrolsettings_p.h b/src/private/qquickcontrolsettings_p.h
index ea2811beb69bbf94ce07366ff1a11783d0bdab70..98e8515124805c1d57fb77b13ca89331b421c594 100644
--- a/src/private/qquickcontrolsettings_p.h
+++ b/src/private/qquickcontrolsettings_p.h
@@ -42,18 +42,41 @@
#ifndef QQUICKCONTROLSETTINGS_P_H
#define QQUICKCONTROLSETTINGS_P_H
+#include <QtCore/qurl.h>
#include <QtCore/qobject.h>
QT_BEGIN_NAMESPACE
+class QQmlEngine;
+
class QQuickControlSettings : 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:
- QQuickControlSettings(QObject *parent = 0);
+ QQuickControlSettings(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;
- Q_INVOKABLE QString theme();
+ QString m_name;
+ QString m_path;
};
QT_END_NAMESPACE