From bd40b9d8b1a7d055f2ccef753b02e7fc90ff68a5 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Wed, 6 Jan 2021 21:12:58 -0500 Subject: [PATCH] Various updates --- cli/Cargo.toml | 2 +- cli/src/main.rs | 6 +++--- lib/Cargo.toml | 10 +++++----- ui/qtlib/Cargo.toml | 2 +- ui/qtlib/src/lib.rs | 2 +- ui/src/about.ui | 10 ++++++---- ui/src/main.cpp | 9 ++++++--- ui/src/mainwindow.cpp | 14 ++++++-------- 8 files changed, 29 insertions(+), 26 deletions(-) diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 4db95e2..cbad35c 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -9,6 +9,6 @@ edition = "2018" [dependencies] clap = "2.33.0" -hushpaperlib = { path = "../lib" } +silentdragonpaper = { path = "../lib" } json = "0.11.14" printpdf = "0.3.2" diff --git a/cli/src/main.rs b/cli/src/main.rs index a188ee2..510c320 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -1,11 +1,11 @@ extern crate clap; -extern crate hushpaperlib; +extern crate silentdragonpaperlib; mod version; use clap::{Arg, App}; -use hushpaperlib::paper::*; -use hushpaperlib::pdf; +use silentdragonpaperlib::paper::*; +use silentdragonpaperlib::pdf; use std::io; use std::io::prelude::*; diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 8b10d45..8530587 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -1,9 +1,9 @@ [package] -name = "hushpaperlib" -version = "0.1.2" +name = "silentdragonpaper" +version = "0.2.0" authors = [ - "ZecWallet", - "The Hush developers" + "The Hush developers", + "ZecWallet" ] edition = "2018" @@ -14,7 +14,7 @@ default = ["printpdf"] rand = "0.5" hex = "0.3" bech32 = "0.6" -zcash_primitives = { git = "https://github.com/gilardh/librustzcash", rev = "5a48d179b8434a0318e7e19dda506e245a904092" } +zcash_primitives = { git = "https://git.hush.is/hush/librustzcash", rev = "5a48d179b8434a0318e7e19dda506e245a904092" } json = "0.11.14" qrcode = { version = "0.8", default-features = false } printpdf = { version = "0.3.2", optional = true } diff --git a/ui/qtlib/Cargo.toml b/ui/qtlib/Cargo.toml index 31cbe8f..b8a1ea4 100644 --- a/ui/qtlib/Cargo.toml +++ b/ui/qtlib/Cargo.toml @@ -10,4 +10,4 @@ crate-type = ["staticlib"] [dependencies] libc = "0.2.58" -hushpaperlib = { path = "../../lib" } \ No newline at end of file +silentdragonpaperlib = { path = "../../lib" } \ No newline at end of file diff --git a/ui/qtlib/src/lib.rs b/ui/qtlib/src/lib.rs index b0a9738..d2c552f 100644 --- a/ui/qtlib/src/lib.rs +++ b/ui/qtlib/src/lib.rs @@ -1,6 +1,6 @@ use libc::{c_char}; use std::ffi::{CStr, CString}; -use hushpaperlib::{pdf, paper}; +use silentdragonpaperlib::{pdf, paper}; /** * Call into rust to generate a paper wallet. Returns the paper wallet in JSON form. diff --git a/ui/src/about.ui b/ui/src/about.ui index cb49598..4bbfdd9 100644 --- a/ui/src/about.ui +++ b/ui/src/about.ui @@ -11,7 +11,7 @@ - About hushpaperwallet + About SilentDragonPaper @@ -42,7 +42,9 @@ - <html><head/><body><pre style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'monospace';">MIT License</span></pre><pre style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'monospace';"><br/></pre><pre style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'monospace';">Copyright (c) 2019 Aditya Kulkarni</span></pre><pre style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'monospace';"><br/></pre><pre style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'monospace';">Permission is hereby granted, free of charge, to any person obtaining a copy</span></pre><pre style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'monospace';">of this software and associated documentation files (the &quot;Software&quot;), to deal</span></pre><pre style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'monospace';">in the Software without restriction, including without limitation the rights</span></pre><pre style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'monospace';">to use, copy, modify, merge, publish, distribute, sublicense, and/or sell</span></pre><pre style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'monospace';">copies of the Software, and to permit persons to whom the Software is</span></pre><pre style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'monospace';">furnished to do so, subject to the following conditions:</span></pre><pre style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'monospace';"><br/></pre><pre style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'monospace';">The above copyright notice and this permission notice shall be included in all</span></pre><pre style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'monospace';">copies or substantial portions of the Software.</span></pre><pre style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'monospace';"><br/></pre><pre style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'monospace';">THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</span></pre><pre style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'monospace';">IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</span></pre><pre style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'monospace';">FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE</span></pre><pre style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'monospace';">AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER</span></pre><pre style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'monospace';">LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,</span></pre><pre style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'monospace';">OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span></pre><pre style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'monospace';">SOFTWARE.</span></pre></body></html> + +GPLv3 FREE SOFTWARE + Qt::RichText @@ -59,13 +61,13 @@ - hushpaperwallet + SilentDragonPaper - hushpaperwallet version 1.0(6 May 2009) + SilentDragonPaper diff --git a/ui/src/main.cpp b/ui/src/main.cpp index 8c5d264..2871fc9 100644 --- a/ui/src/main.cpp +++ b/ui/src/main.cpp @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html #include "mainwindow.h" #include "version.h" #include @@ -7,8 +10,8 @@ int main(int argc, char *argv[]) QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - QCoreApplication::setOrganizationDomain("hushwallet.co"); - QCoreApplication::setOrganizationName("hushpaperwallet"); + QCoreApplication::setOrganizationDomain("hush.is"); + QCoreApplication::setOrganizationName("Hush"); #ifdef Q_OS_LINUX QFontDatabase::addApplicationFont(":/fonts/res/Ubuntu-R.ttf"); @@ -18,7 +21,7 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); MainWindow w; - w.setWindowTitle(QString("hushpaperwallet ") + APP_VERSION); + w.setWindowTitle(QString("Extreme Privacy: SilentDragonPaper ") + APP_VERSION); w.show(); diff --git a/ui/src/mainwindow.cpp b/ui/src/mainwindow.cpp index 11d9560..7849e73 100644 --- a/ui/src/mainwindow.cpp +++ b/ui/src/mainwindow.cpp @@ -1,13 +1,13 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html #include - #include "precompiled.h" - #include "mainwindow.h" #include "version.h" #include "ui_mainwindow.h" #include "ui_wallet.h" #include "ui_about.h" - #include "hushpaperrust.h" void SaveRestore(QDialog* d) { @@ -33,9 +33,7 @@ QString SplitIntoLines(QString s, int maxlen) { return ans.join("\n"); } -/** - * Add a wallet (address + pk) section to the given vertical layout - */ +// Add a wallet (address + pk) section to the given vertical layout void AddWallet(QString address, QString pk, QWidget* scroll) { Ui_WalletWidget w; auto g1 = new QGroupBox(scroll); @@ -172,7 +170,7 @@ MainWindow::MainWindow(QWidget *parent) : // Help site QObject::connect(ui->actionHelp_site, &QAction::triggered, [=]() { - QDesktopServices::openUrl(QUrl("https://docs.hushwallet.co/paper")); + QDesktopServices::openUrl(QUrl("https://faq.hush.is/sdp")); }); // About button @@ -180,7 +178,7 @@ MainWindow::MainWindow(QWidget *parent) : QDialog ad(this); Ui_AboutDialog d; d.setupUi(&ad); - d.lblVersion->setText(QString("hushpaperwallet ") + APP_VERSION + "(" + APP_BUILD_DATE + ")"); + d.lblVersion->setText(QString("SilentDragonPaper ") + APP_VERSION + "(" + APP_BUILD_DATE + ")"); SaveRestore(&ad); ad.exec();