summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2017-06-14 15:38:25 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2017-06-14 15:51:56 +0200
commit4106162feb2c7af0c0fec6477c5068a1fcb10fae (patch)
treef0db43e1990307d6bf9ca6b64f0e0c2a9ce578c2
parentca5597c69385814a2b93b744d1a6e88a93ff05d2 (diff)
downloadkube-4106162feb2c7af0c0fec6477c5068a1fcb10fae.tar.gz
kube-4106162feb2c7af0c0fec6477c5068a1fcb10fae.zip
Remove button
-rw-r--r--components/kube/contents/ui/ComposerView.qml1
-rw-r--r--framework/qml/AttachmentDelegate.qml11
-rw-r--r--framework/qml/Icons.qml1
-rw-r--r--framework/qml/MailViewer.qml10
-rw-r--r--icons/breeze/icons/actions/16/list-remove-inverted.svg16
-rw-r--r--icons/breeze/icons/actions/16/list-remove.svg16
-rw-r--r--icons/breeze/icons/actions/22/list-remove-inverted.svg3
-rw-r--r--icons/breeze/icons/actions/22/list-remove.svg3
-rw-r--r--icons/breeze/icons/actions/24/list-remove-inverted.svg14
-rw-r--r--icons/breeze/icons/actions/24/list-remove.svg14
-rwxr-xr-xicons/copybreeze.sh3
11 files changed, 80 insertions, 12 deletions
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 {
270 name: model.filename 270 name: model.filename
271 icon: model.iconName 271 icon: model.iconName
272 clip: true 272 clip: true
273 actionIcon: Kube.Icons.remove
273 } 274 }
274 } 275 }
275 } 276 }
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 {
24 24
25 property string name 25 property string name
26 property string icon 26 property string icon
27 signal open; 27 property alias actionIcon: actionButton.iconName
28 signal download; 28 signal clicked;
29 signal execute;
29 30
30 width: content.width + Kube.Units.smallSpacing 31 width: content.width + Kube.Units.smallSpacing
31 height: content.height + Kube.Units.smallSpacing 32 height: content.height + Kube.Units.smallSpacing
@@ -40,7 +41,7 @@ Item {
40 MouseArea { 41 MouseArea {
41 anchors.fill: parent 42 anchors.fill: parent
42 43
43 onClicked: root.open() 44 onClicked: root.clicked()
44 } 45 }
45 46
46 Row { 47 Row {
@@ -59,10 +60,10 @@ Item {
59 color: Kube.Colors.backgroundColor 60 color: Kube.Colors.backgroundColor
60 } 61 }
61 Kube.IconButton { 62 Kube.IconButton {
63 id: actionButton
62 height: Kube.Units.gridUnit 64 height: Kube.Units.gridUnit
63 width: height 65 width: height
64 iconName: Kube.Icons.save_inverted 66 onClicked: root.execute()
65 onClicked: root.download()
66 padding: 0 67 padding: 0
67 } 68 }
68 } 69 }
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 {
54 property string goUp: "go-down" 54 property string goUp: "go-down"
55 55
56 property string addNew: "list-add" 56 property string addNew: "list-add"
57 property string remove: "list-remove"
57 property string folder: "folder" 58 property string folder: "folder"
58 property string save_inverted: "document-save-inverted" 59 property string save_inverted: "document-save-inverted"
59 60
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 {
281 icon: model.iconName 281 icon: model.iconName
282 282
283 clip: true 283 clip: true
284 onDownload: { 284
285 messageParser.attachments.saveAttachmentToDisk(messageParser.attachments.index(index, 0)) 285 actionIcon: Kube.Icons.save_inverted
286 } 286 onExecute: messageParser.attachments.saveAttachmentToDisk(messageParser.attachments.index(index, 0))
287 onOpen: { 287 onClicked: messageParser.attachments.openAttachment(messageParser.attachments.index(index, 0))
288 messageParser.attachments.openAttachment(messageParser.attachments.index(index, 0))
289 }
290 } 288 }
291 } 289 }
292 } 290 }
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 @@
1<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
2 <defs id="defs3051">
3 <style type="text/css" id="current-color-scheme">
4 .ColorScheme-Text {
5 color:#f2f2f2;
6 }
7 .ColorScheme-NegativeText {
8 color:#da4453;
9 }
10 </style>
11 </defs>
12 <path
13 style="fill:currentColor;fill-opacity:1;stroke:none"
14 class="ColorScheme-NegativeText"
15 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" />
16</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 @@
1<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
2 <defs id="defs3051">
3 <style type="text/css" id="current-color-scheme">
4 .ColorScheme-Text {
5 color:#4d4d4d;
6 }
7 .ColorScheme-NegativeText {
8 color:#da4453;
9 }
10 </style>
11 </defs>
12 <path
13 style="fill:currentColor;fill-opacity:1;stroke:none"
14 class="ColorScheme-NegativeText"
15 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" />
16</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 @@
1<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
2 <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"/>
3</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 @@
1<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
2 <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"/>
3</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 @@
1<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
2 <defs id="defs3051">
3 <style type="text/css" id="current-color-scheme">
4 .ColorScheme-NegativeText {
5 color:#da4453;
6 }
7 </style>
8 </defs>
9 <path
10 style="fill:currentColor;fill-opacity:1;stroke:none"
11 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 "
12 class="ColorScheme-NegativeText"
13 />
14</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 @@
1<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
2 <defs id="defs3051">
3 <style type="text/css" id="current-color-scheme">
4 .ColorScheme-NegativeText {
5 color:#da4453;
6 }
7 </style>
8 </defs>
9 <path
10 style="fill:currentColor;fill-opacity:1;stroke:none"
11 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 "
12 class="ColorScheme-NegativeText"
13 />
14</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 = [
29 "go-down.svg", 29 "go-down.svg",
30 "go-previous.svg", 30 "go-previous.svg",
31 "mail-message.svg", 31 "mail-message.svg",
32 "list-add.svg" 32 "list-add.svg",
33 "list-remove.svg"
33] 34]
34 35
35def ensure_dir(file_path): 36def ensure_dir(file_path):