Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 03:08:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Huge cleanup!

Browse source
This commit is contained in:
Zach Fox 2017-08-25 10:56:53 -07:00
parent f82fa2f981
commit 453897b9e2
9 changed files with 56 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/resources/qml/hifi/commerce/wallet/Security.qml
View file

@ -40,10 +40,8 @@ Item {
} }
} }
onKeyFilePathResult: { onKeyFilePathIfExistsResult: {
if (path !== "") { keyFilePath.text = path;
keyFilePath.text = path;
}
} }
} }
@ -264,7 +262,7 @@ Item {
onVisibleChanged: { onVisibleChanged: {
if (visible) { if (visible) {
commerce.getKeyFilePath(); commerce.getKeyFilePathIfExists();
} }
} }
} }

48
interface/resources/qml/hifi/commerce/wallet/Wallet.qml
View file

@ -25,7 +25,9 @@ Rectangle {
id: root; id: root;
property string activeView: "walletHome"; property string activeView: "initialize";
property bool securityImageResultReceived: false;
property bool keyFilePathIfExistsResultReceived: false;
// Style // Style
color: hifi.colors.baseGray; color: hifi.colors.baseGray;
@ -33,16 +35,20 @@ Rectangle {
id: commerce; id: commerce;
onSecurityImageResult: { onSecurityImageResult: {
if (!exists) { // "If security image is not set up" securityImageResultReceived = true;
if (root.activeView !== "notSetUp") { if (!exists && root.activeView !== "notSetUp") { // "If security image is not set up"
root.activeView = "notSetUp"; root.activeView = "notSetUp";
} } else if (root.securityImageResultReceived && exists && root.keyFilePathIfExistsResultReceived && root.activeView === "initialize") {
root.activeView = "walletHome";
} }
} }
onKeyFilePathResult: { onKeyFilePathIfExistsResult: {
keyFilePathIfExistsResultReceived = true;
if (path === "" && root.activeView !== "notSetUp") { if (path === "" && root.activeView !== "notSetUp") {
root.activeView = "notSetUp"; root.activeView = "notSetUp";
} else if (root.securityImageResultReceived && root.keyFilePathIfExistsResultReceived && path !== "" && root.activeView === "initialize") {
root.activeView = "walletHome";
} }
} }
} }
@ -151,6 +157,22 @@ Rectangle {
// //
// TAB CONTENTS START // TAB CONTENTS START
// //
Rectangle {
id: initialize;
visible: root.activeView === "initialize";
anchors.top: titleBarContainer.bottom;
anchors.bottom: parent.top;
anchors.left: parent.left;
anchors.right: parent.right;
color: hifi.colors.baseGray;
Component.onCompleted: {
commerce.getSecurityImage();
commerce.getKeyFilePathIfExists();
}
}
NotSetUp { NotSetUp {
id: notSetUp; id: notSetUp;
visible: root.activeView === "notSetUp"; visible: root.activeView === "notSetUp";
@ -283,13 +305,6 @@ Rectangle {
onEntered: parent.color = hifi.colors.blueHighlight; onEntered: parent.color = hifi.colors.blueHighlight;
onExited: parent.color = root.activeView === "walletHome" ? hifi.colors.blueAccent : hifi.colors.black; onExited: parent.color = root.activeView === "walletHome" ? hifi.colors.blueAccent : hifi.colors.black;
} }
onVisibleChanged: {
if (visible) {
commerce.getSecurityImage();
commerce.balance();
}
}
} }
// "SEND MONEY" tab button // "SEND MONEY" tab button
@ -382,13 +397,6 @@ Rectangle {
onEntered: parent.color = hifi.colors.blueHighlight; onEntered: parent.color = hifi.colors.blueHighlight;
onExited: parent.color = root.activeView === "security" ? hifi.colors.blueAccent : hifi.colors.black; onExited: parent.color = root.activeView === "security" ? hifi.colors.blueAccent : hifi.colors.black;
} }
onVisibleChanged: {
if (visible) {
commerce.getSecurityImage();
commerce.getKeyFilePath();
}
}
} }
// "HELP" tab button // "HELP" tab button

12
interface/resources/qml/hifi/commerce/wallet/WalletSetupLightbox.qml
View file

@ -56,10 +56,8 @@ Rectangle {
} }
} }
onKeyFilePathResult: { onKeyFilePathIfExistsResult: {
if (path !== "") { keyFilePath.text = path;
keyFilePath.text = path;
}
} }
} }
@ -455,10 +453,10 @@ Rectangle {
text: "Next"; text: "Next";
onClicked: { onClicked: {
if (passphraseSelection.validateAndSubmitPassphrase()) { if (passphraseSelection.validateAndSubmitPassphrase()) {
root.lastPage = "passphrase"; root.lastPage = "choosePassphrase";
commerce.balance(); // Do this here so that keys are generated. Order might change as backend changes?
choosePassphraseContainer.visible = false; choosePassphraseContainer.visible = false;
privateKeysReadyContainer.visible = true; privateKeysReadyContainer.visible = true;
commerce.balance(); // Do this here so that keys are generated. Order might change as backend changes?
} }
} }
} }
@ -562,7 +560,7 @@ Rectangle {
onVisibleChanged: { onVisibleChanged: {
if (visible) { if (visible) {
commerce.getKeyFilePath(); commerce.getKeyFilePathIfExists();
} }
} }
} }

6
interface/src/commerce/QmlCommerce.cpp
View file

@ -25,7 +25,7 @@ QmlCommerce::QmlCommerce(QQuickItem* parent) : OffscreenQmlDialog(parent) {
connect(ledger.data(), &Ledger::balanceResult, this, &QmlCommerce::balanceResult); connect(ledger.data(), &Ledger::balanceResult, this, &QmlCommerce::balanceResult);
connect(ledger.data(), &Ledger::inventoryResult, this, &QmlCommerce::inventoryResult); connect(ledger.data(), &Ledger::inventoryResult, this, &QmlCommerce::inventoryResult);
connect(wallet.data(), &Wallet::securityImageResult, this, &QmlCommerce::securityImageResult); connect(wallet.data(), &Wallet::securityImageResult, this, &QmlCommerce::securityImageResult);
connect(wallet.data(), &Wallet::keyFilePathResult, this, &QmlCommerce::keyFilePathResult); connect(wallet.data(), &Wallet::keyFilePathIfExistsResult, this, &QmlCommerce::keyFilePathIfExistsResult);
} }
void QmlCommerce::buy(const QString& assetId, int cost, const QString& buyerUsername) { void QmlCommerce::buy(const QString& assetId, int cost, const QString& buyerUsername) {
@ -69,7 +69,7 @@ void QmlCommerce::setPassphrase(const QString& passphrase) {
void QmlCommerce::getPassphraseSetupStatus() { void QmlCommerce::getPassphraseSetupStatus() {
emit passphraseSetupStatusResult(false); emit passphraseSetupStatusResult(false);
} }
void QmlCommerce::getKeyFilePath() { void QmlCommerce::getKeyFilePathIfExists() {
auto wallet = DependencyManager::get<Wallet>(); auto wallet = DependencyManager::get<Wallet>();
wallet->getKeyFilePath(); wallet->sendKeyFilePathIfExists();
} }

4
interface/src/commerce/QmlCommerce.h
View file

@ -36,7 +36,7 @@ signals:
void securityImageResult(bool exists); void securityImageResult(bool exists);
void loginStatusResult(bool isLoggedIn); void loginStatusResult(bool isLoggedIn);
void passphraseSetupStatusResult(bool passphraseIsSetup); void passphraseSetupStatusResult(bool passphraseIsSetup);
void keyFilePathResult(const QString& path); void keyFilePathIfExistsResult(const QString& path);
protected: protected:
Q_INVOKABLE void buy(const QString& assetId, int cost, const QString& buyerUsername = ""); Q_INVOKABLE void buy(const QString& assetId, int cost, const QString& buyerUsername = "");
@ -47,7 +47,7 @@ protected:
Q_INVOKABLE void getLoginStatus(); Q_INVOKABLE void getLoginStatus();
Q_INVOKABLE void setPassphrase(const QString& passphrase); Q_INVOKABLE void setPassphrase(const QString& passphrase);
Q_INVOKABLE void getPassphraseSetupStatus(); Q_INVOKABLE void getPassphraseSetupStatus();
Q_INVOKABLE void getKeyFilePath(); Q_INVOKABLE void getKeyFilePathIfExists();
}; };
#endif // hifi_QmlCommerce_h #endif // hifi_QmlCommerce_h

11
interface/src/commerce/Wallet.cpp
View file

@ -359,6 +359,7 @@ bool Wallet::createIfNeeded() {
bool Wallet::generateKeyPair() { bool Wallet::generateKeyPair() {
qCInfo(commerce) << "Generating keypair."; qCInfo(commerce) << "Generating keypair.";
auto keyPair = generateRSAKeypair(); auto keyPair = generateRSAKeypair();
sendKeyFilePathIfExists();
QString oldKey = _publicKeys.count() == 0 ? "" : _publicKeys.last(); QString oldKey = _publicKeys.count() == 0 ? "" : _publicKeys.last();
QString key = keyPair.first->toBase64(); QString key = keyPair.first->toBase64();
_publicKeys.push_back(key); _publicKeys.push_back(key);
@ -471,6 +472,12 @@ void Wallet::getSecurityImage() {
emit securityImageResult(false); emit securityImageResult(false);
} }
} }
void Wallet::getKeyFilePath() { void Wallet::sendKeyFilePathIfExists() {
emit keyFilePathResult(keyFilePath()); QString filePath(keyFilePath());
QFileInfo fileInfo(filePath);
if (fileInfo.exists()) {
emit keyFilePathIfExistsResult(filePath);
} else {
emit keyFilePathIfExistsResult("");
}
} }

4
interface/src/commerce/Wallet.h
View file

@ -30,7 +30,7 @@ public:
QString signWithKey(const QByteArray& text, const QString& key); QString signWithKey(const QByteArray& text, const QString& key);
void chooseSecurityImage(const QString& imageFile); void chooseSecurityImage(const QString& imageFile);
void getSecurityImage(); void getSecurityImage();
void getKeyFilePath(); void sendKeyFilePathIfExists();
void setSalt(const QByteArray& salt) { _salt = salt; } void setSalt(const QByteArray& salt) { _salt = salt; }
QByteArray getSalt() { return _salt; } QByteArray getSalt() { return _salt; }
@ -40,7 +40,7 @@ public:
signals: signals:
void securityImageResult(bool exists) ; void securityImageResult(bool exists) ;
void keyFilePathResult(const QString& path); void keyFilePathIfExistsResult(const QString& path);
protected: protected:
enum SecurityImage { enum SecurityImage {

4
scripts/defaultScripts.js
View file

@ -24,12 +24,12 @@ var DEFAULT_SCRIPTS_COMBINED = [
"system/makeUserConnection.js", "system/makeUserConnection.js",
"system/tablet-goto.js", "system/tablet-goto.js",
"system/marketplaces/marketplaces.js", "system/marketplaces/marketplaces.js",
"system/commerce/wallet.js",
"system/edit.js", "system/edit.js",
"system/notifications.js", "system/notifications.js",
"system/dialTone.js", "system/dialTone.js",
"system/firstPersonHMD.js", "system/firstPersonHMD.js",
"system/tablet-ui/tabletUI.js", "system/tablet-ui/tabletUI.js"
"system/commerce/wallet.js"
]; ];
var DEFAULT_SCRIPTS_SEPARATE = [ var DEFAULT_SCRIPTS_SEPARATE = [
"system/controllers/controllerScripts.js", "system/controllers/controllerScripts.js",

3
scripts/system/commerce/wallet.js
View file

@ -126,7 +126,8 @@
button = tablet.addButton({ button = tablet.addButton({
text: buttonName, text: buttonName,
icon: "icons/tablet-icons/wallet-i.svg", icon: "icons/tablet-icons/wallet-i.svg",
activeIcon: "icons/tablet-icons/wallet-a.svg" activeIcon: "icons/tablet-icons/wallet-a.svg",
sortOrder: 10
}); });
button.clicked.connect(onButtonClicked); button.clicked.connect(onButtonClicked);
tablet.screenChanged.connect(onTabletScreenChanged); tablet.screenChanged.connect(onTabletScreenChanged);