Selaa lähdekoodia

Some minor improvements

Malte Veerman 6 vuotta sitten
vanhempi
commit
8583efffcf

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

@@ -31,7 +31,7 @@ Kirigami.ScrollablePage {
     readonly property QtObject loader: Fancontrol.Base.loader
 
     header: Label {
-        text: !!loader && loader.configEqualToLoadedFile ? loader.configPath : i18n("New config")
+        text: !!loader && loader.needsSave ? i18n("New config") : loader.configPath
     }
 
     TextEdit {

+ 7 - 14
fancontrol-gui/package/contents/ui/SensorsTab.qml

@@ -43,12 +43,11 @@ Kirigami.ScrollablePage {
         model: loader.hwmons.length
 
         delegate: Rectangle {
-            property QtObject hwmon: loader.hwmons[index]
+            readonly property QtObject hwmon: loader.hwmons[index]
 
             height: childrenRect.height
             width: listView.width - listView.spacing * 2
             x: listView.spacing
-            clip: true
             color: Kirigami.Theme.backgroundColor
 
             Column {
@@ -71,17 +70,14 @@ Kirigami.ScrollablePage {
                         width: parent.width - parent.padding * 2
 
                         Label {
-                            anchors.leftMargin: root.spacing
-                            Layout.maximumWidth: parent.width - rpmValue.width - root.spacing*2
                             Layout.alignment: Qt.AlignLeft
-                            clip: true
-                            text: "Fan " + (index+1) + ":"
+                            text: i18n("Fan %1:", index+1)
                         }
                         Label {
                             id: rpmValue
+
                             Layout.alignment: Qt.AlignRight
-                            anchors.rightMargin: root.spacing
-                            text: hwmon.fans[index].rpm + " " + i18n("rpm")
+                            text: i18n("%1 rpm", hwmon.fans[index].rpm)
                         }
                     }
                 }
@@ -92,17 +88,14 @@ Kirigami.ScrollablePage {
                         width: parent.width - parent.padding * 2
 
                         Label {
-                            anchors.leftMargin: root.spacing
-                            text: hwmon.temps[index].name + ": "
-                            Layout.maximumWidth: parent.width - tempValue.width - root.spacing*2
+                            text: i18n("%1:", hwmon.temps[index].name)
                             Layout.alignment: Qt.AlignLeft
-                            clip: true
                         }
                         Label {
                             id: tempValue
+
+                            text: Units.fromCelsius(hwmon.temps[index].value, Fancontrol.Base.unit) + i18n(Fancontrol.Base.unit)
                             Layout.alignment: Qt.AlignRight
-                            anchors.rightMargin: root.spacing
-                            text: Units.fromCelsius(hwmon.temps[index].value, Fancontrol.Base.unit) + " " + i18n(Fancontrol.Base.unit)
                         }
                     }
                 }

+ 0 - 1
import/qml/FanControls.qml

@@ -31,7 +31,6 @@ ColumnLayout {
     property QtObject fan
     readonly property QtObject tempModel: Fancontrol.Base.tempModel
 
-    clip: true
     spacing: 2
 
     RowLayout {

+ 1 - 0
import/qml/SettingsForm.qml

@@ -163,6 +163,7 @@ Kirigami.FormLayout {
 
     FileDialog {
         id: openFileDialog
+
         title: i18n("Please choose a configuration file")
         folder: "file:///etc"
         selectExisting: true

+ 0 - 1
kcm/package/contents/ui/KCM.qml

@@ -119,7 +119,6 @@ Kirigami.Page {
 
             anchors.fill: parent
             anchors.margins: fansListViewBackground.border.width
-            clip: true
             boundsBehavior: Flickable.StopAtBounds
             flickableDirection: Flickable.AutoFlickIfNeeded
             model: pwmFanModel