3 files changed, 78 insertions, 9 deletions

diff --git a/components/package/contents/ui/AccountSwitcher.qml b/components/package/contents/ui/AccountSwitcher.qml
index 79eba65b..8f7ebb08 100644
--- a/components/package/contents/ui/AccountSwitcher.qml
+++ b/components/package/contents/ui/AccountSwitcher.qml
@@ -74,17 +74,17 @@ Button {
 
                 text: "Create new Account"
 
-                  onClicked: {
-                        newAccountComponent.createObject(app)
-                    }
+                onClicked: {
+                    newAccountComponent.createObject(app)
+                }
 
-                    Component {
-                        id: newAccountComponent
-                        KubeComponents.NewAccountDialog {
-                            id: settings
-                            anchors.fill: parent
-                        }
+                Component {
+                    id: newAccountComponent
+                    KubeComponents.NewAccountDialog {
+                        id: settings
+                        anchors.fill: parent
                     }
+                }
             }
 
             Button {
@@ -160,9 +160,22 @@ Button {
                         opacity: hovered ? 1 : 0.7
                         visible: accountDelegate.containsMouse
                         text: "edit"
+
+                        onClicked: {
+                            editAccountComponent.createObject(app)
+                        }
                     }
                 }
             }
+
+            Component {
+                id: editAccountComponent
+
+                KubeComponents.EditAccountDialog {
+                    id: editAccount
+                    anchors.fill: parent
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/components/package/contents/ui/EditAccountDialog.qml b/components/package/contents/ui/EditAccountDialog.qml
new file mode 100644
index 00000000..2fac4227
--- /dev/null
+++ b/components/package/contents/ui/EditAccountDialog.qml
@@ -0,0 +1,55 @@
+/*
+ *   Copyright (C) 2016 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 3 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, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import QtQuick.Controls 1.4
+import QtQuick.Layouts 1.1
+
+import org.kde.kirigami 1.0 as Kirigami
+
+import org.kube.framework.settings 1.0 as KubeSettings
+import org.kube.framework.domain 1.0 as KubeFramework
+import org.kube.framework.theme 1.0
+
+Rectangle {
+    id: root
+
+    color: ColorPalette.border
+
+    opacity: 0.9
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: {
+            root.destroy()
+        }
+    }
+
+    Rectangle {
+        id: dialog
+        anchors.centerIn: parent
+
+        height: root.height * 0.8
+        width: root.width * 0.8
+
+        color: ColorPalette.background
+
+        MouseArea {
+            anchors.fill: parent
+        }
+    }
+}
diff --git a/components/qmldir b/components/qmldir
index 78e45c2a..8064f9d1 100644
--- a/components/qmldir
+++ b/components/qmldir
@@ -7,3 +7,4 @@ MailListView 1.0 MailListView.qml
 Settings 1.0 Settings.qml
 AccountSwitcher 1.0 AccountSwitcher.qml
 NewAccountDialog 1.0 NewAccountDialog.qml
+EditAccountDialog 1.0 EditAccountDialog.qml