From 030443393f2ccf0d1e9ce28e6e6c50f23a2b1e14 Mon Sep 17 00:00:00 2001
From: DenioD <41270280+DenioD@users.noreply.github.com>
Date: Sat, 30 May 2020 22:46:57 +0200
Subject: [PATCH] rename sdlogo, refresh at new contact
---
application.qrc | 2 +-
lib/Cargo.lock | 6 ++---
lib/Cargo.toml | 2 +-
res/{sdlogo.png => SDLogo.png} | Bin
src/FileSystem/FileSystem.cpp | 2 +-
src/addressbook.cpp | 42 +++++++++++++++++----------------
src/chatmodel.cpp | 34 +++++++++++++++++---------
7 files changed, 51 insertions(+), 37 deletions(-)
rename res/{sdlogo.png => SDLogo.png} (100%)
diff --git a/application.qrc b/application.qrc
index bb3c02c..d62ea29 100644
--- a/application.qrc
+++ b/application.qrc
@@ -9,7 +9,7 @@
res/icon.ico
res/mail.png
res/darkwing.png
- res/sdlogo.png
+ res/SDLogo.png
res/sdlogo2.png
res/Berg.png
res/Denio.png
diff --git a/lib/Cargo.lock b/lib/Cargo.lock
index e0ea0c9..d1c7722 100644
--- a/lib/Cargo.lock
+++ b/lib/Cargo.lock
@@ -1177,7 +1177,7 @@ version = "0.1.0"
dependencies = [
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
- "silentdragonlitelib 0.1.0 (git+https://github.com/DenioD/silentdragonlite-cli?rev=d196ad938a22810c0b6b4164e6bf8f1db0409763)",
+ "silentdragonlitelib 0.1.0 (git+https://github.com/DenioD/silentdragonlite-cli?rev=d2887d07879a93bdd9b2c8bd12504bb977e82fe0)",
]
[[package]]
@@ -1640,7 +1640,7 @@ dependencies = [
[[package]]
name = "silentdragonlitelib"
version = "0.1.0"
-source = "git+https://github.com/DenioD/silentdragonlite-cli?rev=d196ad938a22810c0b6b4164e6bf8f1db0409763#d196ad938a22810c0b6b4164e6bf8f1db0409763"
+source = "git+https://github.com/DenioD/silentdragonlite-cli?rev=d2887d07879a93bdd9b2c8bd12504bb977e82fe0#d2887d07879a93bdd9b2c8bd12504bb977e82fe0"
dependencies = [
"base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bellman 0.1.0 (git+https://github.com/MyHush/librustzcash.git?rev=1a0204113d487cdaaf183c2967010e5214ff9e37)",
@@ -2631,7 +2631,7 @@ dependencies = [
"checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35"
"checksum sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "27044adfd2e1f077f649f59deb9490d3941d674002f7d062870a60ebe9bd47a0"
"checksum signal-hook-registry 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41"
-"checksum silentdragonlitelib 0.1.0 (git+https://github.com/DenioD/silentdragonlite-cli?rev=d196ad938a22810c0b6b4164e6bf8f1db0409763)" = ""
+"checksum silentdragonlitelib 0.1.0 (git+https://github.com/DenioD/silentdragonlite-cli?rev=d2887d07879a93bdd9b2c8bd12504bb977e82fe0)" = ""
"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
"checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
"checksum socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85"
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
index dba0c30..d46b55f 100644
--- a/lib/Cargo.toml
+++ b/lib/Cargo.toml
@@ -11,4 +11,4 @@ crate-type = ["staticlib"]
[dependencies]
libc = "0.2.58"
lazy_static = "1.4.0"
-silentdragonlitelib = { git = "https://github.com/DenioD/silentdragonlite-cli", rev = "d196ad938a22810c0b6b4164e6bf8f1db0409763" }
+silentdragonlitelib = { git = "https://github.com/DenioD/silentdragonlite-cli", rev = "d2887d07879a93bdd9b2c8bd12504bb977e82fe0" }
diff --git a/res/sdlogo.png b/res/SDLogo.png
similarity index 100%
rename from res/sdlogo.png
rename to res/SDLogo.png
diff --git a/src/FileSystem/FileSystem.cpp b/src/FileSystem/FileSystem.cpp
index d31d5f4..055ca88 100644
--- a/src/FileSystem/FileSystem.cpp
+++ b/src/FileSystem/FileSystem.cpp
@@ -103,7 +103,7 @@ QList FileSystem::readContactsOldFormat(QString file)
{
ContactItem contact = ContactItem(stuff[i][0],stuff[i][1], stuff[i][2], stuff[i][3],stuff[i][4]);
contacts.push_back(contact);
- i++;
+
}
_file.close();
diff --git a/src/addressbook.cpp b/src/addressbook.cpp
index 28a0f9e..591a9c0 100644
--- a/src/addressbook.cpp
+++ b/src/addressbook.cpp
@@ -39,9 +39,7 @@ void AddressBookModel::loadData()
parent->horizontalHeader()->restoreState(
QSettings().value(
"addresstablegeometry"
- ).toByteArray()
-
-
+ ).toByteArray()
);
}
@@ -241,9 +239,14 @@ void AddressBook::open(MainWindow* parent, QLineEdit* target)
return;
- rpc->refresh(true);
+ // rpc->refresh(true);
model.updateUi();
+ rpc->refreshContacts(
+ parent->ui->listContactWidget
+
+ );
+
});
// AddressBook::getInstance()->addAddressLabel(newLabel, ab.addr->text(), cid);
@@ -394,37 +397,36 @@ void AddressBook::readFromStorage()
QList> stuff;
in >> stuff;
//qDebug() << "Stuff: " << stuff;
+
for (int i=0; i < stuff.size(); i++)
{
- //qDebug() << "0:" << stuff[i][0];
+ //qDebug() << "0:" << stuff[i][0];
//qDebug() << "1:" << stuff[i][1];
//qDebug() << "2:" << stuff[i][2];
ContactItem contact = ContactItem(stuff[i][0],stuff[i][1], stuff[i][2], stuff[i][3],stuff[i][4]);
//qDebug() << "contact=" << contact.toQTString();
allLabels.push_back(contact);
}
-
- {
- qDebug() << "Read " << version << " Hush contacts from disk...";
-
+
+ qDebug() << "Read " << version << " Hush contacts from disk...";
file.close();
}
- }else{
- {
- qDebug() << "No Hush contacts found on disk!";
- }
- }
- // allLabels = FileSystem::getInstance()->readContacts(AddressBook::writeableFile());
-
- // test to see if the contact items in datastore are correctly dumped to json
- for(ContactItem item: allLabels)
+ else
{
- DataStore::getContactDataStore()->setData(item.getCid(), item);
+ qDebug() << "No Hush contacts found on disk!";
}
- AddressBook::writeToStorage();
+ // Special.
+ // Add the default silentdragon donation address if it isn't already present
+ // QList allAddresses;
+ // std::transform(allLabels.begin(), allLabels.end(),
+ // std::back_inserter(allAddresses), [=] (auto i) { return i.getPartnerAddress(); });
+ // if (!allAddresses.contains(Settings::getDonationAddr(true))) {
+ // allLabels.append(QPair("silentdragon donation", Settings::getDonationAddr(true)));
+ // }
}
+
void AddressBook::writeToStorage()
{
//FileSystem::getInstance()->writeContacts(AddressBook::writeableFile(), DataStore::getContactDataStore()->dump());
diff --git a/src/chatmodel.cpp b/src/chatmodel.cpp
index ee3fe6d..3e15300 100644
--- a/src/chatmodel.cpp
+++ b/src/chatmodel.cpp
@@ -240,16 +240,18 @@ void MainWindow::renderContactRequest(){
qDebug()<<"Beginn kopiert" <addAddressLabel(newLabel, addr, myAddr, cid, avatar);
- QMessageBox::information(this, "Added Contact","successfully added your new contact. You can now Chat with this contact");
+ QMessageBox::information(this, "Added Contact","successfully added your new contact. You can now Chat with this contact");
+ rpc->refreshContacts(
+ ui->listContactWidget
+
+ );
+
});
dialog.exec();
- rpc->refreshContacts(
- ui->listContactWidget
-
- );
+
}
void ChatModel::addCid(QString tx, QString cid)
@@ -374,10 +376,7 @@ Tx MainWindow::createTxFromChatPage() {
QString hmemo= createHeaderMemo(type,cid,myAddr);
- QString memo = ui->memoTxtChat->toPlainText().trimmed();
-
-
-
+ QString memo = ui->memoTxtChat->toPlainText().trimmed();
tx.toAddrs.push_back(ToFields{addr, amt, hmemo});
tx.toAddrs.push_back(ToFields{addr, amt, memo});
@@ -547,7 +546,8 @@ void::MainWindow::addContact()
request.setupUi(&dialog);
Settings::saveRestore(&dialog);
-
+ try
+ {
bool sapling = true;
rpc->createNewZaddr(sapling, [=] (json reply) {
QString myAddr = QString::fromStdString(reply.get()[0]);
@@ -557,8 +557,20 @@ void::MainWindow::addContact()
ui->listReceiveAddresses->setCurrentIndex(0);
qDebug() << "new generated myAddr add Contact" << myAddr;
});
+
+ }catch(...)
+ {
+
+
+ qDebug() << QString("Caught something nasty with myZaddr Contact");
+ }
+
+ QString cid = QUuid::createUuid().toString(QUuid::WithoutBraces);
+
+
+
- QString cid = QUuid::createUuid().toString(QUuid::WithoutBraces);
+