From a3c6c40832c259c7ec9ca6cfc406eea81b874bc7 Mon Sep 17 00:00:00 2001 From: Jacob Brydolf Date: Sat, 29 Oct 2016 12:09:48 +0200 Subject: change default wallet path + remove auto create path on startup --- main.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'main.cpp') diff --git a/main.cpp b/main.cpp index 0e0d58e3..1fc4b859 100644 --- a/main.cpp +++ b/main.cpp @@ -116,9 +116,7 @@ int main(int argc, char *argv[]) #endif if (!moneroAccountsRootDir.empty()) { - QString moneroAccountsDir = moneroAccountsRootDir.at(0) + "/Monero Accounts"; - QDir tempDir; - tempDir.mkpath(moneroAccountsDir); + QString moneroAccountsDir = moneroAccountsRootDir.at(0) + "/monero/wallets"; engine.rootContext()->setContextProperty("moneroAccountsDir", moneroAccountsDir); } -- cgit v1.2.3 From b795c4b0d782b358f54ae8b3b3d86bb6c2f223de Mon Sep 17 00:00:00 2001 From: Jacob Brydolf Date: Sat, 29 Oct 2016 12:13:20 +0200 Subject: generate default account name from env username --- main.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'main.cpp') diff --git a/main.cpp b/main.cpp index 1fc4b859..96f72566 100644 --- a/main.cpp +++ b/main.cpp @@ -120,6 +120,17 @@ int main(int argc, char *argv[]) engine.rootContext()->setContextProperty("moneroAccountsDir", moneroAccountsDir); } + + // Get default account name + QString accountName = qgetenv("USER"); // mac/linux + if (accountName.isEmpty()){ + accountName = qgetenv("USERNAME"); // Windows + } + if (accountName.isEmpty()) { + accountName = "My monero Account"; + } + + engine.rootContext()->setContextProperty("defaultAccountName", accountName); engine.rootContext()->setContextProperty("applicationDirectory", QApplication::applicationDirPath()); engine.load(QUrl(QStringLiteral("qrc:///main.qml"))); QObject *rootObject = engine.rootObjects().first(); -- cgit v1.2.3 From 1218bf322c362e0c01934d894285528800f1f1ab Mon Sep 17 00:00:00 2001 From: Jacob Brydolf Date: Sun, 30 Oct 2016 15:38:20 +0100 Subject: Capitalized Monero in default path --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main.cpp') diff --git a/main.cpp b/main.cpp index 96f72566..917f1e58 100644 --- a/main.cpp +++ b/main.cpp @@ -116,7 +116,7 @@ int main(int argc, char *argv[]) #endif if (!moneroAccountsRootDir.empty()) { - QString moneroAccountsDir = moneroAccountsRootDir.at(0) + "/monero/wallets"; + QString moneroAccountsDir = moneroAccountsRootDir.at(0) + "/Monero/wallets"; engine.rootContext()->setContextProperty("moneroAccountsDir", moneroAccountsDir); } -- cgit v1.2.3