Changed singleton name to start with upper case letter

fancontrol-gui/package/contents/ui/Application.qml

@@ -38,7 +38,7 @@ ApplicationWindow {
     }
 
     Component.onCompleted: {
-        Fancontrol.base.load();
+        Fancontrol.Base.load();
         windowConfig.restore(window);
     }
 
@@ -53,14 +53,14 @@ ApplicationWindow {
                 action: resetAction
             }
             Loader {
-                active: !!Fancontrol.base.systemdCom
+                active: !!Fancontrol.Base.systemdCom
 
                 sourceComponent: ToolButton {
                     action: startAction
                 }
             }
             Loader {
-                active: !!Fancontrol.base.systemdCom
+                active: !!Fancontrol.Base.systemdCom
 
                 sourceComponent: ToolButton {
                     action: stopAction
@@ -106,8 +106,8 @@ ApplicationWindow {
     Action {
         id: applyAction
         text: i18n("Apply")
-        enabled: Fancontrol.base.needsApply
-        onTriggered: Fancontrol.base.apply()
+        enabled: Fancontrol.Base.needsApply
+        onTriggered: Fancontrol.Base.apply()
         iconName: "dialog-ok-apply"
         tooltip: i18n("Apply changes")
         shortcut: StandardKey.Apply
@@ -115,28 +115,28 @@ ApplicationWindow {
     Action {
         id: resetAction
         text: i18n("Reset")
-        enabled: Fancontrol.base.needsApply
-        onTriggered: Fancontrol.base.reset()
+        enabled: Fancontrol.Base.needsApply
+        onTriggered: Fancontrol.Base.reset()
         iconName: "edit-undo"
         tooltip: i18n("Revert changes")
     }
     Action {
         id: startAction
         text: i18n("Start")
-        enabled: !!Fancontrol.base.systemdCom && !Fancontrol.base.systemdCom.serviceActive
+        enabled: !!Fancontrol.Base.systemdCom && !Fancontrol.Base.systemdCom.serviceActive
         iconName: "media-playback-start"
         tooltip: i18n("Enable manual control")
 
-        onTriggered: Fancontrol.base.systemdCom.serviceActive = true
+        onTriggered: Fancontrol.Base.systemdCom.serviceActive = true
     }
     Action {
         id: stopAction
         text: i18n("Stop")
-        enabled: !!Fancontrol.base.systemdCom && Fancontrol.base.systemdCom.serviceActive
+        enabled: !!Fancontrol.Base.systemdCom && Fancontrol.Base.systemdCom.serviceActive
         iconName: "media-playback-stop"
         tooltip: i18n("Disable manual control")
 
-        onTriggered: Fancontrol.base.systemdCom.serviceActive = false
+        onTriggered: Fancontrol.Base.systemdCom.serviceActive = false
     }
     SystemPalette {
         id: palette

fancontrol-gui/package/contents/ui/ConfigfileTab.qml

@@ -25,7 +25,7 @@ import Fancontrol.Qml 1.0 as Fancontrol
 
 
 ColumnLayout {
-    property QtObject loader: Fancontrol.base.loader
+    property QtObject loader: Fancontrol.Base.loader
 
     anchors.fill: parent
     anchors.margins: 10

fancontrol-gui/package/contents/ui/PwmFansTab.qml

@@ -25,10 +25,10 @@ import Fancontrol.Qml 1.0 as Fancontrol
 
 
 Item {
-    property QtObject loader: Fancontrol.base.loader
-    property QtObject systemdCom: Fancontrol.base.hasSystemdCommunicator() ? Fancontrol.base.systemdCom : null
-    property QtObject pwmFanModel: Fancontrol.base.pwmFanModel
-    property QtObject tempModel: Fancontrol.base.tempModel
+    property QtObject loader: Fancontrol.Base.loader
+    property QtObject systemdCom: Fancontrol.Base.hasSystemdCommunicator() ? Fancontrol.Base.systemdCom : null
+    property QtObject pwmFanModel: Fancontrol.Base.pwmFanModel
+    property QtObject tempModel: Fancontrol.Base.tempModel
     property var pwmFans: pwmFanModel.fans
 
     id: root

fancontrol-gui/package/contents/ui/SensorsTab.qml

@@ -28,7 +28,7 @@ RowLayout {
     id: root
 
     property int padding: 10
-    property QtObject loader: Fancontrol.base.loader
+    property QtObject loader: Fancontrol.Base.loader
 
     anchors.fill: parent
     anchors.margins: 10
@@ -97,7 +97,7 @@ RowLayout {
                             id: tempValue
                             anchors.right: parent.right
                             anchors.rightMargin: root.padding
-                            text: Units.fromCelsius(hwmon.temps[index].value, Fancontrol.base.unit) + " " + i18n(Fancontrol.base.unit)
+                            text: Units.fromCelsius(hwmon.temps[index].value, Fancontrol.Base.unit) + " " + i18n(Fancontrol.Base.unit)
                         }
                     }
                 }

fancontrol-gui/package/contents/ui/SettingsTab.qml

@@ -26,8 +26,8 @@ import Fancontrol.Qml 1.0 as Fancontrol
 
 
 Item {
-    property QtObject systemdCom: Fancontrol.base.hasSystemdCommunicator() ? Fancontrol.base.systemdCom : null
-    property QtObject loader: Fancontrol.base.loader
+    property QtObject systemdCom: Fancontrol.Base.hasSystemdCommunicator() ? Fancontrol.Base.systemdCom : null
+    property QtObject loader: Fancontrol.Base.loader
     property int padding: 10
     property real textWidth: 0
     property var locale: Qt.locale()
@@ -85,17 +85,17 @@ Item {
                 Layout.fillWidth: true
                 decimals: 2
                 maximumValue: Number.POSITIVE_INFINITY
-                minimumValue: Fancontrol.Units.fromKelvin(0, Fancontrol.base.unit)
-                value: Fancontrol.Units.fromCelsius(Fancontrol.base.minTemp, Fancontrol.base.unit)
-                suffix: Fancontrol.base.unit
+                minimumValue: Fancontrol.Units.fromKelvin(0, Fancontrol.Base.unit)
+                value: Fancontrol.Units.fromCelsius(Fancontrol.Base.minTemp, Fancontrol.Base.unit)
+                suffix: Fancontrol.Base.unit
                 onValueChanged: {
-                    Fancontrol.base.minTemp = Fancontrol.Units.toCelsius(value, Fancontrol.base.unit);
+                    Fancontrol.Base.minTemp = Fancontrol.Units.toCelsius(value, Fancontrol.Base.unit);
                     if (value > maxTempBox.value) maxTempBox.value = value;
                 }
 
                 Connections {
-                    target: Fancontrol.base
-                    onMinTempChanged: if (Fancontrol.base.minTemp != minTempBox.value) minTempBox.value = Fancontrol.base.minTemp
+                    target: Fancontrol.Base
+                    onMinTempChanged: if (Fancontrol.Base.minTemp != minTempBox.value) minTempBox.value = Fancontrol.Base.minTemp
                 }
             }
         }
@@ -116,17 +116,17 @@ Item {
                 Layout.fillWidth: true
                 decimals: 2
                 maximumValue: Number.POSITIVE_INFINITY
-                minimumValue: Fancontrol.Units.fromKelvin(0, Fancontrol.base.unit)
-                value: Fancontrol.Units.fromCelsius(Fancontrol.base.maxTemp, Fancontrol.base.unit)
-                suffix: Fancontrol.base.unit
+                minimumValue: Fancontrol.Units.fromKelvin(0, Fancontrol.Base.unit)
+                value: Fancontrol.Units.fromCelsius(Fancontrol.Base.maxTemp, Fancontrol.Base.unit)
+                suffix: Fancontrol.Base.unit
                 onValueChanged: {
-                    Fancontrol.base.maxTemp = Fancontrol.Units.toCelsius(value, Fancontrol.base.unit);
+                    Fancontrol.Base.maxTemp = Fancontrol.Units.toCelsius(value, Fancontrol.Base.unit);
                     if (value < minTempBox.value) minTempBox.value = value;
                 }
 
                 Connections {
-                    target: Fancontrol.base
-                    onMaxTempChanged: if (Fancontrol.base.maxTemp != maxTempBox.value) maxTempBox.value = Fancontrol.base.maxTemp
+                    target: Fancontrol.Base
+                    onMaxTempChanged: if (Fancontrol.Base.maxTemp != maxTempBox.value) maxTempBox.value = Fancontrol.Base.maxTemp
                 }
             }
         }
@@ -144,8 +144,8 @@ Item {
                 id: fileInput
 
                 Layout.fillWidth: true
-                value: Fancontrol.base.configUrl.toString().replace("file://", "")
-                onTextChanged: Fancontrol.base.configUrl = text;
+                value: Fancontrol.Base.configUrl.toString().replace("file://", "")
+                onTextChanged: Fancontrol.Base.configUrl = text;
             }
             Button {
                 iconName: "document-open"
@@ -171,8 +171,8 @@ Item {
                     Layout.minimumWidth: implicitWidth
                     Layout.fillWidth: true
                     color: !!systemdCom && systemdCom.serviceExists ? "green" : "red"
-                    value: Fancontrol.base.serviceName
-                    onTextChanged: Fancontrol.base.serviceName = text
+                    value: Fancontrol.Base.serviceName
+                    onTextChanged: Fancontrol.Base.serviceName = text
                 }
             }
         }

import/qml/ErrorDialog.qml

@@ -39,9 +39,9 @@ Dialog {
     }
     
     Connections {
-        target: Fancontrol.base
+        target: Fancontrol.Base
         onCriticalError: {
-            text.text = Fancontrol.base.error;
+            text.text = Fancontrol.Base.error;
             dialog.open();
         }
     }

import/qml/FanItem.qml

@@ -31,10 +31,10 @@ Rectangle {
     property QtObject fan
     property QtObject systemdCom
     property QtObject tempModel
-    property real minTemp: Fancontrol.base.minTemp
-    property real maxTemp: Fancontrol.base.maxTemp
+    property real minTemp: Fancontrol.Base.minTemp
+    property real maxTemp: Fancontrol.Base.maxTemp
     property int margin: 5
-    property string unit: Fancontrol.base.unit
+    property string unit: Fancontrol.Base.unit
     property real convertedMinTemp: Units.fromCelsius(minTemp, unit)
     property real convertedMaxTemp: Units.fromCelsius(maxTemp, unit)
 

import/qml/PwmPoint.qml

@@ -35,7 +35,7 @@ Rectangle {
     property int pwm: 0
     property alias drag: pwmMouse.drag
     property int size: 10
-    property string unit: Fancontrol.base.unit
+    property string unit: Fancontrol.Base.unit
     property var locale: Qt.locale()
 
     signal positionChanged()

import/qml/StatusPoint.qml

@@ -37,7 +37,7 @@ Rectangle {
     readonly property real centerY: y + height / 2
     readonly property point center: Qt.point(centerX, centerY)
     property int size: 10
-    property string unit: Fancontrol.base.unit
+    property string unit: Fancontrol.Base.unit
 
     width: size
     height: size

import/src/fancontrolqmlextension.cpp

@@ -52,7 +52,7 @@ void FancontrolQmlExtension::registerTypes(const char* uri)
     qmlRegisterType<SystemdCommunicator>();
 #endif
 
-    qmlRegisterSingletonType<GUIBase>(uri, 1, 0, "base", base);
+    qmlRegisterSingletonType<GUIBase>(uri, 1, 0, "Base", base);
 }
 
 QObject * FancontrolQmlExtension::base(QQmlEngine *engine, QJSEngine *jsengine)

kcm/package/contents/ui/KCM.qml

@@ -27,10 +27,10 @@ import Fancontrol.Qml 1.0 as Fancontrol
 
 
 Item {
-    property QtObject loader: Fancontrol.base.loader
-    property QtObject systemdCom: Fancontrol.base.systemdCom
-    property QtObject pwmFanModel: Fancontrol.base.pwmFanModel
-    property QtObject tempModel: Fancontrol.base.tempModel
+    property QtObject loader: Fancontrol.Base.loader
+    property QtObject systemdCom: Fancontrol.Base.systemdCom
+    property QtObject pwmFanModel: Fancontrol.Base.pwmFanModel
+    property QtObject tempModel: Fancontrol.Base.tempModel
     property var locale: Qt.locale()
     property real textWidth: 0
     property var pwmFans: pwmFanModel.fans
@@ -40,17 +40,17 @@ Item {
     implicitHeight: 768
 
     Connections {
-        target: Fancontrol.base
-        onNeedsApplyChanged: kcm.needsSave = Fancontrol.base.needsApply
+        target: Fancontrol.Base
+        onNeedsApplyChanged: kcm.needsSave = Fancontrol.Base.needsApply
     }
 
     Connections {
         target: kcm
         onAboutToSave: {
-            Fancontrol.base.apply();
+            Fancontrol.Base.apply();
         }
         onAboutToLoad: {
-            Fancontrol.base.load();
+            Fancontrol.Base.load();
             enabledBox.checked = systemdCom.serviceActive;
         }
         onAboutToDefault: enabledBox.checked = false
@@ -148,12 +148,12 @@ Item {
             Layout.fillHeight: true
             active: pwmFans.length > fanComboBox.currentIndex && fanComboBox.currentIndex >= 0
             sourceComponent: Fancontrol.FanItem {
-                unit: Fancontrol.base.unit
+                unit: Fancontrol.Base.unit
                 fan: pwmFans[fanComboBox.currentIndex]
                 systemdCom: root.systemdCom
                 tempModel: root.tempModel
-                minTemp: Fancontrol.base.minTemp
-                maxTemp: Fancontrol.base.maxTemp
+                minTemp: Fancontrol.Base.minTemp
+                maxTemp: Fancontrol.Base.maxTemp
             }
         }
     }
@@ -258,10 +258,10 @@ Item {
                 Layout.fillWidth: true
                 decimals: 2
                 maximumValue: maxTempBox.value
-                minimumValue: Units.fromKelvin(0, Fancontrol.base.unit)
-                value: Units.fromCelsius(Fancontrol.base.minTemp, Fancontrol.base.unit)
-                suffix: Fancontrol.base.unit
-                onValueChanged: Fancontrol.base.minTemp = Units.toCelsius(value, Fancontrol.base.unit)
+                minimumValue: Units.fromKelvin(0, Fancontrol.Base.unit)
+                value: Units.fromCelsius(Fancontrol.Base.minTemp, Fancontrol.Base.unit)
+                suffix: Fancontrol.Base.unit
+                onValueChanged: Fancontrol.Base.minTemp = Units.toCelsius(value, Fancontrol.Base.unit)
             }
         }
         RowLayout {
@@ -281,9 +281,9 @@ Item {
                 decimals: 2
                 maximumValue: Number.POSITIVE_INFINITY
                 minimumValue: minTempBox.value
-                value: Units.fromCelsius(Fancontrol.base.maxTemp, Fancontrol.base.unit)
-                suffix: Fancontrol.base.unit
-                onValueChanged: Fancontrol.base.maxTemp = Units.toCelsius(value, Fancontrol.base.unit)
+                value: Units.fromCelsius(Fancontrol.Base.maxTemp, Fancontrol.Base.unit)
+                suffix: Fancontrol.Base.unit
+                onValueChanged: Fancontrol.Base.maxTemp = Units.toCelsius(value, Fancontrol.Base.unit)
             }
         }
         RowLayout {
@@ -300,8 +300,8 @@ Item {
                 Layout.minimumWidth: implicitWidth
                 Layout.fillWidth: true
                 color: systemdCom.serviceExists ? "green" : "red"
-                value: Fancontrol.base.serviceName
-                onTextChanged: Fancontrol.base.serviceName = text
+                value: Fancontrol.Base.serviceName
+                onTextChanged: Fancontrol.Base.serviceName = text
             }
         }
         RowLayout {
@@ -317,9 +317,9 @@ Item {
             Fancontrol.OptionInput {
                 Layout.minimumWidth: implicitWidth
                 Layout.fillWidth: true
-                value: Fancontrol.base.configUrl.toString().replace("file://", "")
-                color: Fancontrol.base.configValid ? "green" : "red"
-                onTextChanged: Fancontrol.base.configUrl = text
+                value: Fancontrol.Base.configUrl.toString().replace("file://", "")
+                color: Fancontrol.Base.configValid ? "green" : "red"
+                onTextChanged: Fancontrol.Base.configUrl = text
             }
             Button {
                 action: loadAction
@@ -342,7 +342,7 @@ Item {
         selectExisting: true
         selectMultiple: false
 
-        onAccepted: Fancontrol.base.configUrl = fileUrl;
+        onAccepted: Fancontrol.Base.configUrl = fileUrl;
     }
 
     Fancontrol.ErrorDialog {