瀏覽代碼

cleaned up fan changes in PwmFan.qml

Maldela 9 年之前
父節點
當前提交
6d87c49a8e
共有 1 個文件被更改,包括 21 次插入4 次删除
  1. 21 4
      package/contents/ui/PwmFan.qml

+ 21 - 4
package/contents/ui/PwmFan.qml

@@ -47,7 +47,6 @@ Rectangle {
     onMinTempChanged: if (!!fan) meshCanvas.requestPaint()
     onMaxTempChanged: if (!!fan) meshCanvas.requestPaint()
     onUnitChanged: if (!!fan) meshCanvas.requestRepaint()
-    onFanChanged: if (!!fan && fan.hasTemp) tempBox.currentIndex = tempModel.temps.indexOf(fan.temp)
 
     SystemPalette {
         id: palette
@@ -211,7 +210,8 @@ Rectangle {
                     if (fanOffCheckBox.checked) {
                         c.moveTo(stopPoint.centerX, height);
                     } else {
-                        c.moveTo(0, stopPoint.centerY);
+                        c.moveTo(0, scaleY(fan.minPwm));
+                        c.lineTo(stopPoint.centerX, scaleY(fan.minPwm));
                     }
                     c.lineTo(stopPoint.centerX, stopPoint.centerY);
                     c.lineTo(maxPoint.centerX, maxPoint.centerY);
@@ -362,9 +362,13 @@ Rectangle {
                     }
                 }
 
+                Connections {
+                    target: root
+                    onFanChanged: hasTempCheckBox.checked = !!fan ? fan.hasTemp : false
+                }
                 Connections {
                     target: fan
-                    onHasTempChanged: hasTempCheckBox.checked = Qt.binding(function() { return !!fan ? fan.hasTemp : null })
+                    onHasTempChanged: hasTempCheckBox.checked = fan.hasTemp
                 }
             }
             RowLayout {
@@ -379,6 +383,15 @@ Rectangle {
                             fan.temp = tempModel.temps[currentIndex];
                     }
                 }
+
+                Connections {
+                    target: root
+                    onFanChanged: if (!!fan && fan.hasTemp) tempBox.currentIndex = tempModel.temps.indexOf(fan.temp)
+                }
+                Connections {
+                    target: fan
+                    onTempChanged: if (fan.hasTemp) tempBox.currentIndex = tempModel.temps.indexOf(fan.temp)
+                }
             }
         }
 
@@ -394,9 +407,13 @@ Rectangle {
                 }
             }
 
+            Connections {
+                target: root
+                onFanChanged: if (!!fan) fanOffCheckBox.checked = fan.minPwm == 0
+            }
             Connections {
                 target: fan
-                onMinPwmChanged: fanOffCheckBox.checked = Qt.binding(function() { return !!fan ? fan.minPwm == 0 : false })
+                onMinPwmChanged: fanOffCheckBox.checked = fan.minPwm == 0
             }
         }