فهرست منبع

moved allPwmFans from avascript to loader
removed KAuth namespace from loader
added import of QtQuick.Controls to ToolTip.qml

Malte Veerman 10 سال پیش
والد
کامیت
f38582ad0d
5فایلهای تغییر یافته به همراه23 افزوده شده و 17 حذف شده
  1. 16 6
      lib/src/loader.cpp
  2. 5 0
      lib/src/loader.h
  3. 0 10
      package/contents/scripts/arrayfunctions.js
  4. 1 1
      package/contents/ui/PwmFansTab.qml
  5. 1 0
      package/contents/ui/ToolTip.qml

+ 16 - 6
lib/src/loader.cpp

@@ -26,8 +26,6 @@
 
 #include <KF5/KAuth/kauthexecutejob.h>
 
-using namespace KAuth;
-
 #define HWMON_PATH "/sys/class/hwmon"
 
 Loader::Loader(QObject *parent) : QObject(parent)
@@ -68,10 +66,12 @@ 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(this, SIGNAL(sensorsUpdateNeeded()), hwmon, SLOT(updateSensors()));
         m_hwmons << hwmon;
     }
     emit hwmonsChanged();
+    emit allPwmFansChanged();
 }
 
 void Loader::load(const QUrl &url)
@@ -98,13 +98,13 @@ void Loader::load(const QUrl &url)
     }
     else if (file.exists())
     {
-        Action action("fancontrol.gui.helper.action");
+        KAuth::Action action("fancontrol.gui.helper.action");
         action.setHelperId("fancontrol.gui.helper");
         QVariantMap map;
         map["action"] = "read";
         map["filename"] = fileName;
         action.setArguments(map);
-        ExecuteJob *reply = action.execute();
+        KAuth::ExecuteJob *reply = action.execute();
         if (!reply->exec())
         {
             m_error = reply->errorString();
@@ -295,7 +295,7 @@ void Loader::save(const QUrl &url)
     }
     else
     {
-        Action action("fancontrol.gui.helper.action");
+        KAuth::Action action("fancontrol.gui.helper.action");
         action.setHelperId("fancontrol.gui.helper");
 
         QVariantMap map;
@@ -304,7 +304,7 @@ void Loader::save(const QUrl &url)
         map["content"] = m_configFile;
 
         action.setArguments(map);
-        ExecuteJob *reply = action.execute();
+        KAuth::ExecuteJob *reply = action.execute();
 
         if (!reply->exec())
         {
@@ -449,3 +449,13 @@ QList<QObject *> Loader::hwmons() const
     }
     return list;
 }
+
+QList< QObject* > Loader::allPwmFans() const
+{
+    QList<QObject *> list;
+    foreach (const Hwmon *hwmon, m_hwmons)
+    {
+        list += hwmon->pwmFans();
+    }
+    return list;
+}

+ 5 - 0
lib/src/loader.h

@@ -35,6 +35,7 @@ class FANCONTROL_GUI_LIB_EXPORT Loader : public QObject
     Q_PROPERTY(QUrl configUrl READ configUrl NOTIFY configUrlChanged)
     Q_PROPERTY(QString configFile READ configFile NOTIFY configFileChanged)
     Q_PROPERTY(QList<QObject *> hwmons READ hwmons NOTIFY hwmonsChanged)
+    Q_PROPERTY(QList<QObject *> allPwmFans READ allPwmFans NOTIFY allPwmFansChanged)
     Q_PROPERTY(int interval READ interval WRITE setInterval NOTIFY intervalChanged)
     Q_PROPERTY(QString error READ error NOTIFY errorChanged)
     
@@ -50,6 +51,7 @@ public:
     QUrl configUrl() const { return m_configUrl; }
     QString configFile() const { return m_configFile; }
     QList<QObject *> hwmons() const;
+    QList<QObject *> allPwmFans() const;
     int interval() { return m_interval; }
     void setInterval(int interval) { if (interval != m_interval) { m_interval = interval; emit intervalChanged(m_interval*1000); createConfigFile(); } }
     Hwmon * hwmon(int i) { return m_hwmons.value(i, Q_NULLPTR); }
@@ -58,6 +60,7 @@ public:
     static int getHwmonNumber(const QString &str) { return str.split('/').value(0).remove("hwmon").toInt(); }
     static int getSensorNumber(const QString &str) { return str.split('/').value(1).remove(QRegExp("pwm|fan|temp|_input")).toInt() - 1; }
 
+    
 public slots:
 
     void updateSensors() { emit sensorsUpdateNeeded(); }
@@ -66,6 +69,7 @@ public slots:
 protected slots:
 
     void createConfigFile();
+    void emitAllPwmFansChanged() { emit allPwmFansChanged(); }
 
 
 protected:
@@ -87,6 +91,7 @@ signals:
     void intervalChanged(int);
     void errorChanged();
     void sensorsUpdateNeeded();
+    void allPwmFansChanged();
 };
 
 #endif // LOADER_H

+ 0 - 10
package/contents/scripts/arrayfunctions.js

@@ -33,16 +33,6 @@ function labels(array) {
     return labels;
 }
 
-function allPwmFans(hwmons) {
-    var pwmFans = [];
-    for (var i=0; i<hwmons.length; i++) {
-        for (var j=0; j<hwmons[i].pwmFans.length; j++) {
-            pwmFans[pwmFans.length] = hwmons[i].pwmFans[j];
-        }
-    }
-    return pwmFans;
-}
-
 function maxProperty(array, prop) {
     var max = 0;
     for (var i=0; i<array.length; i++) {

+ 1 - 1
package/contents/ui/PwmFansTab.qml

@@ -44,7 +44,7 @@ ScrollView {
         }
 
         Repeater {
-            property var fans: loader ? ArrayFunctions.allPwmFans(loader.hwmons) : []
+            property var fans: loader ? loader.allPwmFans : []
 
             id: repeater
             model: fans.length

+ 1 - 0
package/contents/ui/ToolTip.qml

@@ -18,6 +18,7 @@
  */
 
 import QtQuick 2.4
+import QtQuick.Controls 1.4
 import "../scripts/coordinates.js" as Coordinates
 
 Rectangle {