Differential D21056 Diff 57745 applets/systemloadviewer/package/contents/ui/ColorSettings.qml

Changeset View

Standalone View

View Options

applets/systemloadviewer/package/contents/ui/ColorSettings.qml

1/* 1​/*
2 * Copyright (C) 2014 Martin Yrjölä <martin.yrjola@gmail.com> 2​ * Copyright (C) 2014 Martin Yrjölä <martin.yrjola@gmail.com>
3​ * Copyright (C) 2019 Nate Graham <nate@kde.org>
3 * 4​ *
4 * This program is free software; you can redistribute it and/or 5​ * This program is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU General Public License as 6​ * modify it under the terms of the GNU General Public License as
6 * published by the Free Software Foundation; either version 2 of 7​ * published by the Free Software Foundation; either version 2 of
7 * the License or (at your option) version 3 or any later version 8​ * the License or (at your option) version 3 or any later version
8 * accepted by the membership of KDE e.V. (or its successor approved 9​ * accepted by the membership of KDE e.V. (or its successor approved
9 * by the membership of KDE e.V.), which shall act as a proxy 10​ * by the membership of KDE e.V.), which shall act as a proxy
10 * defined in Section 14 of version 3 of the license. 11​ * defined in Section 14 of version 3 of the license.
11 * 12​ *
12 * This program is distributed in the hope that it will be useful, 13​ * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14​ * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15​ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details. 16​ * GNU General Public License for more details.
16 * 17​ *
17 * You should have received a copy of the GNU General Public License 18​ * You should have received a copy of the GNU General Public License
18 * along with this program. If not, see <http://www.gnu.org/licenses/> 19​ * along with this program. If not, see <http://www.gnu.org/licenses/>
19 */ 20​ */
20 21​
21import QtQuick 2.2 22​import QtQuick 2.5
22import QtQuick.Controls 1.2 23​import QtQuick.Controls 2.5 as QQC2
23import QtQuick.Layouts 1.0 24​
filipfUnsubmitted
Done

Don't need the import anymore

filipf: Don't need the import anymore
25​import org.kde.kirigami 2.5 as Kirigami
24import org.kde.kquickcontrols 2.0 as KQuickControls 26​import org.kde.kquickcontrols 2.0 as KQuickControls
25 27​
26ColumnLayout { 28​Kirigami.FormLayout {
27 id: colorSettings 29​ id: colorSettings
28 30​
29 property alias cfg_memApplicationColor: memApplicationColorPicker.color 31​ property alias cfg_memApplicationColor: memApplicationColorPicker.color
30 property alias cfg_memBuffersColor: memBuffersColorPicker.color 32​ property alias cfg_memBuffersColor: memBuffersColorPicker.color
31 property alias cfg_cpuUserColor: cpuUserColorPicker.color 33​ property alias cfg_cpuUserColor: cpuUserColorPicker.color
32 property alias cfg_cpuIOWaitColor: cpuIOWaitColorPicker.color 34​ property alias cfg_cpuIOWaitColor: cpuIOWaitColorPicker.color
33 property alias cfg_cpuSysColor: cpuSysColorPicker.color 35​ property alias cfg_cpuSysColor: cpuSysColorPicker.color
34 property alias cfg_cpuNiceColor: cpuNiceColorPicker.color 36​ property alias cfg_cpuNiceColor: cpuNiceColorPicker.color
35 property alias cfg_swapUsedColor: swapUsedColorPicker.color 37​ property alias cfg_swapUsedColor: swapUsedColorPicker.color
36 property alias cfg_cacheDirtyColor: cacheDirtyColorPicker.color 38​ property alias cfg_cacheDirtyColor: cacheDirtyColorPicker.color
37 property alias cfg_cacheWritebackColor: cacheWritebackColorPicker.color 39​ property alias cfg_cacheWritebackColor: cacheWritebackColorPicker.color
38 property alias cfg_setColorsManually: setColorsManuallyGroupBox.checked 40​ property alias cfg_setColorsManually: setColorsManually.checked
39 ​
40 GroupBox { ​
41 id: setColorsManuallyGroupBox ​
42 Layout.fillWidth: true ​
43 flat: true ​
44 ​
45 title: i18nc("@option:check", "Set Colors Manually") ​
46 checkable: true ​
47 ​
48 GridLayout { ​
49 columns: 2 ​
50 41​
filipfUnsubmitted
Done

To better align the checkbox in this layout with the other layout you can set twinFormLayouts so the first one points to the second one and get:

Or you could go all the way and also make the second one point to the first one and get:

Personally I like solution no.1 more.

filipf: To better align the checkbox in this layout with the other layout you can set `twinFormLayouts`…
51 Label { 42​ QQC2.CheckBox {
52 text: i18nc("@title:group", "CPU") 43​ id: setColorsManually
53 Layout.columnSpan: 2 44​ text: i18nc("@option:check", "Set Colors Manually")
54 font.bold: true ​
55 } 45​ }
56 46​
57 Label { 47​ Item {
58 text: i18nc("@label:chooser", "User:") 48​ Kirigami.FormData.isSection: true
59 Layout.alignment: Qt.AlignRight 49​ Kirigami.FormData.label: i18nc("@title:group", "CPU")
50​ enabled: setColorsManually.checked
60 } 51​ }
61 52​
53​
62 KQuickControls.ColorButton { 54​ KQuickControls.ColorButton {
63 id: cpuUserColorPicker 55​ id: cpuUserColorPicker
64 } 56​ Kirigami.FormData.label: i18nc("@label:chooser", "User:")
65 57​ enabled: setColorsManually.checked
66 Label { ​
67 text: i18nc("@label:chooser", "IOWait:") ​
68 Layout.alignment: Qt.AlignRight ​
69 } 58​ }
70 59​
71 KQuickControls.ColorButton { 60​ KQuickControls.ColorButton {
72 id: cpuIOWaitColorPicker 61​ id: cpuIOWaitColorPicker
73 } 62​ Kirigami.FormData.label: i18nc("@label:chooser", "IOWait:")
74 63​ enabled: setColorsManually.checked
75 Label { ​
76 text: i18nc("@label:chooser", "Sys:") ​
77 Layout.alignment: Qt.AlignRight ​
78 } 64​ }
79 65​
80 KQuickControls.ColorButton { 66​ KQuickControls.ColorButton {
81 id: cpuSysColorPicker 67​ id: cpuSysColorPicker
82 } 68​ Kirigami.FormData.label: i18nc("@label:chooser", "Sys:")
83 69​ enabled: setColorsManually.checked
84 Label { ​
85 text: i18nc("@label:chooser", "Nice:") ​
86 Layout.alignment: Qt.AlignRight ​
87 } 70​ }
88 71​
89 KQuickControls.ColorButton { 72​ KQuickControls.ColorButton {
90 id: cpuNiceColorPicker 73​ id: cpuNiceColorPicker
91 } 74​ Kirigami.FormData.label: i18nc("@label:chooser", "Nice:")
92 75​ enabled: setColorsManually.checked
93 Label { ​
94 text: i18nc("@title:group", "Memory") ​
95 Layout.columnSpan: 2 ​
96 font.bold: true ​
97 } 76​ }
98 77​
99 78​
100 Label { 79​ Item {
101 text: i18nc("@label:chooser", "Application:") 80​ Kirigami.FormData.isSection: true
102 Layout.alignment: Qt.AlignRight 81​ Kirigami.FormData.label: i18nc("@title:group", "Memory")
82​ enabled: setColorsManually.checked
103 } 83​ }
104 84​
85​
105 KQuickControls.ColorButton { 86​ KQuickControls.ColorButton {
106 id: memApplicationColorPicker 87​ id: memApplicationColorPicker
107 } 88​ Kirigami.FormData.label: i18nc("@label:chooser", "Application:")
108 89​ enabled: setColorsManually.checked
109 Label { ​
110 text: i18nc("@label:chooser", "Buffers:") ​
111 Layout.alignment: Qt.AlignRight ​
112 } 90​ }
113 91​
114 KQuickControls.ColorButton { 92​ KQuickControls.ColorButton {
115 id: memBuffersColorPicker 93​ id: memBuffersColorPicker
116 } 94​ Kirigami.FormData.label: i18nc("@label:chooser", "Buffers:")
117 95​ enabled: setColorsManually.checked
118 Label { ​
119 text: i18nc("@title:group", "Swap") ​
120 Layout.columnSpan: 2 ​
121 font.bold: true ​
122 } 96​ }
123 97​
124 98​
125 Label { 99​ Item {
126 text: i18nc("@label:chooser", "Used swap:") 100​ Kirigami.FormData.isSection: true
127 Layout.alignment: Qt.AlignRight 101​ Kirigami.FormData.label: i18nc("@title:group", "Swap")
102​ enabled: setColorsManually.checked
128 } 103​ }
129 104​
105​
130 KQuickControls.ColorButton { 106​ KQuickControls.ColorButton {
131 id: swapUsedColorPicker 107​ id: swapUsedColorPicker
108​ Kirigami.FormData.label: i18nc("@label:chooser", "Used swap:")
109​ enabled: setColorsManually.checked
132 } 110​ }
133 111​
134 Label { ​
135 text: i18nc("@title:group", "Cache") ​
136 Layout.columnSpan: 2 ​
137 font.bold: true ​
138 } ​
139 112​
140 Label { 113​ Item {
141 text: i18nc("@label:chooser", "Dirty memory:") 114​ Kirigami.FormData.isSection: true
142 Layout.alignment: Qt.AlignRight 115​ Kirigami.FormData.label: i18nc("@title:group", "Cache")
116​ enabled: setColorsManually.checked
143 } 117​ }
144 118​
119​
filipfUnsubmitted
Done

We're having weird resizing behavior because we haven't anchored the two forms to each other:

We need to anchor the bottom layout to the top one so just assign an ID to the first layout and then do something like: anchors.top: manualColors.bottom

filipf: We're having weird resizing behavior because we haven't anchored the two forms to each other…
145 KQuickControls.ColorButton { 120​ KQuickControls.ColorButton {
146 id: cacheDirtyColorPicker 121​ id: cacheDirtyColorPicker
147 } 122​ Kirigami.FormData.label: i18nc("@label:chooser", "Dirty memory:")
148 123​ enabled: setColorsManually.checked
149 Label { ​
150 text: i18nc("@label:chooser", "Writeback memory:") ​
151 Layout.alignment: Qt.AlignRight ​
152 } 124​ }
153 125​
154 KQuickControls.ColorButton { 126​ KQuickControls.ColorButton {
155 id: cacheWritebackColorPicker 127​ id: cacheWritebackColorPicker
156 } 128​ Kirigami.FormData.label: i18nc("@label:chooser", "Writeback memory:")
157 } 129​ enabled: setColorsManually.checked
158 } ​
159 ​
160 Item { ​
161 Layout.fillHeight: true ​
162 } 130​ }
163} 131​}