merge upstream

1 files changed, 35 insertions, 3 deletions

diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml
index a79e4708c..50ff73060 100644
--- a/ethereal/assets/qml/wallet.qml
+++ b/ethereal/assets/qml/wallet.qml
@@ -26,6 +26,22 @@ ApplicationWindow {
 				shortcut: "Ctrl+o"
 				onTriggered: openAppDialog.open()
 			}
+
+			MenuSeparator {}
+
+			MenuItem {
+				text: "Import key"
+				shortcut: "Ctrl+i"
+				onTriggered: importDialog.open()
+			}
+
+			MenuItem {
+				text: "Export keys"
+				shortcut: "Ctrl+e"
+				onTriggered: exportDialog.open()
+			}
+
+			//MenuSeparator {}
 		}
 
 		Menu {
@@ -249,6 +265,8 @@ ApplicationWindow {
 					}
 					TextField {
 						text: eth.getCustomIdentifier()
+						width: 500
+						placeholderText: "Anonymous"
 						onTextChanged: {
 							eth.setCustomIdentifier(text)
 						}
@@ -373,9 +391,7 @@ ApplicationWindow {
 			//ui.open(openAppDialog.fileUrl.toString())
 			//ui.openHtml(Qt.resolvedUrl(ui.assetPath("test.html")))
 			var path = openAppDialog.fileUrl.toString()
-			console.log(path)
 			var ext = path.split('.').pop()
-			console.log(ext)
 			if(ext == "html" || ext == "htm") {
 				ui.openHtml(path)
 			}else if(ext == "qml"){
@@ -384,6 +400,22 @@ ApplicationWindow {
 		}
 	}
 
+	FileDialog {
+		id: exportDialog
+		title: "Export keys"
+		onAccepted: {
+		}
+	}
+
+	FileDialog {
+		id: importDialog
+		title: "Import key"
+		onAccepted: {
+			var path = this.fileUrl.toString()
+			ui.importKey(path)
+		}
+	}
+
 	statusBar: StatusBar {
 		height: 30
 		RowLayout {
@@ -658,7 +690,7 @@ ApplicationWindow {
 			anchors.left: aboutIcon.right
 			anchors.leftMargin: 10
 			font.pointSize: 12
-			text: "<h2>Ethereal</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Maran Hidskes<br>Viktor Trón<br>"
+			text: "<h2>Ethereal - Adrastea</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Maran Hidskes<br>Viktor Trón<br>"
 		}
 	}