diff --git a/kcms/nightcolor/package/contents/ui/TimingsView.qml b/kcms/nightcolor/package/contents/ui/TimingsView.qml --- a/kcms/nightcolor/package/contents/ui/TimingsView.qml +++ b/kcms/nightcolor/package/contents/ui/TimingsView.qml @@ -34,30 +34,30 @@ } TimeField { - id: mornBeginField - Kirigami.FormData.label: i18n("Sunrise begins:") - backend: morningTimings.begin + id: evenBeginField + Kirigami.FormData.label: i18n("Turn on at:") + backend: eveningTimings.begin enabled: false } TimeField { - id: mornEndField - Kirigami.FormData.label: i18n("...and ends:") - backend: morningTimings.end + id: evenEndField + Kirigami.FormData.label: i18n("Fully on by:") + backend: eveningTimings.end enabled: false } TimeField { - id: evenBeginField - Kirigami.FormData.label: i18n("Sunset begins:") - backend: eveningTimings.begin + id: mornBeginField + Kirigami.FormData.label: i18n("Turn off at:") + backend: morningTimings.begin enabled: false } TimeField { - id: evenEndField - Kirigami.FormData.label: i18n("...and ends:") - backend: eveningTimings.end + id: mornEndField + Kirigami.FormData.label: i18n("Fully off by:") + backend: morningTimings.end enabled: false } } diff --git a/kcms/nightcolor/package/contents/ui/main.qml b/kcms/nightcolor/package/contents/ui/main.qml --- a/kcms/nightcolor/package/contents/ui/main.qml +++ b/kcms/nightcolor/package/contents/ui/main.qml @@ -27,7 +27,8 @@ id: root property int error: cA.error property bool defaultRequested: false - implicitHeight: Kirigami.Units.gridUnit * 29 + implicitHeight: Kirigami.Units.gridUnit * 32 + implicitWidth: Kirigami.Units.gridUnit * 35 CC.CompositorAdaptor { id: cA @@ -108,7 +109,7 @@ Layout.alignment: Qt.AlignHCenter Layout.maximumWidth: Math.round(root.width * 0.5) - text: i18n("Night Color makes the colors on the screen warmer to reduce eye strain.") + text: i18n("To reduce eye strain, Night Color makes the colors on the screen warmer at the time of your choosing.") wrapMode: Text.WordWrap } @@ -176,13 +177,15 @@ QQC2.ComboBox { id: modeSwitcher - Kirigami.FormData.label: i18n("Operation mode:") + // Work around https://bugs.kde.org/show_bug.cgi?id=403153 + Layout.minimumWidth: Kirigami.Units.gridUnit * 17 + Kirigami.FormData.label: i18n("Activation:") enabled: activator.checked model: [ - i18n("Automatic"), - i18n("Location"), - i18n("Times"), - i18n("Constant") + i18n("Sunset/sunrise (current location)"), + i18n("Sunset/sunrise (manual location)"), + i18n("Manual times"), + i18n("Always on") ] currentIndex: cA.mode onCurrentIndexChanged: { @@ -193,6 +196,10 @@ } } + Item { + implicitHeight: Kirigami.Units.gridUnit + } + Kirigami.FormLayout { Loader { @@ -295,28 +302,28 @@ } TimeField { - id: mornBeginManField - Kirigami.FormData.label: i18n("Sunrise begins:") - backend: cA.morningBeginFixedStaged - onBackendChanged: {cA.morningBeginFixedStaged = backend; + id: evenBeginManField + Kirigami.FormData.label: i18n("Turn on at:") + backend: cA.eveningBeginFixedStaged + onBackendChanged: {cA.eveningBeginFixedStaged = backend; calcNeedsSave(); } QQC2.ToolTip { - text: i18n("(Input format: HH:MM)") + text: i18n("Input format: HH:MM") } } TimeField { - id: evenBeginManField - Kirigami.FormData.label: i18n("Sunset begins:") - backend: cA.eveningBeginFixedStaged - onBackendChanged: {cA.eveningBeginFixedStaged = backend; + id: mornBeginManField + Kirigami.FormData.label: i18n("Turn off at:") + backend: cA.morningBeginFixedStaged + onBackendChanged: {cA.morningBeginFixedStaged = backend; calcNeedsSave(); } QQC2.ToolTip { - text: i18n("Input format: HH:MM") + text: i18n("(Input format: HH:MM)") } }