diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-04-04 07:22:50 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-04-04 15:19:55 +0200 |
commit | 4c1f62bceff8db26da6d0354b29438c3294e2522 (patch) | |
tree | 9dd8271742e8974fea248ae12659e05111d07d6e | |
parent | 65362ba42ac14f718b36b8e527f1d14605fd1761 (diff) | |
download | kube-4c1f62bceff8db26da6d0354b29438c3294e2522.tar.gz kube-4c1f62bceff8db26da6d0354b29438c3294e2522.zip |
use theme
-rw-r--r-- | accounts/maildir/package/contents/ui/MaildirAccountSettings.qml | 6 | ||||
-rw-r--r-- | components/accounts/contents/ui/AccountWizardPage.qml | 12 | ||||
-rw-r--r-- | components/accounts/contents/ui/CreateGmail.qml | 10 | ||||
-rw-r--r-- | components/mail/contents/ui/Mail.qml | 7 | ||||
-rw-r--r-- | components/package/contents/ui/ConversationView.qml | 64 | ||||
-rw-r--r-- | components/package/contents/ui/MailListView.qml | 22 | ||||
-rw-r--r-- | components/package/contents/ui/People.qml | 88 | ||||
-rw-r--r-- | components/theme/contents/ui/Icons.qml | 18 |
8 files changed, 121 insertions, 106 deletions
diff --git a/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml b/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml index b768979a..2e7b6d8a 100644 --- a/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml +++ b/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml | |||
@@ -57,8 +57,8 @@ Item { | |||
57 | fill: parent | 57 | fill: parent |
58 | } | 58 | } |
59 | columns: 2 | 59 | columns: 2 |
60 | columnSpacing: Kirigami.Units.largeSpacing | 60 | columnSpacing: KubeTheme.Units.largeSpacing |
61 | rowSpacing: Kirigami.Units.largeSpacing | 61 | rowSpacing: KubeTheme.Units.largeSpacing |
62 | 62 | ||
63 | Controls.Label { | 63 | Controls.Label { |
64 | text: "Title of Account" | 64 | text: "Title of Account" |
@@ -88,7 +88,7 @@ Item { | |||
88 | } | 88 | } |
89 | 89 | ||
90 | Controls.Button { | 90 | Controls.Button { |
91 | iconName: "folder" | 91 | iconName: KubeTheme.Icons.folder |
92 | 92 | ||
93 | onClicked: { | 93 | onClicked: { |
94 | fileDialogComponent.createObject(parent) | 94 | fileDialogComponent.createObject(parent) |
diff --git a/components/accounts/contents/ui/AccountWizardPage.qml b/components/accounts/contents/ui/AccountWizardPage.qml index f5f8c4ae..034c8fd5 100644 --- a/components/accounts/contents/ui/AccountWizardPage.qml +++ b/components/accounts/contents/ui/AccountWizardPage.qml | |||
@@ -36,7 +36,7 @@ Item { | |||
36 | } | 36 | } |
37 | 37 | ||
38 | Controls.ToolButton { | 38 | Controls.ToolButton { |
39 | iconName: "go-previous" | 39 | iconName: KubeTheme.Icons.goBack |
40 | tooltip: "go back" | 40 | tooltip: "go back" |
41 | onClicked: { | 41 | onClicked: { |
42 | stack.pop() | 42 | stack.pop() |
@@ -48,7 +48,7 @@ Item { | |||
48 | 48 | ||
49 | anchors { | 49 | anchors { |
50 | fill: parent | 50 | fill: parent |
51 | margins: Kirigami.Units.largeSpacing * 2 | 51 | margins: KubeTheme.Units.largeSpacing * 2 |
52 | } | 52 | } |
53 | 53 | ||
54 | Kirigami.Heading { | 54 | Kirigami.Heading { |
@@ -77,7 +77,7 @@ Item { | |||
77 | top:subHeadline.bottom | 77 | top:subHeadline.bottom |
78 | left: parent.left | 78 | left: parent.left |
79 | right: parent.right | 79 | right: parent.right |
80 | topMargin: Kirigami.Units.largeSpacing * 2 | 80 | topMargin: KubeTheme.Units.largeSpacing * 2 |
81 | } | 81 | } |
82 | 82 | ||
83 | Loader { | 83 | Loader { |
@@ -105,12 +105,12 @@ Item { | |||
105 | bottom: parent.bottom | 105 | bottom: parent.bottom |
106 | left: parent.left | 106 | left: parent.left |
107 | right: parent.right | 107 | right: parent.right |
108 | topMargin: Kirigami.Units.largeSpacing * 2 | 108 | topMargin: KubeTheme.Units.largeSpacing * 2 |
109 | } | 109 | } |
110 | 110 | ||
111 | columns: 2 | 111 | columns: 2 |
112 | columnSpacing: Kirigami.Units.largeSpacing | 112 | columnSpacing: KubeTheme.Units.largeSpacing |
113 | rowSpacing: Kirigami.Units.largeSpacing | 113 | rowSpacing: KubeTheme.Units.largeSpacing |
114 | 114 | ||
115 | Item { | 115 | Item { |
116 | Layout.fillHeight: true | 116 | Layout.fillHeight: true |
diff --git a/components/accounts/contents/ui/CreateGmail.qml b/components/accounts/contents/ui/CreateGmail.qml index d031a051..2b29f9ee 100644 --- a/components/accounts/contents/ui/CreateGmail.qml +++ b/components/accounts/contents/ui/CreateGmail.qml | |||
@@ -32,7 +32,7 @@ Item { | |||
32 | } | 32 | } |
33 | 33 | ||
34 | Controls.ToolButton { | 34 | Controls.ToolButton { |
35 | iconName: "go-previous" | 35 | iconName: KubeTheme.Icons.goBack |
36 | 36 | ||
37 | tooltip: "go back" | 37 | tooltip: "go back" |
38 | 38 | ||
@@ -46,7 +46,7 @@ Item { | |||
46 | 46 | ||
47 | anchors { | 47 | anchors { |
48 | fill: parent | 48 | fill: parent |
49 | margins: Kirigami.Units.largeSpacing * 2 | 49 | margins: KubeTheme.Units.largeSpacing * 2 |
50 | } | 50 | } |
51 | 51 | ||
52 | Kirigami.Heading { | 52 | Kirigami.Heading { |
@@ -79,12 +79,12 @@ Item { | |||
79 | bottom: parent.bottom | 79 | bottom: parent.bottom |
80 | left: parent.left | 80 | left: parent.left |
81 | right: parent.right | 81 | right: parent.right |
82 | topMargin: Kirigami.Units.largeSpacing * 2 | 82 | topMargin: KubeTheme.Units.largeSpacing * 2 |
83 | } | 83 | } |
84 | 84 | ||
85 | columns: 2 | 85 | columns: 2 |
86 | columnSpacing: Kirigami.Units.largeSpacing | 86 | columnSpacing: KubeTheme.Units.largeSpacing |
87 | rowSpacing: Kirigami.Units.largeSpacing | 87 | rowSpacing: KubeTheme.Units.largeSpacing |
88 | 88 | ||
89 | Controls.Label { | 89 | Controls.Label { |
90 | text: "Title of Account" | 90 | text: "Title of Account" |
diff --git a/components/mail/contents/ui/Mail.qml b/components/mail/contents/ui/Mail.qml index 6a450d7f..c7491d36 100644 --- a/components/mail/contents/ui/Mail.qml +++ b/components/mail/contents/ui/Mail.qml | |||
@@ -181,14 +181,13 @@ Controls2.ApplicationWindow { | |||
181 | 181 | ||
182 | KubeComponents.AccountSwitcher { | 182 | KubeComponents.AccountSwitcher { |
183 | id: accountSwitcher | 183 | id: accountSwitcher |
184 | 184 | iconName: KubeTheme.Icons.menu | |
185 | iconName: "kdenlive-menu" | ||
186 | height: KubeTheme.Units.gridUnit * 1.5 | 185 | height: KubeTheme.Units.gridUnit * 1.5 |
187 | width: height | 186 | width: height |
188 | } | 187 | } |
189 | 188 | ||
190 | ToolButton { | 189 | ToolButton { |
191 | iconName: "user" | 190 | iconName: KubeTheme.Icons.user |
192 | height: KubeTheme.Units.gridUnit * 1.5 | 191 | height: KubeTheme.Units.gridUnit * 1.5 |
193 | width: height | 192 | width: height |
194 | 193 | ||
@@ -198,7 +197,7 @@ Controls2.ApplicationWindow { | |||
198 | } | 197 | } |
199 | 198 | ||
200 | ToolButton { | 199 | ToolButton { |
201 | iconName: "search" | 200 | iconName: KubeTheme.Icons.search |
202 | height: KubeTheme.Units.gridUnit * 1.5 | 201 | height: KubeTheme.Units.gridUnit * 1.5 |
203 | width: height | 202 | width: height |
204 | 203 | ||
diff --git a/components/package/contents/ui/ConversationView.qml b/components/package/contents/ui/ConversationView.qml index 728b81de..4196ebbd 100644 --- a/components/package/contents/ui/ConversationView.qml +++ b/components/package/contents/ui/ConversationView.qml | |||
@@ -84,13 +84,13 @@ Rectangle { | |||
84 | } | 84 | } |
85 | 85 | ||
86 | header: Item { | 86 | header: Item { |
87 | height: Kirigami.Units.gridUnit * 0.5 | 87 | height: KubeTheme.Units.gridUnit * 0.5 |
88 | width: parent.width | 88 | width: parent.width |
89 | 89 | ||
90 | } | 90 | } |
91 | 91 | ||
92 | footer: Item { | 92 | footer: Item { |
93 | height: Kirigami.Units.gridUnit | 93 | height: KubeTheme.Units.gridUnit |
94 | width: parent.width | 94 | width: parent.width |
95 | } | 95 | } |
96 | 96 | ||
@@ -185,14 +185,14 @@ Rectangle { | |||
185 | } | 185 | } |
186 | } | 186 | } |
187 | 187 | ||
188 | height: sheet.height + Kirigami.Units.gridUnit | 188 | height: sheet.height + KubeTheme.Units.gridUnit |
189 | width: parent.width | 189 | width: parent.width |
190 | 190 | ||
191 | Rectangle { | 191 | Rectangle { |
192 | id: sheet | 192 | id: sheet |
193 | anchors.centerIn: parent | 193 | anchors.centerIn: parent |
194 | implicitHeight: header.height + attachments.height + body.height + incompleteBody.height + footer.height + Kirigami.Units.largeSpacing | 194 | implicitHeight: header.height + attachments.height + body.height + incompleteBody.height + footer.height + KubeTheme.Units.largeSpacing |
195 | width: parent.width - Kirigami.Units.gridUnit * 2 | 195 | width: parent.width - KubeTheme.Units.gridUnit * 2 |
196 | 196 | ||
197 | //Overlay for non-active mails | 197 | //Overlay for non-active mails |
198 | Rectangle { | 198 | Rectangle { |
@@ -213,10 +213,10 @@ Rectangle { | |||
213 | top: parent.top | 213 | top: parent.top |
214 | left: parent.left | 214 | left: parent.left |
215 | right: parent.right | 215 | right: parent.right |
216 | margins: Kirigami.Units.largeSpacing | 216 | margins: KubeTheme.Units.largeSpacing |
217 | } | 217 | } |
218 | 218 | ||
219 | height: headerContent.height + Kirigami.Units.smallSpacing | 219 | height: headerContent.height + KubeTheme.Units.smallSpacing |
220 | 220 | ||
221 | states: [ | 221 | states: [ |
222 | State { | 222 | State { |
@@ -262,7 +262,7 @@ Rectangle { | |||
262 | horizontalCenter: parent.horizontalCenter | 262 | horizontalCenter: parent.horizontalCenter |
263 | } | 263 | } |
264 | 264 | ||
265 | //spacing: Kirigami.Units.smallSpacing | 265 | //spacing: KubeTheme.Units.smallSpacing |
266 | 266 | ||
267 | width: parent.width | 267 | width: parent.width |
268 | 268 | ||
@@ -271,7 +271,7 @@ Rectangle { | |||
271 | 271 | ||
272 | width: parent.width | 272 | width: parent.width |
273 | 273 | ||
274 | spacing: Kirigami.Units.smallSpacing | 274 | spacing: KubeTheme.Units.smallSpacing |
275 | clip: true | 275 | clip: true |
276 | 276 | ||
277 | Text { | 277 | Text { |
@@ -288,7 +288,7 @@ Rectangle { | |||
288 | 288 | ||
289 | text: model.sender | 289 | text: model.sender |
290 | 290 | ||
291 | width: parent.width - senderName.width - date_label.width - Kirigami.Units.largeSpacing | 291 | width: parent.width - senderName.width - date_label.width - KubeTheme.Units.largeSpacing |
292 | elide: Text.ElideRight | 292 | elide: Text.ElideRight |
293 | 293 | ||
294 | color: KubeTheme.Colors.textColor | 294 | color: KubeTheme.Colors.textColor |
@@ -315,7 +315,7 @@ Rectangle { | |||
315 | Text { | 315 | Text { |
316 | id: recipients | 316 | id: recipients |
317 | 317 | ||
318 | width: parent.width - goDown.width - Kirigami.Units.smallSpacing | 318 | width: parent.width - goDown.width - KubeTheme.Units.smallSpacing |
319 | 319 | ||
320 | text:"to: "+ model.to + " " + model.cc + " " + model.bcc | 320 | text:"to: "+ model.to + " " + model.cc + " " + model.bcc |
321 | 321 | ||
@@ -328,7 +328,7 @@ Rectangle { | |||
328 | Text { | 328 | Text { |
329 | id: to | 329 | id: to |
330 | 330 | ||
331 | width: parent.width - goDown.width - Kirigami.Units.smallSpacing | 331 | width: parent.width - goDown.width - KubeTheme.Units.smallSpacing |
332 | 332 | ||
333 | text:"to: " + model.to | 333 | text:"to: " + model.to |
334 | 334 | ||
@@ -340,7 +340,7 @@ Rectangle { | |||
340 | Text { | 340 | Text { |
341 | id: cc | 341 | id: cc |
342 | 342 | ||
343 | width: parent.width - goDown.width - Kirigami.Units.smallSpacing | 343 | width: parent.width - goDown.width - KubeTheme.Units.smallSpacing |
344 | 344 | ||
345 | text:"cc: " + model.cc | 345 | text:"cc: " + model.cc |
346 | 346 | ||
@@ -352,7 +352,7 @@ Rectangle { | |||
352 | Text { | 352 | Text { |
353 | id: bcc | 353 | id: bcc |
354 | 354 | ||
355 | width: parent.width - goDown.width - Kirigami.Units.smallSpacing | 355 | width: parent.width - goDown.width - KubeTheme.Units.smallSpacing |
356 | 356 | ||
357 | text:"bcc: " + model.bcc | 357 | text:"bcc: " + model.bcc |
358 | 358 | ||
@@ -369,7 +369,7 @@ Rectangle { | |||
369 | right: seperator.right | 369 | right: seperator.right |
370 | } | 370 | } |
371 | 371 | ||
372 | height: Kirigami.Units.gridUnit | 372 | height: KubeTheme.Units.gridUnit |
373 | width: height | 373 | width: height |
374 | 374 | ||
375 | color: KubeTheme.Colors.backgroundColor | 375 | color: KubeTheme.Colors.backgroundColor |
@@ -377,7 +377,7 @@ Rectangle { | |||
377 | Controls1.ToolButton { | 377 | Controls1.ToolButton { |
378 | anchors.fill: parent | 378 | anchors.fill: parent |
379 | 379 | ||
380 | iconName: "go-down" | 380 | iconName: KubeTheme.Icons.goDown |
381 | } | 381 | } |
382 | } | 382 | } |
383 | 383 | ||
@@ -387,7 +387,7 @@ Rectangle { | |||
387 | right: seperator.right | 387 | right: seperator.right |
388 | } | 388 | } |
389 | 389 | ||
390 | height: Kirigami.Units.gridUnit | 390 | height: KubeTheme.Units.gridUnit |
391 | width: height | 391 | width: height |
392 | 392 | ||
393 | color: KubeTheme.Colors.backgroundColor | 393 | color: KubeTheme.Colors.backgroundColor |
@@ -395,7 +395,7 @@ Rectangle { | |||
395 | Controls1.ToolButton { | 395 | Controls1.ToolButton { |
396 | anchors.fill: parent | 396 | anchors.fill: parent |
397 | 397 | ||
398 | iconName: header.state === "details" ? "go-up" : "go-down" | 398 | iconName: header.state === "details" ? KubeTheme.Icons.goUp : KubeTheme.Icons.goDown |
399 | 399 | ||
400 | onClicked: { | 400 | onClicked: { |
401 | header.state === "details" ? header.state = "small" : header.state = "details" | 401 | header.state === "details" ? header.state = "small" : header.state = "details" |
@@ -425,14 +425,14 @@ Rectangle { | |||
425 | 425 | ||
426 | anchors { | 426 | anchors { |
427 | top: header.bottom | 427 | top: header.bottom |
428 | topMargin: Kirigami.Units.smallSpacing | 428 | topMargin: KubeTheme.Units.smallSpacing |
429 | right: header.right | 429 | right: header.right |
430 | } | 430 | } |
431 | 431 | ||
432 | width: header.width - Kirigami.Units.largeSpacing | 432 | width: header.width - KubeTheme.Units.largeSpacing |
433 | 433 | ||
434 | layoutDirection: Qt.RightToLeft | 434 | layoutDirection: Qt.RightToLeft |
435 | spacing: Kirigami.Units.smallSpacing | 435 | spacing: KubeTheme.Units.smallSpacing |
436 | clip: true | 436 | clip: true |
437 | 437 | ||
438 | Repeater { | 438 | Repeater { |
@@ -456,12 +456,12 @@ Rectangle { | |||
456 | top: header.bottom | 456 | top: header.bottom |
457 | left: header.left | 457 | left: header.left |
458 | right: header.right | 458 | right: header.right |
459 | leftMargin: Kirigami.Units.largeSpacing | 459 | leftMargin: KubeTheme.Units.largeSpacing |
460 | rightMargin: Kirigami.Units.largeSpacing | 460 | rightMargin: KubeTheme.Units.largeSpacing |
461 | topMargin: Math.max(attachments.height, Kirigami.Units.largeSpacing) | 461 | topMargin: Math.max(attachments.height, KubeTheme.Units.largeSpacing) |
462 | } | 462 | } |
463 | 463 | ||
464 | width: header.width - Kirigami.Units.largeSpacing * 2 | 464 | width: header.width - KubeTheme.Units.largeSpacing * 2 |
465 | height: desiredHeight | 465 | height: desiredHeight |
466 | 466 | ||
467 | message: model.mimeMessage | 467 | message: model.mimeMessage |
@@ -474,9 +474,9 @@ Rectangle { | |||
474 | top: header.bottom | 474 | top: header.bottom |
475 | left: header.left | 475 | left: header.left |
476 | right: header.right | 476 | right: header.right |
477 | leftMargin: Kirigami.Units.largeSpacing | 477 | leftMargin: KubeTheme.Units.largeSpacing |
478 | rightMargin: Kirigami.Units.largeSpacing | 478 | rightMargin: KubeTheme.Units.largeSpacing |
479 | topMargin: Math.max(attachments.height, Kirigami.Units.largeSpacing) | 479 | topMargin: Math.max(attachments.height, KubeTheme.Units.largeSpacing) |
480 | } | 480 | } |
481 | visible: model.incomplete | 481 | visible: model.incomplete |
482 | text: "Incomplete body..." | 482 | text: "Incomplete body..." |
@@ -498,14 +498,14 @@ Rectangle { | |||
498 | 498 | ||
499 | anchors.bottom: parent.bottom | 499 | anchors.bottom: parent.bottom |
500 | 500 | ||
501 | height: Kirigami.Units.gridUnit * 2 | 501 | height: KubeTheme.Units.gridUnit * 2 |
502 | width: parent.width | 502 | width: parent.width |
503 | 503 | ||
504 | Text { | 504 | Text { |
505 | anchors{ | 505 | anchors{ |
506 | verticalCenter: parent.verticalCenter | 506 | verticalCenter: parent.verticalCenter |
507 | left: parent.left | 507 | left: parent.left |
508 | leftMargin: Kirigami.Units.largeSpacing | 508 | leftMargin: KubeTheme.Units.largeSpacing |
509 | } | 509 | } |
510 | 510 | ||
511 | KubeFramework.MailController { | 511 | KubeFramework.MailController { |
@@ -535,7 +535,7 @@ Rectangle { | |||
535 | anchors{ | 535 | anchors{ |
536 | verticalCenter: parent.verticalCenter | 536 | verticalCenter: parent.verticalCenter |
537 | right: parent.right | 537 | right: parent.right |
538 | rightMargin: Kirigami.Units.largeSpacing | 538 | rightMargin: KubeTheme.Units.largeSpacing |
539 | } | 539 | } |
540 | 540 | ||
541 | KubeAction.Context { | 541 | KubeAction.Context { |
@@ -558,7 +558,7 @@ Rectangle { | |||
558 | context: maillistcontext | 558 | context: maillistcontext |
559 | } | 559 | } |
560 | 560 | ||
561 | iconName: model.draft ? "document-edit" : "mail-reply-sender" | 561 | iconName: model.draft ? KubeTheme.Icons.edit : KubeTheme.Icons.replyToSender |
562 | onClicked: { | 562 | onClicked: { |
563 | if (model.draft) { | 563 | if (model.draft) { |
564 | editAction.execute() | 564 | editAction.execute() |
diff --git a/components/package/contents/ui/MailListView.qml b/components/package/contents/ui/MailListView.qml index e7db006b..2d5d6601 100644 --- a/components/package/contents/ui/MailListView.qml +++ b/components/package/contents/ui/MailListView.qml | |||
@@ -21,9 +21,7 @@ import QtQuick.Controls 2.0 | |||
21 | import QtQuick.Controls 1.4 as Controls | 21 | import QtQuick.Controls 1.4 as Controls |
22 | import QtQuick.Layouts 1.1 | 22 | import QtQuick.Layouts 1.1 |
23 | 23 | ||
24 | import org.kde.kirigami 1.0 as Kirigami | ||
25 | import org.kube.components.theme 1.0 as KubeTheme | 24 | import org.kube.components.theme 1.0 as KubeTheme |
26 | |||
27 | import org.kube.framework.domain 1.0 as KubeFramework | 25 | import org.kube.framework.domain 1.0 as KubeFramework |
28 | 26 | ||
29 | Item { | 27 | Item { |
@@ -46,10 +44,10 @@ Item { | |||
46 | Row { | 44 | Row { |
47 | anchors.centerIn: parent | 45 | anchors.centerIn: parent |
48 | 46 | ||
49 | spacing: Kirigami.Units.smallSpacing | 47 | spacing: KubeTheme.Units.smallSpacing |
50 | 48 | ||
51 | Controls.ToolButton { | 49 | Controls.ToolButton { |
52 | iconName: "mail-mark-unread-new" | 50 | iconName: KubeTheme.Icons.markAsRead |
53 | text: qsTr("Mark As Read") | 51 | text: qsTr("Mark As Read") |
54 | enabled: mailController.markAsReadAction.enabled | 52 | enabled: mailController.markAsReadAction.enabled |
55 | tooltip: qsTr("mark mail as read") | 53 | tooltip: qsTr("mark mail as read") |
@@ -59,7 +57,7 @@ Item { | |||
59 | } | 57 | } |
60 | 58 | ||
61 | Controls.ToolButton { | 59 | Controls.ToolButton { |
62 | iconName: "mail-mark-important" | 60 | iconName: KubeTheme.Icons.markImportant |
63 | text: qsTr("Mark Important") | 61 | text: qsTr("Mark Important") |
64 | enabled: mailController.markAsImportantAction.enabled | 62 | enabled: mailController.markAsImportantAction.enabled |
65 | tooltip: qsTr("mark mail as important") | 63 | tooltip: qsTr("mark mail as important") |
@@ -69,7 +67,7 @@ Item { | |||
69 | } | 67 | } |
70 | 68 | ||
71 | Controls.ToolButton { | 69 | Controls.ToolButton { |
72 | iconName: "edit-delete" | 70 | iconName: KubeTheme.Icons.moveToTrash |
73 | text: qsTr("Delete Mail") | 71 | text: qsTr("Delete Mail") |
74 | enabled: mailController.moveToTrashAction.enabled | 72 | enabled: mailController.moveToTrashAction.enabled |
75 | tooltip: qsTr("delete email") | 73 | tooltip: qsTr("delete email") |
@@ -79,7 +77,7 @@ Item { | |||
79 | } | 77 | } |
80 | 78 | ||
81 | Controls.ToolButton { | 79 | Controls.ToolButton { |
82 | iconName: "edit-undo" | 80 | iconName: KubeTheme.Icons.undo |
83 | text: qsTr("Restore Mail") | 81 | text: qsTr("Restore Mail") |
84 | enabled: mailController.restoreFromTrashAction.enabled | 82 | enabled: mailController.restoreFromTrashAction.enabled |
85 | tooltip: qsTr("restore email") | 83 | tooltip: qsTr("restore email") |
@@ -153,7 +151,7 @@ Item { | |||
153 | property variant mail : model.domainObject | 151 | property variant mail : model.domainObject |
154 | 152 | ||
155 | width: scrollbar.visible ? listView.width - scrollbar.width : listView.width | 153 | width: scrollbar.visible ? listView.width - scrollbar.width : listView.width |
156 | height: Kirigami.Units.gridUnit * 5 | 154 | height: KubeTheme.Units.gridUnit * 5 |
157 | 155 | ||
158 | states: [ | 156 | states: [ |
159 | State { | 157 | State { |
@@ -231,14 +229,14 @@ Item { | |||
231 | bottom: parent.bottom | 229 | bottom: parent.bottom |
232 | left: parent.left | 230 | left: parent.left |
233 | right: parent.right | 231 | right: parent.right |
234 | margins: Kirigami.Units.smallSpacing | 232 | margins: KubeTheme.Units.smallSpacing |
235 | } | 233 | } |
236 | 234 | ||
237 | Column { | 235 | Column { |
238 | anchors { | 236 | anchors { |
239 | verticalCenter: parent.verticalCenter | 237 | verticalCenter: parent.verticalCenter |
240 | left: parent.left | 238 | left: parent.left |
241 | leftMargin: Kirigami.Units.largeSpacing | 239 | leftMargin: KubeTheme.Units.largeSpacing |
242 | } | 240 | } |
243 | 241 | ||
244 | Text{ | 242 | Text{ |
@@ -248,7 +246,7 @@ Item { | |||
248 | color: model.unread ? KubeTheme.Colors.highlightColor : KubeTheme.Colors.textColor | 246 | color: model.unread ? KubeTheme.Colors.highlightColor : KubeTheme.Colors.textColor |
249 | 247 | ||
250 | maximumLineCount: 2 | 248 | maximumLineCount: 2 |
251 | width: content.width - Kirigami.Units.gridUnit * 3 | 249 | width: content.width - KubeTheme.Units.gridUnit * 3 |
252 | wrapMode: Text.WrapAnywhere | 250 | wrapMode: Text.WrapAnywhere |
253 | elide: Text.ElideRight | 251 | elide: Text.ElideRight |
254 | } | 252 | } |
@@ -259,7 +257,7 @@ Item { | |||
259 | text: model.senderName | 257 | text: model.senderName |
260 | font.italic: true | 258 | font.italic: true |
261 | color: KubeTheme.Colors.textColor | 259 | color: KubeTheme.Colors.textColor |
262 | width: delegateRoot.width - Kirigami.Units.gridUnit * 3 | 260 | width: delegateRoot.width - KubeTheme.Units.gridUnit * 3 |
263 | elide: Text.ElideRight | 261 | elide: Text.ElideRight |
264 | } | 262 | } |
265 | } | 263 | } |
diff --git a/components/package/contents/ui/People.qml b/components/package/contents/ui/People.qml index 4b67b0f3..182cce94 100644 --- a/components/package/contents/ui/People.qml +++ b/components/package/contents/ui/People.qml | |||
@@ -49,7 +49,7 @@ Popup { | |||
49 | 49 | ||
50 | anchors.verticalCenter: parent.verticalCenter | 50 | anchors.verticalCenter: parent.verticalCenter |
51 | 51 | ||
52 | iconName: "go-previous" | 52 | iconName: KubeTheme.Icons.goBack |
53 | 53 | ||
54 | onClicked: stack.pop() | 54 | onClicked: stack.pop() |
55 | 55 | ||
@@ -69,11 +69,11 @@ Popup { | |||
69 | 69 | ||
70 | anchors { | 70 | anchors { |
71 | right: parent.right | 71 | right: parent.right |
72 | rightMargin: Kirigami.Units.smallSpacing | 72 | rightMargin: KubeTheme.Units.smallSpacing |
73 | verticalCenter: parent.verticalCenter | 73 | verticalCenter: parent.verticalCenter |
74 | } | 74 | } |
75 | 75 | ||
76 | iconName: "list-add-new" | 76 | iconName: KubeTheme.Icons.addNew |
77 | } | 77 | } |
78 | } | 78 | } |
79 | 79 | ||
@@ -117,13 +117,13 @@ Popup { | |||
117 | 117 | ||
118 | anchors { | 118 | anchors { |
119 | top: parent.top | 119 | top: parent.top |
120 | topMargin: Kirigami.Units.largeSpacing | 120 | topMargin: KubeTheme.Units.largeSpacing |
121 | left: parent.left | 121 | left: parent.left |
122 | leftMargin: Kirigami.Units.largeSpacing | 122 | leftMargin: KubeTheme.Units.largeSpacing |
123 | } | 123 | } |
124 | 124 | ||
125 | spacing: Kirigami.Units.largeSpacing | 125 | spacing: KubeTheme.Units.largeSpacing |
126 | width: peoplePageRoot.width - Kirigami.Units.largeSpacing * 2 | 126 | width: peoplePageRoot.width - KubeTheme.Units.largeSpacing * 2 |
127 | 127 | ||
128 | Repeater { | 128 | Repeater { |
129 | 129 | ||
@@ -134,8 +134,8 @@ Popup { | |||
134 | delegate: Rectangle { | 134 | delegate: Rectangle { |
135 | id: delegateRoot | 135 | id: delegateRoot |
136 | 136 | ||
137 | height: Kirigami.Units.gridUnit * 3 | 137 | height: KubeTheme.Units.gridUnit * 3 |
138 | width: Kirigami.Units.gridUnit * 10 | 138 | width: KubeTheme.Units.gridUnit * 10 |
139 | 139 | ||
140 | border.width: 1 | 140 | border.width: 1 |
141 | border.color: "lightgrey" | 141 | border.color: "lightgrey" |
@@ -164,12 +164,12 @@ Popup { | |||
164 | 164 | ||
165 | anchors { | 165 | anchors { |
166 | left: avatarPlaceholder.right | 166 | left: avatarPlaceholder.right |
167 | margins: Kirigami.Units.smallSpacing | 167 | margins: KubeTheme.Units.smallSpacing |
168 | verticalCenter: parent.verticalCenter | 168 | verticalCenter: parent.verticalCenter |
169 | } | 169 | } |
170 | 170 | ||
171 | Text { | 171 | Text { |
172 | width: delegateRoot.width - avatarPlaceholder.width - Kirigami.Units.smallSpacing * 2 | 172 | width: delegateRoot.width - avatarPlaceholder.width - KubeTheme.Units.smallSpacing * 2 |
173 | 173 | ||
174 | text: model.firstName | 174 | text: model.firstName |
175 | elide: Text.ElideRight | 175 | elide: Text.ElideRight |
@@ -177,7 +177,7 @@ Popup { | |||
177 | } | 177 | } |
178 | 178 | ||
179 | Text { | 179 | Text { |
180 | width: delegateRoot.width - avatarPlaceholder.width - Kirigami.Units.smallSpacing * 2 | 180 | width: delegateRoot.width - avatarPlaceholder.width - KubeTheme.Units.smallSpacing * 2 |
181 | 181 | ||
182 | text: model.lastName | 182 | text: model.lastName |
183 | elide: Text.ElideRight | 183 | elide: Text.ElideRight |
@@ -210,7 +210,7 @@ Popup { | |||
210 | anchors { | 210 | anchors { |
211 | top: parent.top | 211 | top: parent.top |
212 | left: parent.left | 212 | left: parent.left |
213 | leftMargin: Kirigami.Units.largeSpacing | 213 | leftMargin: KubeTheme.Units.largeSpacing |
214 | } | 214 | } |
215 | 215 | ||
216 | width: parent.width | 216 | width: parent.width |
@@ -231,17 +231,17 @@ Popup { | |||
231 | 231 | ||
232 | width: personPageRoot.width | 232 | width: personPageRoot.width |
233 | 233 | ||
234 | spacing: Kirigami.Units.largeSpacing | 234 | spacing: KubeTheme.Units.largeSpacing |
235 | 235 | ||
236 | Item { | 236 | Item { |
237 | width: parent.width | 237 | width: parent.width |
238 | height: Kirigami.Units.smallSpacing | 238 | height: KubeTheme.Units.smallSpacing |
239 | } | 239 | } |
240 | 240 | ||
241 | Item { | 241 | Item { |
242 | 242 | ||
243 | height: Kirigami.Units.gridUnit * 8 | 243 | height: KubeTheme.Units.gridUnit * 8 |
244 | width: personPageRoot.width - Kirigami.Units.largeSpacing | 244 | width: personPageRoot.width - KubeTheme.Units.largeSpacing |
245 | 245 | ||
246 | Rectangle { | 246 | Rectangle { |
247 | id: avatar | 247 | id: avatar |
@@ -258,7 +258,7 @@ Popup { | |||
258 | anchors { | 258 | anchors { |
259 | top: avatar.top | 259 | top: avatar.top |
260 | left: avatar.right | 260 | left: avatar.right |
261 | leftMargin: Kirigami.Units.largeSpacing | 261 | leftMargin: KubeTheme.Units.largeSpacing |
262 | } | 262 | } |
263 | 263 | ||
264 | text: contactController.name //"Michael Tester" | 264 | text: contactController.name //"Michael Tester" |
@@ -270,7 +270,7 @@ Popup { | |||
270 | anchors { | 270 | anchors { |
271 | top: nameLabel.bottom | 271 | top: nameLabel.bottom |
272 | left: avatar.right | 272 | left: avatar.right |
273 | leftMargin: Kirigami.Units.largeSpacing | 273 | leftMargin: KubeTheme.Units.largeSpacing |
274 | } | 274 | } |
275 | 275 | ||
276 | text: "CIO" | 276 | text: "CIO" |
@@ -282,11 +282,11 @@ Popup { | |||
282 | anchors { | 282 | anchors { |
283 | bottom: avatar.bottom | 283 | bottom: avatar.bottom |
284 | left: avatar.right | 284 | left: avatar.right |
285 | leftMargin: Kirigami.Units.largeSpacing | 285 | leftMargin: KubeTheme.Units.largeSpacing |
286 | } | 286 | } |
287 | 287 | ||
288 | height: Kirigami.Units.gridUnit * 3 | 288 | height: KubeTheme.Units.gridUnit * 3 |
289 | width: Kirigami.Units.gridUnit * 10 | 289 | width: KubeTheme.Units.gridUnit * 10 |
290 | 290 | ||
291 | border.width: 1 | 291 | border.width: 1 |
292 | border.color: "lightgrey" | 292 | border.color: "lightgrey" |
@@ -304,7 +304,7 @@ Popup { | |||
304 | anchors { | 304 | anchors { |
305 | verticalCenter: av.verticalCenter | 305 | verticalCenter: av.verticalCenter |
306 | left: av.right | 306 | left: av.right |
307 | leftMargin: Kirigami.Units.smallSpacing | 307 | leftMargin: KubeTheme.Units.smallSpacing |
308 | } | 308 | } |
309 | 309 | ||
310 | text: "Sauerkraut AG" | 310 | text: "Sauerkraut AG" |
@@ -317,65 +317,65 @@ Popup { | |||
317 | Flow { | 317 | Flow { |
318 | id: emails | 318 | id: emails |
319 | 319 | ||
320 | width: personPageRoot.width - Kirigami.Units.largeSpacing | 320 | width: personPageRoot.width - KubeTheme.Units.largeSpacing |
321 | 321 | ||
322 | Repeater { | 322 | Repeater { |
323 | 323 | ||
324 | model: contactController.emails | 324 | model: contactController.emails |
325 | 325 | ||
326 | Row { | 326 | Row { |
327 | spacing: Kirigami.Units.smallSpacing | 327 | spacing: KubeTheme.Units.smallSpacing |
328 | Text { text: "(main)" } | 328 | Text { text: "(main)" } |
329 | Text { text: modelData ; color: KubeTheme.Colors.highlightColor } | 329 | Text { text: modelData ; color: KubeTheme.Colors.highlightColor } |
330 | Item { width: Kirigami.Units.smallSpacing; height: 1 } | 330 | Item { width: KubeTheme.Units.smallSpacing; height: 1 } |
331 | } | 331 | } |
332 | } | 332 | } |
333 | 333 | ||
334 | Row { | 334 | Row { |
335 | spacing: Kirigami.Units.smallSpacing | 335 | spacing: KubeTheme.Units.smallSpacing |
336 | Text { text: "(alias)"} | 336 | Text { text: "(alias)"} |
337 | Text { text: "test.testerson@gmail.com"; color: KubeTheme.Colors.highlightColor } | 337 | Text { text: "test.testerson@gmail.com"; color: KubeTheme.Colors.highlightColor } |
338 | Item { width: Kirigami.Units.smallSpacing; height: 1 } | 338 | Item { width: KubeTheme.Units.smallSpacing; height: 1 } |
339 | } | 339 | } |
340 | 340 | ||
341 | Row { | 341 | Row { |
342 | spacing: Kirigami.Units.smallSpacing | 342 | spacing: KubeTheme.Units.smallSpacing |
343 | Text { text: "(private)"} | 343 | Text { text: "(private)"} |
344 | Text { text: "test@gmail.com"; color: KubeTheme.Colors.highlightColor } | 344 | Text { text: "test@gmail.com"; color: KubeTheme.Colors.highlightColor } |
345 | Item { width: Kirigami.Units.smallSpacing; height: 1 } | 345 | Item { width: KubeTheme.Units.smallSpacing; height: 1 } |
346 | } | 346 | } |
347 | } | 347 | } |
348 | 348 | ||
349 | Flow { | 349 | Flow { |
350 | id: phone | 350 | id: phone |
351 | 351 | ||
352 | width: personPageRoot.width - Kirigami.Units.largeSpacing | 352 | width: personPageRoot.width - KubeTheme.Units.largeSpacing |
353 | spacing: Kirigami.Units.smallSpacing | 353 | spacing: KubeTheme.Units.smallSpacing |
354 | 354 | ||
355 | Row { | 355 | Row { |
356 | spacing: Kirigami.Units.smallSpacing | 356 | spacing: KubeTheme.Units.smallSpacing |
357 | Text { text: "(inhouse)"} | 357 | Text { text: "(inhouse)"} |
358 | Text { text: "+49812324932"; opacity: 0.6 } | 358 | Text { text: "+49812324932"; opacity: 0.6 } |
359 | Item { width: Kirigami.Units.smallSpacing; height: 1 } | 359 | Item { width: KubeTheme.Units.smallSpacing; height: 1 } |
360 | } | 360 | } |
361 | Row { | 361 | Row { |
362 | spacing: Kirigami.Units.smallSpacing | 362 | spacing: KubeTheme.Units.smallSpacing |
363 | Text { text: "(mobile)"} | 363 | Text { text: "(mobile)"} |
364 | Text { text: "+49812324932"; opacity: 0.6 } | 364 | Text { text: "+49812324932"; opacity: 0.6 } |
365 | Item { width: Kirigami.Units.smallSpacing; height: 1 } | 365 | Item { width: KubeTheme.Units.smallSpacing; height: 1 } |
366 | } | 366 | } |
367 | Row { | 367 | Row { |
368 | spacing: Kirigami.Units.smallSpacing | 368 | spacing: KubeTheme.Units.smallSpacing |
369 | Text { text: "(private)"} | 369 | Text { text: "(private)"} |
370 | Text { text: "+49812324932"; opacity: 0.6 } | 370 | Text { text: "+49812324932"; opacity: 0.6 } |
371 | Item { width: Kirigami.Units.smallSpacing; height: 1 } | 371 | Item { width: KubeTheme.Units.smallSpacing; height: 1 } |
372 | } | 372 | } |
373 | } | 373 | } |
374 | 374 | ||
375 | Column { | 375 | Column { |
376 | id: address | 376 | id: address |
377 | 377 | ||
378 | width: personPageRoot.width - Kirigami.Units.largeSpacing | 378 | width: personPageRoot.width - KubeTheme.Units.largeSpacing |
379 | 379 | ||
380 | Text { text: "Albertstrasse 35a"} | 380 | Text { text: "Albertstrasse 35a"} |
381 | Text { text: "81767 Teststadt"} | 381 | Text { text: "81767 Teststadt"} |
@@ -386,7 +386,7 @@ Popup { | |||
386 | // | 386 | // |
387 | // width: parent.width | 387 | // width: parent.width |
388 | // | 388 | // |
389 | // spacing: Kirigami.Units.smallSpacing | 389 | // spacing: KubeTheme.Units.smallSpacing |
390 | // | 390 | // |
391 | // Text { | 391 | // Text { |
392 | // | 392 | // |
@@ -396,7 +396,7 @@ Popup { | |||
396 | // GroupGrid { | 396 | // GroupGrid { |
397 | // id: groups | 397 | // id: groups |
398 | // | 398 | // |
399 | // width: root.width - Kirigami.Units.largeSpacing | 399 | // width: root.width - KubeTheme.Units.largeSpacing |
400 | // | 400 | // |
401 | // model: GroupModel1 {} | 401 | // model: GroupModel1 {} |
402 | // } | 402 | // } |
@@ -406,7 +406,7 @@ Popup { | |||
406 | // | 406 | // |
407 | // width: parent.width | 407 | // width: parent.width |
408 | // | 408 | // |
409 | // spacing: Kirigami.Units.smallSpacing | 409 | // spacing: KubeTheme.Units.smallSpacing |
410 | // | 410 | // |
411 | // Text { | 411 | // Text { |
412 | // id: commonPeopleLabel | 412 | // id: commonPeopleLabel |
@@ -417,7 +417,7 @@ Popup { | |||
417 | // PeopleGrid { | 417 | // PeopleGrid { |
418 | // id: commonPeople | 418 | // id: commonPeople |
419 | // | 419 | // |
420 | // width: root.width - Kirigami.Units.largeSpacing | 420 | // width: root.width - KubeTheme.Units.largeSpacing |
421 | // | 421 | // |
422 | // model: PeopleModel2 {} | 422 | // model: PeopleModel2 {} |
423 | // } | 423 | // } |
@@ -425,7 +425,7 @@ Popup { | |||
425 | 425 | ||
426 | Item { | 426 | Item { |
427 | width: parent.width | 427 | width: parent.width |
428 | height: Kirigami.Units.largeSpacing | 428 | height: KubeTheme.Units.largeSpacing |
429 | } | 429 | } |
430 | } | 430 | } |
431 | } | 431 | } |
diff --git a/components/theme/contents/ui/Icons.qml b/components/theme/contents/ui/Icons.qml index 417a598c..e1b8f4f4 100644 --- a/components/theme/contents/ui/Icons.qml +++ b/components/theme/contents/ui/Icons.qml | |||
@@ -27,5 +27,23 @@ Item { | |||
27 | property string noNetworkConnection: "network-disconnect" | 27 | property string noNetworkConnection: "network-disconnect" |
28 | property string connected: "checkmark" | 28 | property string connected: "checkmark" |
29 | property string success: "checkmark" | 29 | property string success: "checkmark" |
30 | |||
31 | property string markAsRead: "mail-mark-unread-new" | ||
32 | property string markImportant: "mail-mark-important" | ||
33 | property string undo: "edit-undo" | ||
34 | property string moveToTrash: "edit-delete" | ||
35 | property string edit: "document-edit" | ||
36 | property string replyToSender: "mail-reply-sender" | ||
37 | |||
38 | property string menu: "application-menu" | ||
39 | property string user: "im-user" | ||
40 | property string search: "edit-find" | ||
41 | property string goBack: "go-previous" | ||
42 | property string goDown: "go-down" | ||
43 | property string goUp: "go-down" | ||
44 | |||
45 | property string addNew: "list-add-new" | ||
46 | property string folder: "folder" | ||
47 | |||
30 | } | 48 | } |
31 | 49 | ||