Differential D13194 Diff 35208 kcms/translations/package/contents/ui/main.qml

Changeset View

Standalone View

View Options

kcms/translations/package/contents/ui/main.qml

Show All 15 Lines
16 * along with this library; see the file COPYING.LIB. If not, write to 16​ * along with this library; see the file COPYING.LIB. If not, write to
17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17​ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 * Boston, MA 02110-1301, USA. 18​ * Boston, MA 02110-1301, USA.
19*/ 19​*/
20 20​
21import QtQuick 2.1 21​import QtQuick 2.1
22import QtQuick.Layouts 1.1 22​import QtQuick.Layouts 1.1
23import QtQuick.Controls 2.3 as QtControls 23​import QtQuick.Controls 2.3 as QtControls
24import org.kde.kirigami 2.4 as Kirigami 24​import org.kde.kirigami 2.5 as Kirigami
25import org.kde.plasma.core 2.1 as PlasmaCore 25​import org.kde.plasma.core 2.1 as PlasmaCore
26import org.kde.kcm 1.2 26​import org.kde.kcm 1.2
27 27​
28ScrollViewKCM { 28​ScrollViewKCM {
29 id: root 29​ id: root
30 30​
31 ConfigModule.quickHelp: i18n("Language") 31​ ConfigModule.quickHelp: i18n("Language")
32 32​
33 PlasmaCore.SortFilterModel { 33​ Component {
34 id: availableLanguagesModel 34​ id: addLanguageItemComponent
35 35​
36 sourceModel: kcm.translationsModel 36​ Kirigami.BasicListItem {
37 ​
38 filterRole: "IsSelected" ​
39 filterCallback: function(source_row, value) { return !value; } ​
40 ​
41 sortRole: "display" ​
42 } ​
43 ​
44 Kirigami.OverlaySheet { ​
45 id: addLanguagesSheet ​
46 ​
47 parent: root.parent ​
48 ​
49 topPadding: 0 ​
50 leftPadding: 0 ​
51 rightPadding: 0 ​
52 bottomPadding: 0 ​
53 ​
54 header: Kirigami.Heading { text: i18nc("@title:window", "Add Languages") } ​
55 ​
56 property var selectedLanguages: [] ​
57 ​
58 onSheetOpenChanged: selectedLanguages = [] ​
59 ​
60 ListView { ​
61 implicitWidth: 18 * Kirigami.Units.gridUnit ​
62 ​
63 model: availableLanguagesModel ​
64 ​
65 delegate: Kirigami.BasicListItem { ​
66 property string languageCode: model.LanguageCode 37​ property string languageCode: model.LanguageCode
67 38​
68 reserveSpaceForIcon: false 39​ reserveSpaceForIcon: false
69 40​
70 label: model.display 41​ label: model.display
71 42​
72 checkable: true 43​ checkable: true
73 onCheckedChanged: { 44​ onCheckedChanged: {
Show All 13 Lines52 } else {
87 if (!addLanguagesSheet.selectedLanguages.length) { 58​ if (!addLanguagesSheet.selectedLanguages.length) {
88 addLanguagesButton.enabled = false; 59​ addLanguagesButton.enabled = false;
89 } 60​ }
90 } 61​ }
91 } 62​ }
92 } 63​ }
93 } 64​ }
94 65​
66​ Kirigami.OverlaySheet {
67​ id: addLanguagesSheet
68​
69​ parent: root.parent
martUnsubmitted
Not Done

this explicit reparenting shouldn't be necessary (and breaks in my branch for multi level kcms)

mart: this explicit reparenting shouldn't be necessary (and breaks in my branch for multi level kcms)
heinAuthorUnsubmitted
Not Done

I've told you a few times now that it's been necessary for me so far, since the sheet doesn't appear or in bizarre locations otherwise. Did you test?

hein: I've told you a few times now that it's been necessary for me so far, since the sheet doesn't…
70​
71​ topPadding: 0
72​ leftPadding: 0
73​ rightPadding: 0
74​ bottomPadding: 0
75​
76​ header: Kirigami.Heading { text: i18nc("@title:window", "Add Languages") }
77​
78​ property var selectedLanguages: []
79​
80​ onSheetOpenChanged: selectedLanguages = []
81​
82​ ListView {
83​ id: availableLanguagesList
84​
85​ implicitWidth: 18 * Kirigami.Units.gridUnit
86​
87​ model: kcm.availableTranslationsModel
88​
89​ delegate: Kirigami.DelegateRecycler {
90​ width: parent.width
martUnsubmitted
Not Done

is this width: necessary?

mart: is this width: necessary?
heinAuthorUnsubmitted
Not Done

I added it because you told me several times that it's necessary now. You tell me?

hein: I added it because you told me several times that it's necessary now. You tell me?
91​
92​ sourceComponent: addLanguageItemComponent
93​ }
94​ }
95​
95 footer: RowLayout { 96​ footer: RowLayout {
96 QtControls.Button { 97​ QtControls.Button {
97 id: addLanguagesButton 98​ id: addLanguagesButton
98 99​
99 Layout.alignment: Qt.AlignHCenter 100​ Layout.alignment: Qt.AlignHCenter
100 101​
101 text: i18nc("@action:button", "Add") 102​ text: i18nc("@action:button", "Add")
102 103​
103 enabled: false 104​ enabled: false
104 105​
105 onClicked: { 106​ onClicked: {
106 var langs = kcm.translationsModel.selectedLanguages.slice(); 107​ var langs = kcm.selectedTranslationsModel.selectedLanguages.slice();
107 addLanguagesSheet.selectedLanguages.sort().forEach(function(index) { 108​ addLanguagesSheet.selectedLanguages.sort().forEach(function(index) {
108 langs.push(availableLanguagesModel.get(index).LanguageCode); 109​ langs.push(kcm.availableTranslationsModel.langCodeAt(index));
109 }); 110​ });
110 111​
111 kcm.translationsModel.selectedLanguages = langs; 112​ kcm.selectedTranslationsModel.selectedLanguages = langs;
112 113​
113 addLanguagesSheet.sheetOpen = false; 114​ addLanguagesSheet.sheetOpen = false;
114 } 115​ }
115 } 116​ }
116 } 117​ }
117 } 118​ }
118 119​
119 header: ColumnLayout { 120​ header: ColumnLayout {
120 id: messagesLayout 121​ id: messagesLayout
121 122​
122 spacing: Kirigami.Units.largeSpacing 123​ spacing: Kirigami.Units.largeSpacing
123 124​
124 Kirigami.InlineMessage { 125​ Kirigami.InlineMessage {
125 Layout.fillWidth: true 126​ Layout.fillWidth: true
126 127​
127 type: Kirigami.MessageType.Information 128​ type: Kirigami.MessageType.Information
128 129​
129 text: i18nc("@info", "There are no languages available on this system.") 130​ text: i18nc("@info", "There are no languages available on this system.")
130 131​
131 visible: !availableLanguagesModel.count 132​ visible: !availableLanguagesList.count
132 } 133​ }
133 134​
134 Kirigami.InlineMessage { 135​ Kirigami.InlineMessage {
135 Layout.fillWidth: true 136​ Layout.fillWidth: true
136 137​
137 type: kcm.everSaved ? Kirigami.MessageType.Positive : Kirigami.MessageType.Information 138​ type: kcm.everSaved ? Kirigami.MessageType.Positive : Kirigami.MessageType.Information
138 139​
139 text: (kcm.everSaved ? i18nc("@info", "Your changes will take effect the next time you log in.") 140​ text: (kcm.everSaved ? i18nc("@info", "Your changes will take effect the next time you log in.")
140 : i18nc("@info", "There are currently no preferred languages configured.")) 141​ : i18nc("@info", "There are currently no preferred languages configured."))
141 142​
142 visible: !languagesList.count || kcm.everSaved 143​ visible: !languagesList.count || kcm.everSaved
143 } 144​ }
144 145​
145 Kirigami.InlineMessage { 146​ Kirigami.InlineMessage {
146 Layout.fillWidth: true 147​ Layout.fillWidth: true
147 148​
148 type: Kirigami.MessageType.Error 149​ type: Kirigami.MessageType.Error
149 150​
150 text: i18ncp("@info %2 is the language code", 151​ text: i18ncp("@info %2 is the language code",
151 "The translation files for the language with the code '%2' could not be found. The language will be removed from your configuration. If you want to add it back, please install the localization files for it and add the language again.", 152​ "The translation files for the language with the code '%2' could not be found. The language will be removed from your configuration. If you want to add it back, please install the localization files for it and add the language again.",
152 "The translation files for the languages with the codes '%2' could not be found. These languages will be removed from your configuration. If you want to add them back, please install the localization files for it and the languages again.", 153​ "The translation files for the languages with the codes '%2' could not be found. These languages will be removed from your configuration. If you want to add them back, please install the localization files for it and the languages again.",
153 kcm.translationsModel.missingLanguages.length, 154​ kcm.translationsModel.missingLanguages.length,
154 kcm.translationsModel.missingLanguages.join("', '")) 155​ kcm.translationsModel.missingLanguages.join("', '"))
155 156​
156 visible: kcm.translationsModel.missingLanguages.length 157​ visible: kcm.selectedTranslationsModel.missingLanguages.length
157 } 158​ }
158 159​
159 QtControls.Label { 160​ QtControls.Label {
160 Layout.fillWidth: true 161​ Layout.fillWidth: true
161 162​
162 visible: languagesList.count 163​ visible: languagesList.count
163 164​
164 text: i18n("The language at the top of this list is the one you want to see and use most often.") 165​ text: i18n("The language at the top of this list is the one you want to see and use most often.")
165 } 166​ }
166 } 167​ }
167 168​
168 view: ListView { 169​ Component {
169 id: languagesList 170​ id: languagesListItemComponent
170 ​
171 model: PlasmaCore.SortFilterModel { ​
172 sourceModel: kcm.translationsModel ​
173 171​
174 filterRole: "IsSelected" 172​ Kirigami.SwipeListItem {
175 filterCallback: function(source_row, value) { return value; } ​
176 ​
177 sortRole: "SelectedPriority" ​
178 } ​
179 ​
180 delegate: Kirigami.SwipeListItem { ​
181 id: listItem 173​ id: listItem
182 174​
183 width: ListView.view.width ​
184 ​
185 contentItem: RowLayout { 175​ contentItem: RowLayout {
186 width: implicitWidth 176​ width: implicitWidth
187 height: Math.max(implicitHeight, Kirigami.Units.iconSizes.smallMedium) 177​ height: Math.max(implicitHeight, Kirigami.Units.iconSizes.smallMedium)
martUnsubmitted
Not Done

this shouldn't be necessary

mart: this shouldn't be necessary
heinAuthorUnsubmitted
Not Done

I'll remove it soon.

hein: I'll remove it soon.
188 178​
189 anchors.verticalCenter: parent.verticalCenter 179​ anchors.verticalCenter: parent.verticalCenter
190 180​
181​ Kirigami.ListItemDragHandle {
182​ listItem: listItem
183​ listView: languagesList
184​ onMoveRequested: kcm.selectedTranslationsModel.move(oldIndex, newIndex)
185​ }
186​
191 Kirigami.Icon { 187​ Kirigami.Icon {
192 visible: model.IsMissing 188​ visible: model.IsMissing
193 189​
194 Layout.alignment: Qt.AlignVCenter 190​ Layout.alignment: Qt.AlignVCenter
195 191​
196 width: Kirigami.Units.iconSizes.smallMedium 192​ width: Kirigami.Units.iconSizes.smallMedium
197 height: width 193​ height: width
198 194​
Show All 14 Lines
213 } 209​ }
214 } 210​ }
215 211​
216 actions: [ 212​ actions: [
217 Kirigami.Action { 213​ Kirigami.Action {
218 enabled: !model.IsMissing && index > 0 214​ enabled: !model.IsMissing && index > 0
219 iconName: "go-top" 215​ iconName: "go-top"
220 tooltip: i18nc("@info:tooltip", "Promote to default") 216​ tooltip: i18nc("@info:tooltip", "Promote to default")
221 onTriggered: kcm.translationsModel.moveSelectedLanguage(index, 0) 217​ onTriggered: kcm.selectedTranslationsModel.move(index, 0)
222 }, ​
223 Kirigami.Action { ​
224 enabled: !model.IsMissing && index > 0 ​
225 iconName: "go-up" ​
226 tooltip: i18nc("@info:tooltip", "Move up") ​
227 onTriggered: kcm.translationsModel.moveSelectedLanguage(index, index - 1) ​
228 }, ​
229 Kirigami.Action { ​
230 enabled: !model.IsMissing && index < (languagesList.count - 1) ​
231 iconName: "go-down" ​
232 tooltip: i18nc("@info:tooltip", "Move down") ​
233 onTriggered: kcm.translationsModel.moveSelectedLanguage(index, index + 1) ​
234 }, 218​ },
235 Kirigami.Action { 219​ Kirigami.Action {
236 enabled: !model.IsMissing 220​ enabled: !model.IsMissing
237 iconName: "list-remove" 221​ iconName: "list-remove"
238 tooltip: i18nc("@info:tooltip", "Remove") 222​ tooltip: i18nc("@info:tooltip", "Remove")
239 onTriggered: kcm.translationsModel.removeSelectedLanguage(model.LanguageCode) 223​ onTriggered: kcm.selectedTranslationsModel.remove(model.LanguageCode)
240 }] 224​ }]
241 } 225​ }
242 } 226​ }
243 227​
228​ view: ListView {
229​ id: languagesList
230​
231​ model: kcm.selectedTranslationsModel
232​
233​ delegate: Kirigami.DelegateRecycler {
234​ width: languagesList.width
235​
236​ sourceComponent: languagesListItemComponent
237​ }
238​ }
239​
244 footer: RowLayout { 240​ footer: RowLayout {
245 id: footerLayout 241​ id: footerLayout
246 242​
247 QtControls.Button { 243​ QtControls.Button {
248 Layout.alignment: Qt.AlignRight 244​ Layout.alignment: Qt.AlignRight
249 245​
250 enabled: availableLanguagesModel.count 246​ enabled: availableLanguagesList.count
251 247​
252 text: i18nc("@action:button", "Add languages...") 248​ text: i18nc("@action:button", "Add languages...")
253 249​
254 onClicked: addLanguagesSheet.sheetOpen = !addLanguagesSheet.sheetOpen 250​ onClicked: addLanguagesSheet.sheetOpen = !addLanguagesSheet.sheetOpen
255 251​
256 checkable: true 252​ checkable: true
257 checked: addLanguagesSheet.sheetOpen 253​ checked: addLanguagesSheet.sheetOpen
258 } 254​ }
259 } 255​ }
260} 256​}
261 257​