diff --git a/README.md b/README.md index 7569ce5..f8e4474 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ zcash-qt-wallet is a z-Addr first wallet UI frontend for zcashd +![Screenshot](docs/screenshot-main.png?raw=true) + # Installation zcash-qt-wallet needs a zcash node running zcashd. Download the zcash node software from https://z.cash/download/ and start zcashd. @@ -27,6 +29,7 @@ in File->Settings. zcash-qt-wallet depends on QT5, which you can get from here: https://www.qt.io/download ### Compiling on Linux +You need a C++14 compatible compiler like g++ or clang++ ``` git clone https://github.com/adityapk00/zcash-qt-wallet.git diff --git a/application.qrc b/application.qrc index 3979228..1b2fcc7 100644 --- a/application.qrc +++ b/application.qrc @@ -5,6 +5,6 @@ res/connected.png res/loading.gif - - + res/icon.ico + diff --git a/docs/index.html b/docs/index.html index a82f076..e4474c2 100755 --- a/docs/index.html +++ b/docs/index.html @@ -3,4 +3,4 @@ Hello World - \ No newline at end of file + diff --git a/docs/screenshot-main.png b/docs/screenshot-main.png new file mode 100644 index 0000000..af3aa99 Binary files /dev/null and b/docs/screenshot-main.png differ diff --git a/res/icon.ico b/res/icon.ico new file mode 100644 index 0000000..079f74a Binary files /dev/null and b/res/icon.ico differ diff --git a/src/main.cpp b/src/main.cpp index 289ca8e..60c1b7b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -7,6 +7,8 @@ int main(int argc, char *argv[]) QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication a(argc, argv); + QIcon icon(":/icons/res/icon.ico"); + a.setWindowIcon(icon); #ifdef Q_OS_LINUX QFontDatabase::addApplicationFont(":/fonts/res/Ubuntu-R.ttf"); @@ -19,6 +21,7 @@ int main(int argc, char *argv[]) MainWindow w; + w.show(); return QApplication::exec(); diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 667a924..dc9706a 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -11,7 +11,11 @@ - MainWindow + zcash-qt-wallet + + + + :/icons/res/icon.ico:/icons/res/icon.ico @@ -247,8 +251,8 @@ 0 0 - 772 - 218 + 823 + 226 @@ -675,6 +679,8 @@ txtRecieve transactionsTable - + + + diff --git a/src/settings.ui b/src/settings.ui index c5d5176..732ef72 100644 --- a/src/settings.ui +++ b/src/settings.ui @@ -7,7 +7,7 @@ 0 0 400 - 300 + 362 @@ -130,11 +130,6 @@ - - - Options - - diff --git a/src/ui_mainwindow.h b/src/ui_mainwindow.h index e8c54bf..b4b22c7 100644 --- a/src/ui_mainwindow.h +++ b/src/ui_mainwindow.h @@ -10,6 +10,7 @@ #define UI_MAINWINDOW_H #include +#include #include #include #include @@ -136,6 +137,9 @@ public: if (MainWindow->objectName().isEmpty()) MainWindow->setObjectName(QStringLiteral("MainWindow")); MainWindow->resize(889, 603); + QIcon icon; + icon.addFile(QStringLiteral(":/icons/res/icon.ico"), QSize(), QIcon::Normal, QIcon::Off); + MainWindow->setWindowIcon(icon); actionExit = new QAction(MainWindow); actionExit->setObjectName(QStringLiteral("actionExit")); actionAbout = new QAction(MainWindow); @@ -330,7 +334,7 @@ public: sendToScrollArea->setWidgetResizable(true); sendToWidgets = new QWidget(); sendToWidgets->setObjectName(QStringLiteral("sendToWidgets")); - sendToWidgets->setGeometry(QRect(0, 0, 772, 218)); + sendToWidgets->setGeometry(QRect(0, 0, 823, 226)); sendToLayout = new QVBoxLayout(sendToWidgets); sendToLayout->setSpacing(6); sendToLayout->setContentsMargins(11, 11, 11, 11); @@ -634,7 +638,7 @@ public: void retranslateUi(QMainWindow *MainWindow) { - MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", nullptr)); + MainWindow->setWindowTitle(QApplication::translate("MainWindow", "zcash-qt-wallet", nullptr)); actionExit->setText(QApplication::translate("MainWindow", "Exit", nullptr)); actionAbout->setText(QApplication::translate("MainWindow", "About", nullptr)); actionSettings->setText(QApplication::translate("MainWindow", "Settings", nullptr)); diff --git a/src/ui_settings.h b/src/ui_settings.h index ee25635..98a2a53 100644 --- a/src/ui_settings.h +++ b/src/ui_settings.h @@ -43,14 +43,13 @@ public: QLineEdit *rpcpassword; QLabel *label_2; QSpacerItem *verticalSpacer; - QWidget *tab_2; QDialogButtonBox *buttonBox; void setupUi(QDialog *Settings) { if (Settings->objectName().isEmpty()) Settings->setObjectName(QStringLiteral("Settings")); - Settings->resize(400, 300); + Settings->resize(400, 362); Settings->setModal(true); verticalLayout = new QVBoxLayout(Settings); verticalLayout->setObjectName(QStringLiteral("verticalLayout")); @@ -122,9 +121,6 @@ public: verticalLayout_3->addItem(verticalSpacer); tabWidget->addTab(tab, QString()); - tab_2 = new QWidget(); - tab_2->setObjectName(QStringLiteral("tab_2")); - tabWidget->addTab(tab_2, QString()); verticalLayout->addWidget(tabWidget); @@ -161,7 +157,6 @@ public: label_4->setText(QApplication::translate("Settings", "RPC Password", nullptr)); label_2->setText(QApplication::translate("Settings", "Port", nullptr)); tabWidget->setTabText(tabWidget->indexOf(tab), QApplication::translate("Settings", "Connection", nullptr)); - tabWidget->setTabText(tabWidget->indexOf(tab_2), QApplication::translate("Settings", "Options", nullptr)); } // retranslateUi };