From 7599906e9270498dd2674f51cd8b938bac0043a6 Mon Sep 17 00:00:00 2001
From: Michael Bohlender <michael.bohlender@kdemail.net>
Date: Tue, 8 Mar 2016 16:50:56 +0100
Subject: hide cc/bcc lineedit when not needed

---
 .../kube-mail/package/contents/ui/Composer.qml     | 48 +++++++++++++++++++---
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/applications/kube-mail/package/contents/ui/Composer.qml b/applications/kube-mail/package/contents/ui/Composer.qml
index 5502b7f9..b049f33b 100644
--- a/applications/kube-mail/package/contents/ui/Composer.qml
+++ b/applications/kube-mail/package/contents/ui/Composer.qml
@@ -18,9 +18,11 @@
 import QtQuick 2.4
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.1
+import org.kde.plasma.components 2.0 as PlasmaComponents
 
 import org.kde.kube.mail 1.0 as Mail
 
+
 Item {
     id: root
     property variant originalMessage
@@ -79,20 +81,48 @@ Item {
                 text: "To"
             }
 
-            TextField {
-                id: to
-
+            RowLayout {
                 Layout.fillWidth: true
 
-                text: composer.to
+                TextField {
+                    id: to
 
-                onTextChanged: {
-                    composer.to = text;
+                    Layout.fillWidth: true
+
+                    text: composer.to
+
+                    onTextChanged: {
+                        composer.to = text;
+                    }
+                }
+
+                PlasmaComponents.Button {
+                    id: ccButton
+
+                    text: "Cc"
+
+                    onClicked: {
+                        cc.visible = true
+                        ccButton.visible = false
+                    }
+                }
+
+                PlasmaComponents.Button {
+                    id: bccButton
+
+                    text: "Bcc"
+
+                    onClicked: {
+                        bcc.visible = true
+                        bccButton.visible = false
+                    }
                 }
             }
 
             Label {
                 text: "Cc"
+
+                visible: cc.visible
             }
 
             TextField {
@@ -100,6 +130,8 @@ Item {
 
                 Layout.fillWidth: true
 
+                visible: false
+
                 text: composer.cc
 
                 onTextChanged: {
@@ -109,6 +141,8 @@ Item {
 
             Label {
                 text: "Bcc"
+
+                visible: bcc.visible
             }
 
             TextField {
@@ -116,6 +150,8 @@ Item {
 
                 Layout.fillWidth: true
 
+                visible : false
+
                 text: composer.bcc
 
                 onTextChanged: {
-- 
cgit v1.2.3


From ec1b70fa0d46e06fa91c60882d5e364bbfaec979 Mon Sep 17 00:00:00 2001
From: Michael Bohlender <michael.bohlender@kdemail.net>
Date: Tue, 8 Mar 2016 17:17:48 +0100
Subject: add save as draft and attachment button as suggested by the VDG

---
 .../kube-mail/package/contents/ui/Composer.qml     | 25 ++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/applications/kube-mail/package/contents/ui/Composer.qml b/applications/kube-mail/package/contents/ui/Composer.qml
index b049f33b..90a5e9e9 100644
--- a/applications/kube-mail/package/contents/ui/Composer.qml
+++ b/applications/kube-mail/package/contents/ui/Composer.qml
@@ -174,6 +174,31 @@ Item {
             }
         }
 
+        Item {
+
+            Layout.fillWidth: true
+
+            height: subject.height * 1.5
+
+            PlasmaComponents.Button {
+
+                anchors {
+                    bottom: parent.bottom
+                }
+
+                text: "Save as Draft"
+            }
+
+            PlasmaComponents.Button {
+                text: "Attach"
+
+                anchors {
+                    bottom: parent.bottom
+                    right: parent.right
+                }
+            }
+        }
+
         TextArea {
             id: content
 
-- 
cgit v1.2.3


From 0f558eb57baf9c0e7384ce5b288dd7a94546d39b Mon Sep 17 00:00:00 2001
From: Michael Bohlender <michael.bohlender@kdemail.net>
Date: Tue, 8 Mar 2016 17:23:50 +0100
Subject: connect saveAsDraft button to controller

---
 applications/kube-mail/package/contents/ui/Composer.qml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/applications/kube-mail/package/contents/ui/Composer.qml b/applications/kube-mail/package/contents/ui/Composer.qml
index 90a5e9e9..1a6a4cc4 100644
--- a/applications/kube-mail/package/contents/ui/Composer.qml
+++ b/applications/kube-mail/package/contents/ui/Composer.qml
@@ -187,15 +187,20 @@ Item {
                 }
 
                 text: "Save as Draft"
+
+                onClicked: {
+                    composer.saveAsDraft()
+                }
             }
 
             PlasmaComponents.Button {
-                text: "Attach"
 
                 anchors {
                     bottom: parent.bottom
                     right: parent.right
                 }
+
+                text: "Attach"
             }
         }
 
-- 
cgit v1.2.3


From 9b70960a07c5abca4be90d5b2fdf11e2933b6fb7 Mon Sep 17 00:00:00 2001
From: Michael Bohlender <michael.bohlender@kdemail.net>
Date: Tue, 8 Mar 2016 17:25:58 +0100
Subject: remove discard button and move send button to the right as suggested
 by the VDG

---
 .../kube-mail/package/contents/ui/FocusComposer.qml  | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/applications/kube-mail/package/contents/ui/FocusComposer.qml b/applications/kube-mail/package/contents/ui/FocusComposer.qml
index 2be656ab..8ec01cc9 100644
--- a/applications/kube-mail/package/contents/ui/FocusComposer.qml
+++ b/applications/kube-mail/package/contents/ui/FocusComposer.qml
@@ -65,7 +65,7 @@ Rectangle {
             }
 
             RowLayout {
-                Layout.fillWidth: true
+                Layout.alignment: Qt.AlignRight
 
                 Button {
                     text: "Send"
@@ -75,24 +75,6 @@ Rectangle {
                         root.visible = false
                     }
                 }
-
-                Button {
-                    text: "Save Draft"
-
-                    onClicked: {
-                        composer.saveAsDraft()
-                        root.visible = false
-                    }
-                }
-
-                Button {
-                    text: "Discard"
-
-                    onClicked: {
-                        composer.clear()
-                        root.visible = false
-                    }
-                }
             }
         }
     }
-- 
cgit v1.2.3