1 files changed, 151 insertions, 36 deletions

diff --git a/components/mail/contents/ui/main.qml b/components/mail/contents/ui/main.qml
index 20fa25c1..8ee1c794 100644
--- a/components/mail/contents/ui/main.qml
+++ b/components/mail/contents/ui/main.qml
@@ -1,20 +1,20 @@
 /*
-  Copyright (C) 2015 Michael Bohlender, <michael.bohlender@kdemail.net>
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License along
-  with this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
+ *  Copyright (C) 2017 Michael Bohlender, <michael.bohlender@kdemail.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
 
 
 import QtQuick 2.7
@@ -35,8 +35,8 @@ Controls2.ApplicationWindow {
 
     //FIXME remove fixed pixel hight
     //for now just convinience during testing
-    height: 1080 * 0.7
-    width: 1920  * 0.7
+    height: 1080 * 0.8
+    width: 1920  * 0.8
 
     visible: true
 
@@ -92,7 +92,6 @@ Controls2.ApplicationWindow {
         folder: folderListView.currentFolder
     }
 
-
     //BEGIN Shortcuts
     Shortcut {
         sequence: StandardKey.Refresh
@@ -139,24 +138,103 @@ Controls2.ApplicationWindow {
 
             color: Kirigami.Theme.textColor
 
-            Controls2.Button {
-                id: newMailButton
+            Controls2.ToolBar {
+                id: toolBar
 
                 anchors {
                     top: parent.top
                     left: parent.left
                     right: parent.right
-                    margins: Kirigami.Units.smallSpacing
                 }
 
+                RowLayout {
+                    anchors.centerIn: parent
+
+                    spacing: Kirigami.Units.largeSpacing
+
+                    KubeComponents.AccountSwitcher {
+                        id: accountSwitcher
+
+                        iconName: "kdenlive-menu"
+                        height: Kirigami.Units.gridUnit * 1.5
+                        width: height
+                    }
+
+                    ToolButton {
+                        iconName: "user"
+                        height: Kirigami.Units.gridUnit * 1.5
+                        width: height
+
+                        onClicked: {
+                            people.open()
+                        }
+                    }
+
+                    ToolButton {
+                        iconName: "search"
+                        height: Kirigami.Units.gridUnit * 1.5
+                        width: height
+
+                        onClicked: {
+                            search.open()
+                        }
+                    }
+                }
+            }
+
+            Rectangle {
+                id: newMailButton
+
+                anchors {
+                    top: toolBar.bottom
+                    left: parent.left
+                    right: parent.right
+                    margins: Kirigami.Units.largeSpacing
+                }
+
+                color: "#27ae60"
+                clip: true
+
                 height: Kirigami.Units.gridUnit * 1.5
 
-                text: "      " + qsTr("New Email") + "      "
+                Text {
+                    anchors.centerIn: parent
+
+                    text: qsTr("New Email")
+                    color: "white"
+                }
                 //iconName: "mail-message-new"
                 //Controls2.Tooltip.text: "compose new email"
 
-                onClicked: {
-                    composer.open()
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: {
+                        composer.open()
+                    }
+                }
+            }
+
+            Item {
+                id: accountName
+
+                anchors {
+                    top: newMailButton.bottom
+                    topMargin: Kirigami.Units.smallSpacing
+                }
+
+                width: parent.width
+                height: Kirigami.Units.gridUnit * 2
+
+                Text {
+                    anchors {
+                        bottom: parent.bottom
+                        left: parent.left
+                        leftMargin: Kirigami.Units.smallSpacing
+                    }
+
+                    text: accountSwitcher.accountName
+                    font.weight: Font.DemiBold
+                    color: "white"
                 }
             }
 
@@ -164,24 +242,16 @@ Controls2.ApplicationWindow {
                 id: folderListView
 
                 anchors {
-                    top: newMailButton.bottom
-                    bottom: accountSwitcher.top
+                    top: accountName.bottom
+                    topMargin: Kirigami.Units.smallSpacing
+                    bottom: parent.bottom
                     left: parent.left
                     right: parent.right
-                    topMargin: Kirigami.Units.smallSpacing
                 }
 
                 focus: true
                 accountId: accountSwitcher.accountId
             }
-            KubeComponents.AccountSwitcher {
-                id: accountSwitcher
-
-                anchors.bottom: parent.bottom
-
-                width: parent.width
-                height: Kirigami.Units.gridUnit * 2
-            }
         }
 
         KubeComponents.MailListView  {
@@ -225,4 +295,49 @@ Controls2.ApplicationWindow {
         y: app.height * 0.075
     }
     //END AccountWizard
+
+    //BEGIN Search
+    Controls2.Popup {
+        id: search
+
+        width: app.width * 0.6
+        height: Kirigami.Units.gridUnit * 3
+
+        x: app.width * 0.2
+        y: app.height * 0.2
+
+        modal: true
+        focus: true
+
+        RowLayout {
+            anchors.fill: parent
+
+            Controls2.TextField {
+                Layout.fillWidth: true
+                placeholderText: "Search...   is not available in this beta"
+            }
+
+            Controls2.Button {
+                text: "Go"
+
+                onClicked: {
+                    search.close()
+                }
+            }
+        }
+    }
+    //END Search
+
+    //BEGIN People
+    KubeComponents.People {
+        id: people
+
+        height: app.height * 0.85
+        width: app.width * 0.85
+
+        x: app.width * 0.075
+        y: app.height * 0.075
+
+    }
+    //END People
 }