Malte Veerman 10 gadi atpakaļ
vecāks
revīzija
01ce2fe070

+ 2 - 0
kcm/src/fancontrolkcm.cpp

@@ -50,6 +50,8 @@ FancontrolKCM::FancontrolKCM(QObject *parent, const QVariantList& args)
     setAuthActionName("fancontrol.gui.helper.action");
     
     connect(m_base->loader(), &Loader::configFileChanged, [this] () { setNeedsSave(true); });
+    
+    qmlRegisterType<GUIBase>();
 }
 
 void FancontrolKCM::save()

+ 1 - 1
kcm/src/fancontrolkcm.h

@@ -39,7 +39,7 @@ public:
     
     explicit FancontrolKCM(QObject *parent, const QVariantList &args = QVariantList());
     
-    QUIBase *base() const { return m_base; }
+    GUIBase *base() const { return m_base; }
     
     
 public slots:

+ 1 - 1
lib/src/loader.cpp

@@ -65,7 +65,7 @@ void Loader::parseHwmons()
     {
         Hwmon *hwmon = new Hwmon(QFile::symLinkTarget(hwmonDir.absoluteFilePath(hwmonPath)), this);
         connect(hwmon, SIGNAL(configUpdateNeeded()), this, SLOT(createConfigFile()));
-	connect(hwmon, SIGNAL(pwmFansChanged()), this, SLOT(emitAllPwmFansChanged()));
+        connect(hwmon, SIGNAL(pwmFansChanged()), this, SLOT(emitAllPwmFansChanged()));
         connect(this, SIGNAL(sensorsUpdateNeeded()), hwmon, SLOT(updateSensors()));
         m_hwmons << hwmon;
     }

+ 3 - 17
package/contents/ui/KCM.qml

@@ -23,10 +23,6 @@ import QtQuick.Controls 1.3
 import org.kde.kcm 1.0
 
 TabView {
-    property real minTemp: 30.0
-    property real maxTemp: 90.0
-    property string unit: "Celsius"
-
     id: tabView
     frameVisible: true
     implicitHeight: 480
@@ -41,11 +37,8 @@ TabView {
     Tab {
         title: i18n("PwmFans")
         PwmFansTab {
-            size: 1
-            minTemp: tabView.minTemp
-            maxTemp: tabView.maxTemp
-            unit: tabView.unit
-            loader: kcm.base.loader
+            size: 0.5
+            baseObject: kcm.base
         }
     }
     Tab {
@@ -57,14 +50,7 @@ TabView {
     Tab {
         title: i18n("Settings")
         SettingsTab {
-            id: settingsTab
-            minTemp: tabView.minTemp
-            maxTemp: tabView.maxTemp
-            onMinTempChanged: tabView.minTemp = minTemp
-            onMaxTempChanged: tabView.maxTemp = maxTemp
-            onUnitChanged: tabView.unit = unit
-            loader: kcm.base.loader
-            systemdCom: kcm.base.hasSystemdCommunicator() ? kcm.base.systemdCom : null
+            baseObject: kcm.base
         }
     }