From af2ccb54da5ae864d906f56102d14c664ddcaa56 Mon Sep 17 00:00:00 2001 From: Michael Bohlender Date: Thu, 26 Jul 2018 12:30:02 +0200 Subject: visualize important mails --- framework/qml/Icons.qml | 3 +- framework/qml/MailListView.qml | 25 +++-- .../icons/actions/24/kubeimportant-inverted.svg | 111 +++++++++++++++++++++ icons/breeze/icons/actions/24/kubeimportant.svg | 16 +-- 4 files changed, 140 insertions(+), 15 deletions(-) create mode 100644 icons/breeze/icons/actions/24/kubeimportant-inverted.svg diff --git a/framework/qml/Icons.qml b/framework/qml/Icons.qml index d04d1d92..1fa3aab2 100644 --- a/framework/qml/Icons.qml +++ b/framework/qml/Icons.qml @@ -35,8 +35,9 @@ Item { property string markAsRead: "mail-mark-read-inverted" property string markAsUnread: "mail-mark-unread-new-inverted" - property string markImportant: "kubeimportant" + property string markImportant: "kubeimportant-inverted" property string markUnimportant: "kubeunimportant" + property string isImportant: "kubeimportant" property string undo: "edit-undo-inverted" property string moveToTrash: "kubetrash" property string edit: "document-edit" diff --git a/framework/qml/MailListView.qml b/framework/qml/MailListView.qml index 998d9729..ee4f4957 100644 --- a/framework/qml/MailListView.qml +++ b/framework/qml/MailListView.qml @@ -208,25 +208,38 @@ FocusScope { Kube.Label { id: threadCounter - anchors.right: parent.right + anchors { + right: parent.right + margins: Kube.Units.smallSpacing + } text: model.threadSize color: content.unreadColor - visible: model.threadSize > 1 + visible: model.threadSize > 1 && !delegateRoot.focused + } } - Row { + Kube.Icon { + anchors { + right: parent.right + verticalCenter: parent.verticalCenter + margins: Kube.Units.smallSpacing + } + + visible: model.important && !delegateRoot.focused && !mouseArea.drag.active + iconName: Kube.Icons.isImportant + } + + Column { id: buttons anchors { right: parent.right - bottom: parent.bottom margins: Kube.Units.smallSpacing + verticalCenter: parent.verticalCenter } visible: delegateRoot.focused && !mouseArea.drag.active - - spacing: Kube.Units.smallSpacing opacity: 0.7 Kube.IconButton { diff --git a/icons/breeze/icons/actions/24/kubeimportant-inverted.svg b/icons/breeze/icons/actions/24/kubeimportant-inverted.svg new file mode 100644 index 00000000..1a2949d8 --- /dev/null +++ b/icons/breeze/icons/actions/24/kubeimportant-inverted.svg @@ -0,0 +1,111 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/icons/breeze/icons/actions/24/kubeimportant.svg b/icons/breeze/icons/actions/24/kubeimportant.svg index 1a2949d8..3a5089a4 100644 --- a/icons/breeze/icons/actions/24/kubeimportant.svg +++ b/icons/breeze/icons/actions/24/kubeimportant.svg @@ -11,7 +11,7 @@ id="svg2" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="kubeiconsimportant24.svg" + sodipodi:docname="kubeimportant.svg" width="24" height="24"> image/svg+xml - + @@ -36,7 +36,7 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1280" - inkscape:window-height="1387" + inkscape:window-height="1005" id="namedview8" showgrid="true" inkscape:snap-bbox="true" @@ -44,11 +44,11 @@ inkscape:object-nodes="true" showguides="true" inkscape:guide-bbox="true" - inkscape:zoom="2.8284271" - inkscape:cx="-152.28924" - inkscape:cy="14.675262" + inkscape:zoom="5.6568542" + inkscape:cx="24.592961" + inkscape:cy="-17.569332" inkscape:window-x="440" - inkscape:window-y="290" + inkscape:window-y="0" inkscape:window-maximized="0" inkscape:current-layer="svg2" inkscape:snap-global="true"> @@ -106,6 +106,6 @@ id="path4449" class="ColorScheme-Text" d="M 12,4 9.523438,9.265625 4,10.109375 8,14.210938 7.054687,20 12,17.265625 16.945312,20 16,14.210938 20,10.109375 14.476562,9.265625 12,4 Z" - style="color:#4d4d4d;fill:#ffffff;fill-opacity:1;stroke:none" + style="color:#4d4d4d;fill:#4d4d4d;fill-opacity:1;stroke:none" inkscape:connector-curvature="0" /> -- cgit v1.2.3