瀏覽代碼

fixed some naming issues

Malte Veerman 10 年之前
父節點
當前提交
c8233f918c
共有 3 個文件被更改,包括 3 次插入5 次删除
  1. 1 1
      share/qml/SensorsTab.qml
  2. 0 1
      share/src/hwmon.cpp
  3. 2 3
      share/src/sensors.cpp

+ 1 - 1
share/qml/SensorsTab.qml

@@ -81,7 +81,7 @@ RowLayout {
                         Text {
                             anchors.left: parent.left
                             anchors.leftMargin: padding
-                            text: hwmon.temps[index].label + ": "
+                            text: hwmon.temps[index].name + ": "
                             Layout.maximumWidth: parent.width - tempValue.width - padding*2
                             clip: true
                         }

+ 0 - 1
share/src/hwmon.cpp

@@ -44,7 +44,6 @@ Hwmon::Hwmon(const QString &path, Loader *parent) : QObject(parent)
             if (QFile::exists(m_path + "/pwm" + QString::number(index)))
             {
                 PwmFan *newPwmFan = new PwmFan(this, index);
-                newPwmFan->setName(m_name + "/pwm" + QString::number(index));
                 connect(this, SIGNAL(sensorsUpdateNeeded()), newPwmFan, SLOT(update()));
                 m_pwmFans << newPwmFan;
                 emit pwmFansChanged();

+ 2 - 3
share/src/sensors.cpp

@@ -40,8 +40,6 @@ Fan::Fan(Hwmon *parent, uint index) : Sensor(parent, index)
         {
             m_rpmStream.setDevice(rpmFile);
             m_rpmStream >> m_rpm;
-
-            setName("fan"+ QString::number(index));
         }
         else
         {
@@ -64,7 +62,8 @@ void Fan::setName(const QString &name)
 {
     KConfigGroup names = m_config->group("names");
     KConfigGroup localNames = names.group(m_parent->name());
-    if (name != localNames.readEntry("fan" + QString::number(m_index), QString()))
+    if (name != localNames.readEntry("fan" + QString::number(m_index), QString())
+        && !name.isEmpty())
     {
         localNames.writeEntry("fan" + QString::number(m_index), name);
         emit nameChanged();