diff --git a/ui/mkdockerwinlinux.sh b/ui/mkdockerwinlinux.sh index 7b849ec..1e0a317 100755 --- a/ui/mkdockerwinlinux.sh +++ b/ui/mkdockerwinlinux.sh @@ -54,3 +54,5 @@ make -j4 strip release/zecpaperwalletui.exe cp release/zecpaperwalletui.exe artifacts/Windows-zecpaperwallet-v$APP_VERSION +# Cleanup before exiting +make distclean \ No newline at end of file diff --git a/ui/mkrelease.sh b/ui/mkrelease.sh index 09462df..544e21d 100755 --- a/ui/mkrelease.sh +++ b/ui/mkrelease.sh @@ -76,7 +76,6 @@ cargo build --release # For Windows and Linux, build via docker docker run --rm -v $(pwd)/..:/opt/zecpaperwallet rust/zecpaperwallet:v0.2 bash -c "cd /opt/zecpaperwallet/cli && cargo build --release --target x86_64-unknown-linux-musl && cargo build --release --target x86_64-pc-windows-gnu && cargo build --release --target aarch64-unknown-linux-gnu" - # Come back and package everything cd ../ui diff --git a/ui/papersapling.pro b/ui/papersapling.pro index 2ed0e01..91f4305 100644 --- a/ui/papersapling.pro +++ b/ui/papersapling.pro @@ -49,7 +49,9 @@ HEADERS += \ src/qrcode/BitBuffer.hpp \ src/qrcode/QrCode.hpp \ src/qrcode/QrSegment.hpp \ - qtlib/src/zecpaperrust.h + src/version.h \ + qtlib/src/zecpaperrust.h + FORMS += \ src/about.ui \ diff --git a/ui/qtlib/src/main.cpp b/ui/qtlib/src/main.cpp deleted file mode 100644 index 14bff87..0000000 --- a/ui/qtlib/src/main.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include -#include - -#include "zecpaperrust.h" - -using namespace std; - -int main() { - char * from_rust = rust_generate_wallet(true, 1, 1, "user-provided-entropy"); - auto stri = string(from_rust); - rust_free_string(from_rust); - - cout << stri << endl; - rust_save_to_pdf(stri.c_str(), "output.pdf"); - - return 0; -} \ No newline at end of file diff --git a/ui/src/main.cpp b/ui/src/main.cpp index ba3215c..2497bf8 100644 --- a/ui/src/main.cpp +++ b/ui/src/main.cpp @@ -1,4 +1,5 @@ #include "mainwindow.h" +#include "version.h" #include int main(int argc, char *argv[]) @@ -16,6 +17,9 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); MainWindow w; + + w.setWindowTitle(QString("zecpaperwallet ") + APP_VERSION); + w.show(); return a.exec(); diff --git a/ui/src/mainwindow.cpp b/ui/src/mainwindow.cpp index e08cfff..5045e9d 100644 --- a/ui/src/mainwindow.cpp +++ b/ui/src/mainwindow.cpp @@ -3,6 +3,7 @@ #include "precompiled.h" #include "mainwindow.h" +#include "version.h" #include "ui_mainwindow.h" #include "ui_wallet.h" #include "ui_about.h" @@ -163,7 +164,7 @@ MainWindow::MainWindow(QWidget *parent) : QDialog ad(this); Ui_AboutDialog d; d.setupUi(&ad); - + d.lblVersion->setText(QString("zecpaperwallet ") + APP_VERSION + "(" + APP_BUILD_DATE + ")"); SaveRestore(&ad); ad.exec(); diff --git a/ui/src/mainwindow.ui b/ui/src/mainwindow.ui index 51922d9..24e2ffa 100644 --- a/ui/src/mainwindow.ui +++ b/ui/src/mainwindow.ui @@ -110,6 +110,9 @@ + + QAbstractScrollArea::AdjustToContents + true @@ -118,8 +121,8 @@ 0 0 - 889 - 428 + 907 + 654 @@ -134,7 +137,7 @@ 0 0 927 - 39 + 22 diff --git a/ui/src/qrcodelabel.cpp b/ui/src/qrcodelabel.cpp index 18cde71..88aef3b 100644 --- a/ui/src/qrcodelabel.cpp +++ b/ui/src/qrcodelabel.cpp @@ -21,7 +21,7 @@ void QRCodeLabel::resizeEvent(QResizeEvent*) QPixmap QRCodeLabel::scaledPixmap() const { QPixmap pm(size()); - pm.fill(Qt::white); + pm.fill(Qt::transparent); QPainter painter(&pm); qrcodegen::QrCode qr = qrcodegen::QrCode::encodeText(str.toUtf8().constData(), qrcodegen::QrCode::Ecc::LOW); diff --git a/ui/src/version.h b/ui/src/version.h new file mode 100644 index 0000000..d1abab5 --- /dev/null +++ b/ui/src/version.h @@ -0,0 +1,2 @@ +#define APP_VERSION "0.1" +#define APP_BUILD_DATE "20 Jun 2019" \ No newline at end of file diff --git a/ui/src/wallet.ui b/ui/src/wallet.ui index 8cef288..7911ad4 100644 --- a/ui/src/wallet.ui +++ b/ui/src/wallet.ui @@ -129,6 +129,12 @@ + + + 0 + 0 + + TextLabel @@ -136,6 +142,12 @@ + + + 0 + 0 + + false