From 4106162feb2c7af0c0fec6477c5068a1fcb10fae Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Wed, 14 Jun 2017 15:38:25 +0200
Subject: Remove button

---
 components/kube/contents/ui/ComposerView.qml           |  1 +
 framework/qml/AttachmentDelegate.qml                   | 11 ++++++-----
 framework/qml/Icons.qml                                |  1 +
 framework/qml/MailViewer.qml                           | 10 ++++------
 icons/breeze/icons/actions/16/list-remove-inverted.svg | 16 ++++++++++++++++
 icons/breeze/icons/actions/16/list-remove.svg          | 16 ++++++++++++++++
 icons/breeze/icons/actions/22/list-remove-inverted.svg |  3 +++
 icons/breeze/icons/actions/22/list-remove.svg          |  3 +++
 icons/breeze/icons/actions/24/list-remove-inverted.svg | 14 ++++++++++++++
 icons/breeze/icons/actions/24/list-remove.svg          | 14 ++++++++++++++
 icons/copybreeze.sh                                    |  3 ++-
 11 files changed, 80 insertions(+), 12 deletions(-)
 create mode 100644 icons/breeze/icons/actions/16/list-remove-inverted.svg
 create mode 100644 icons/breeze/icons/actions/16/list-remove.svg
 create mode 100644 icons/breeze/icons/actions/22/list-remove-inverted.svg
 create mode 100644 icons/breeze/icons/actions/22/list-remove.svg
 create mode 100644 icons/breeze/icons/actions/24/list-remove-inverted.svg
 create mode 100644 icons/breeze/icons/actions/24/list-remove.svg

diff --git a/components/kube/contents/ui/ComposerView.qml b/components/kube/contents/ui/ComposerView.qml
index 84c55ec5..b92b0f2a 100644
--- a/components/kube/contents/ui/ComposerView.qml
+++ b/components/kube/contents/ui/ComposerView.qml
@@ -270,6 +270,7 @@ Kube.View {
                             name: model.filename
                             icon: model.iconName
                             clip: true
+                            actionIcon: Kube.Icons.remove
                         }
                     }
                 }
diff --git a/framework/qml/AttachmentDelegate.qml b/framework/qml/AttachmentDelegate.qml
index 46cf76f9..2167fa12 100644
--- a/framework/qml/AttachmentDelegate.qml
+++ b/framework/qml/AttachmentDelegate.qml
@@ -24,8 +24,9 @@ Item {
 
     property string name
     property string icon
-    signal open;
-    signal download;
+    property alias actionIcon: actionButton.iconName
+    signal clicked;
+    signal execute;
 
     width: content.width + Kube.Units.smallSpacing
     height: content.height + Kube.Units.smallSpacing
@@ -40,7 +41,7 @@ Item {
     MouseArea {
         anchors.fill: parent
 
-        onClicked: root.open()
+        onClicked: root.clicked()
     }
 
     Row {
@@ -59,10 +60,10 @@ Item {
             color: Kube.Colors.backgroundColor
         }
         Kube.IconButton {
+            id: actionButton
             height: Kube.Units.gridUnit
             width: height
-            iconName: Kube.Icons.save_inverted
-            onClicked: root.download()
+            onClicked: root.execute()
             padding: 0
         }
     }
diff --git a/framework/qml/Icons.qml b/framework/qml/Icons.qml
index e3272eb8..9a3bcb77 100644
--- a/framework/qml/Icons.qml
+++ b/framework/qml/Icons.qml
@@ -54,6 +54,7 @@ Item {
     property string goUp: "go-down"
 
     property string addNew: "list-add"
+    property string remove: "list-remove"
     property string folder: "folder"
     property string save_inverted: "document-save-inverted"
 
diff --git a/framework/qml/MailViewer.qml b/framework/qml/MailViewer.qml
index 2fc304b2..67279d6b 100644
--- a/framework/qml/MailViewer.qml
+++ b/framework/qml/MailViewer.qml
@@ -281,12 +281,10 @@ Rectangle {
                 icon: model.iconName
 
                 clip: true
-                onDownload: {
-                    messageParser.attachments.saveAttachmentToDisk(messageParser.attachments.index(index, 0))
-                }
-                onOpen: {
-                    messageParser.attachments.openAttachment(messageParser.attachments.index(index, 0))
-                }
+
+                actionIcon: Kube.Icons.save_inverted
+                onExecute: messageParser.attachments.saveAttachmentToDisk(messageParser.attachments.index(index, 0))
+                onClicked: messageParser.attachments.openAttachment(messageParser.attachments.index(index, 0))
             }
         }
     }
diff --git a/icons/breeze/icons/actions/16/list-remove-inverted.svg b/icons/breeze/icons/actions/16/list-remove-inverted.svg
new file mode 100644
index 00000000..dc56f8c2
--- /dev/null
+++ b/icons/breeze/icons/actions/16/list-remove-inverted.svg
@@ -0,0 +1,16 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#f2f2f2;
+      }
+      .ColorScheme-NegativeText {
+        color:#da4453;
+      }
+      </style>
+  </defs>
+  <path
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     class="ColorScheme-NegativeText"
+    d="m8 2c-3.314 0-6 2.686-6 6 0 3.314 2.686 6 6 6 3.314 0 6-2.686 6-6 0-3.314-2.686-6-6-6m0 1c2.761 0 5 2.239 5 5 0 1.2-.452 2.263-1.156 3.125l-6.969-6.969c.862-.704 1.925-1.156 3.125-1.156m-3.844 1.875l6.969 6.969c-.862.704-1.925 1.156-3.125 1.156-2.761 0-5-2.239-5-5 0-1.2.452-2.263 1.156-3.125" />
+</svg>
diff --git a/icons/breeze/icons/actions/16/list-remove.svg b/icons/breeze/icons/actions/16/list-remove.svg
new file mode 100644
index 00000000..405bd4ab
--- /dev/null
+++ b/icons/breeze/icons/actions/16/list-remove.svg
@@ -0,0 +1,16 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      .ColorScheme-NegativeText {
+        color:#da4453;
+      }
+      </style>
+  </defs>
+  <path
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     class="ColorScheme-NegativeText"
+    d="m8 2c-3.314 0-6 2.686-6 6 0 3.314 2.686 6 6 6 3.314 0 6-2.686 6-6 0-3.314-2.686-6-6-6m0 1c2.761 0 5 2.239 5 5 0 1.2-.452 2.263-1.156 3.125l-6.969-6.969c.862-.704 1.925-1.156 3.125-1.156m-3.844 1.875l6.969 6.969c-.862.704-1.925 1.156-3.125 1.156-2.761 0-5-2.239-5-5 0-1.2.452-2.263 1.156-3.125" />
+</svg>
diff --git a/icons/breeze/icons/actions/22/list-remove-inverted.svg b/icons/breeze/icons/actions/22/list-remove-inverted.svg
new file mode 100644
index 00000000..937ea04a
--- /dev/null
+++ b/icons/breeze/icons/actions/22/list-remove-inverted.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path d="m12 4c-2.027598 0-3.87132.756694-5.28125 2-.126239.11132-.25603.22478-.375.34375l-.34375.375c-1.243306 1.40993-2 3.253652-2 5.28125 0 4.41828 3.58172 8 8 8 2.027598 0 3.87132-.756694 5.28125-2l.375-.34375c.11897-.11897.23243-.248761.34375-.375 1.243306-1.40993 2-3.253652 2-5.28125 0-4.41828-3.58172-8-8-8m0 1c3.86599 0 7 3.13401 7 7 0 1.75366-.653215 3.334268-1.71875 4.5625l-9.84375-9.84375c1.228231-1.065535 2.80884-1.71875 4.5625-1.71875m-5.28125 2.4375l9.84375 9.84375c-1.228232 1.065535-2.80884 1.71875-4.5625 1.71875-3.86599 0-7-3.13401-7-7 0-1.75366.653215-3.334269 1.71875-4.5625" style="fill:#da4453"/>
+</svg>
diff --git a/icons/breeze/icons/actions/22/list-remove.svg b/icons/breeze/icons/actions/22/list-remove.svg
new file mode 100644
index 00000000..937ea04a
--- /dev/null
+++ b/icons/breeze/icons/actions/22/list-remove.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path d="m12 4c-2.027598 0-3.87132.756694-5.28125 2-.126239.11132-.25603.22478-.375.34375l-.34375.375c-1.243306 1.40993-2 3.253652-2 5.28125 0 4.41828 3.58172 8 8 8 2.027598 0 3.87132-.756694 5.28125-2l.375-.34375c.11897-.11897.23243-.248761.34375-.375 1.243306-1.40993 2-3.253652 2-5.28125 0-4.41828-3.58172-8-8-8m0 1c3.86599 0 7 3.13401 7 7 0 1.75366-.653215 3.334268-1.71875 4.5625l-9.84375-9.84375c1.228231-1.065535 2.80884-1.71875 4.5625-1.71875m-5.28125 2.4375l9.84375 9.84375c-1.228232 1.065535-2.80884 1.71875-4.5625 1.71875-3.86599 0-7-3.13401-7-7 0-1.75366.653215-3.334269 1.71875-4.5625" style="fill:#da4453"/>
+</svg>
diff --git a/icons/breeze/icons/actions/24/list-remove-inverted.svg b/icons/breeze/icons/actions/24/list-remove-inverted.svg
new file mode 100644
index 00000000..1b77328c
--- /dev/null
+++ b/icons/breeze/icons/actions/24/list-remove-inverted.svg
@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-NegativeText {
+        color:#da4453;
+      }
+      </style>
+  </defs>
+  <path
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 13 5 C 10.972402 5 9.12868 5.756694 7.71875 7 C 7.592511 7.11132 7.46272 7.22478 7.34375 7.34375 L 7 7.71875 C 5.756694 9.12868 5 10.972402 5 13 C 5 17.41828 8.58172 21 13 21 C 15.027598 21 16.87132 20.243306 18.28125 19 L 18.65625 18.65625 C 18.77522 18.53728 18.88868 18.407489 19 18.28125 C 20.243306 16.87132 21 15.027598 21 13 C 21 8.58172 17.41828 5 13 5 z M 13 6 C 16.86599 6 20 9.13401 20 13 C 20 14.75366 19.346785 16.334268 18.28125 17.5625 L 8.4375 7.71875 C 9.665731 6.653215 11.24634 6 13 6 z M 7.71875 8.4375 L 17.5625 18.28125 C 16.334268 19.346785 14.75366 20 13 20 C 9.13401 20 6 16.86599 6 13 C 6 11.24634 6.653215 9.665731 7.71875 8.4375 z "
+     class="ColorScheme-NegativeText"
+     />
+</svg>
diff --git a/icons/breeze/icons/actions/24/list-remove.svg b/icons/breeze/icons/actions/24/list-remove.svg
new file mode 100644
index 00000000..1b77328c
--- /dev/null
+++ b/icons/breeze/icons/actions/24/list-remove.svg
@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-NegativeText {
+        color:#da4453;
+      }
+      </style>
+  </defs>
+  <path
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 13 5 C 10.972402 5 9.12868 5.756694 7.71875 7 C 7.592511 7.11132 7.46272 7.22478 7.34375 7.34375 L 7 7.71875 C 5.756694 9.12868 5 10.972402 5 13 C 5 17.41828 8.58172 21 13 21 C 15.027598 21 16.87132 20.243306 18.28125 19 L 18.65625 18.65625 C 18.77522 18.53728 18.88868 18.407489 19 18.28125 C 20.243306 16.87132 21 15.027598 21 13 C 21 8.58172 17.41828 5 13 5 z M 13 6 C 16.86599 6 20 9.13401 20 13 C 20 14.75366 19.346785 16.334268 18.28125 17.5625 L 8.4375 7.71875 C 9.665731 6.653215 11.24634 6 13 6 z M 7.71875 8.4375 L 17.5625 18.28125 C 16.334268 19.346785 14.75366 20 13 20 C 9.13401 20 6 16.86599 6 13 C 6 11.24634 6.653215 9.665731 7.71875 8.4375 z "
+     class="ColorScheme-NegativeText"
+     />
+</svg>
diff --git a/icons/copybreeze.sh b/icons/copybreeze.sh
index 30a9da59..43bbcf4a 100755
--- a/icons/copybreeze.sh
+++ b/icons/copybreeze.sh
@@ -29,7 +29,8 @@ wantedIcons = [
     "go-down.svg",
     "go-previous.svg",
     "mail-message.svg",
-    "list-add.svg"
+    "list-add.svg",
+    "list-remove.svg"
 ]
 
 def ensure_dir(file_path):
-- 
cgit v1.2.3