aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Wallet.cpp6
-rw-r--r--Wallet.h17
-rw-r--r--Wallet2Service.cpp6
-rw-r--r--Wallet2Service.h17
-rw-r--r--WalletManager.cpp6
-rw-r--r--WalletManager.h17
-rw-r--r--lang/languages.xml22
-rw-r--r--main.cpp5
-rw-r--r--monero-core.pro13
-rw-r--r--wizard/WizardCreateWallet.qml7
-rw-r--r--wizard/WizardMain.qml2
-rw-r--r--wizard/WizardMemoTextInput.qml2
12 files changed, 105 insertions, 15 deletions
diff --git a/Wallet.cpp b/Wallet.cpp
new file mode 100644
index 00000000..89e448fd
--- /dev/null
+++ b/Wallet.cpp
@@ -0,0 +1,6 @@
+#include "Wallet.h"
+
+Wallet::Wallet(QObject *parent) : QObject(parent)
+{
+
+}
diff --git a/Wallet.h b/Wallet.h
new file mode 100644
index 00000000..130712e6
--- /dev/null
+++ b/Wallet.h
@@ -0,0 +1,17 @@
+#ifndef WALLET_H
+#define WALLET_H
+
+#include <QObject>
+
+class Wallet : public QObject
+{
+ Q_OBJECT
+public:
+ explicit Wallet(QObject *parent = 0);
+
+signals:
+
+public slots:
+};
+
+#endif // WALLET_H \ No newline at end of file
diff --git a/Wallet2Service.cpp b/Wallet2Service.cpp
new file mode 100644
index 00000000..9637d31a
--- /dev/null
+++ b/Wallet2Service.cpp
@@ -0,0 +1,6 @@
+#include "Wallet2Service.h"
+
+Wallet2Service::Wallet2Service(QObject *parent) : QObject(parent)
+{
+
+}
diff --git a/Wallet2Service.h b/Wallet2Service.h
new file mode 100644
index 00000000..9ed5ad9b
--- /dev/null
+++ b/Wallet2Service.h
@@ -0,0 +1,17 @@
+#ifndef WALLET2SERVICE_H
+#define WALLET2SERVICE_H
+
+#include <QObject>
+
+class Wallet2Service : public QObject
+{
+ Q_OBJECT
+public:
+ explicit Wallet2Service(QObject *parent = 0);
+
+signals:
+
+public slots:
+};
+
+#endif // WALLET2SERVICE_H \ No newline at end of file
diff --git a/WalletManager.cpp b/WalletManager.cpp
new file mode 100644
index 00000000..7812ed34
--- /dev/null
+++ b/WalletManager.cpp
@@ -0,0 +1,6 @@
+#include "WalletManager.h"
+
+WalletManager::WalletManager(QObject *parent) : QObject(parent)
+{
+
+}
diff --git a/WalletManager.h b/WalletManager.h
new file mode 100644
index 00000000..b6153385
--- /dev/null
+++ b/WalletManager.h
@@ -0,0 +1,17 @@
+#ifndef WALLETMANAGER_H
+#define WALLETMANAGER_H
+
+#include <QObject>
+
+class WalletManager : public QObject
+{
+ Q_OBJECT
+public:
+ explicit WalletManager(QObject *parent = 0);
+
+signals:
+
+public slots:
+};
+
+#endif // WALLETMANAGER_H \ No newline at end of file
diff --git a/lang/languages.xml b/lang/languages.xml
index eacfcad5..efb84c9c 100644
--- a/lang/languages.xml
+++ b/lang/languages.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<languages>
- <language name="US English" flag="/lang/flags/usa.png" qs="none"/>
- <language name="UK English" flag="/lang/flags/uk.png" qs="none"/>
- <language name="Russia" flag="/lang/flags/russia.png" qs="none"/>
- <language name="RPA" flag="/lang/flags/rpa.png" qs="none"/>
- <language name="Palestine" flag="/lang/flags/palestine.png" qs="none"/>
- <language name="India" flag="/lang/flags/india.png" qs="none"/>
- <language name="German" flag="/lang/flags/german.png" qs="none"/>
- <language name="China" flag="/lang/flags/china.png" qs="none"/>
- <language name="Brazil" flag="/lang/flags/brazil.png" qs="none"/>
- <language name="Bangladesh" flag="/lang/flags/bangladesh.png" qs="none"/>
-</languages> \ No newline at end of file
+ <language name="US English" locale="en_US" flag="/lang/flags/usa.png" qs="none"/>
+ <language name="UK English" locale="en_GB" flag="/lang/flags/uk.png" qs="none"/>
+ <language name="Russia" locale="ru_RU" flag="/lang/flags/russia.png" qs="none"/>
+ <language name="RPA" locale="TODO" flag="/lang/flags/rpa.png" qs="none"/>
+ <language name="Palestine" locale="TODO" flag="/lang/flags/palestine.png" qs="none"/>
+ <language name="India" locale="hi_IN" flag="/lang/flags/india.png" qs="none"/>
+ <language name="German" locale="de_DE" flag="/lang/flags/german.png" qs="none"/>
+ <language name="China" locale="zh_CN" flag="/lang/flags/china.png" qs="none"/>
+ <language name="Brazil" locale="pt_BR" flag="/lang/flags/brazil.png" qs="none"/>
+ <language name="Bangladesh" locale="TODO" flag="/lang/flags/bangladesh.png" qs="none"/>
+</languages>
diff --git a/main.cpp b/main.cpp
index af429df3..e3917f80 100644
--- a/main.cpp
+++ b/main.cpp
@@ -33,6 +33,9 @@
#include "clipboardAdapter.h"
#include "filter.h"
#include "oscursor.h"
+#include "WalletManager.h"
+#include "Wallet.h"
+
int main(int argc, char *argv[])
{
@@ -41,11 +44,13 @@ int main(int argc, char *argv[])
app.installEventFilter(eventFilter);
qmlRegisterType<clipboardAdapter>("moneroComponents", 1, 0, "Clipboard");
+ qmlRegisterType<Wallet>("moneroWallet", 1, 0, "Wallet");
QQmlApplicationEngine engine;
OSCursor cursor;
engine.rootContext()->setContextProperty("globalCursor", &cursor);
+ engine.rootContext()->setContextProperty("walletManager", WalletManager::instance());
// export to QML monero accounts root directory
// wizard is talking about where
diff --git a/monero-core.pro b/monero-core.pro
index dc2a500a..f021449c 100644
--- a/monero-core.pro
+++ b/monero-core.pro
@@ -2,16 +2,22 @@ TEMPLATE = app
QT += qml quick widgets
+
HEADERS += \
filter.h \
clipboardAdapter.h \
- oscursor.h
+ oscursor.h \
+ Wallet2Adaptor.h \
+ WalletManager.h \
+ Wallet.h
SOURCES += main.cpp \
filter.cpp \
clipboardAdapter.cpp \
- oscursor.cpp
+ oscursor.cpp \
+ WalletManager.cpp \
+ Wallet.cpp
lupdate_only {
SOURCES = *.qml \
@@ -63,6 +69,9 @@ OTHER_FILES += \
monero-core_de.ts \
monero-core_en.ts
+DISTFILES += \
+ notes.txt
+
diff --git a/wizard/WizardCreateWallet.qml b/wizard/WizardCreateWallet.qml
index 65e2e989..8ce4e760 100644
--- a/wizard/WizardCreateWallet.qml
+++ b/wizard/WizardCreateWallet.qml
@@ -46,6 +46,12 @@ Item {
settingsObject['wallet_path'] = uiItem.walletPath
}
+ function createWallet(settingsObject) {
+ // print ("Language: " + settingsObject.language);
+ var wallet = walletManager.createWallet(uiItem.accountNameText, "", settingsObject.language);
+ uiItem.wordsTextItem.memoText = wallet.seed
+ }
+
WizardManageWalletUI {
id: uiItem
titleText: qsTr("A new wallet has been created for you")
@@ -53,6 +59,5 @@ Item {
wordsTextItem.clipboardButtonVisible: true
wordsTextItem.tipTextVisible: true
wordsTextItem.memoTextReadOnly: true
-
}
}
diff --git a/wizard/WizardMain.qml b/wizard/WizardMain.qml
index eeefbf17..5f51cec8 100644
--- a/wizard/WizardMain.qml
+++ b/wizard/WizardMain.qml
@@ -99,7 +99,9 @@ Rectangle {
currentPath = "create_wallet"
pages = paths[currentPath]
currentPage = pages.indexOf(createWalletPage)
+ createWalletPage.createWallet(settings)
handlePageChanged()
+
}
function openRecoveryWalletPage() {
diff --git a/wizard/WizardMemoTextInput.qml b/wizard/WizardMemoTextInput.qml
index 89eadb15..39f9211b 100644
--- a/wizard/WizardMemoTextInput.qml
+++ b/wizard/WizardMemoTextInput.qml
@@ -25,7 +25,7 @@ Column {
TextEdit {
id: memoTextInput
textMargin: 8
- text: "bound class paint gasp task soul forgot past pleasure physical circle appear shore bathroom glove women crap busy beauty bliss idea give needle burden"
+ text: ""
font.family: "Arial"
font.pointSize: 16
wrapMode: TextInput.Wrap
generated by cgit v1.2.3 (git 2.51.0) at 2026-08-16 01:04:08 +0000