diff --git a/src/mainwindow.h b/src/mainwindow.h index ca42422..b8e2dd3 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -57,8 +57,8 @@ private: void removeExtraAddresses(); void setDefaultPayFrom(); - Tx createTxFromSendPage(); - bool confirmTx(Tx tx, ToFields devFee); + Tx createTxFromSendPage(); + bool confirmTx(Tx tx, ToFields devFee); void turnstileDoMigration(QString fromAddr = ""); void turnstileProgress(); diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 81e3a5f..95dee31 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -22,7 +22,7 @@ - 0 + 3 @@ -316,8 +316,8 @@ 0 0 - 841 - 321 + 849 + 369 @@ -718,12 +718,12 @@ 0 0 889 - 22 + 19 - + - File + &File @@ -733,49 +733,52 @@ - Help + &Help - + - Exit + E&xit - About + &About - Settings + &Settings + + + Ctrl+P - Donate + &Donate - Check github.com for Updates + Check github.com for &Updates - Sapling Turnstile + Sapling &Turnstile - Import Private Key + &Import Private Key diff --git a/src/ui_mainwindow.h b/src/ui_mainwindow.h index 155e99d..854ecd8 100644 --- a/src/ui_mainwindow.h +++ b/src/ui_mainwindow.h @@ -135,7 +135,7 @@ public: QVBoxLayout *verticalLayout_2; QTableView *transactionsTable; QMenuBar *menuBar; - QMenu *menuBalance; + QMenu *menuFile; QMenu *menuHelp; QStatusBar *statusBar; @@ -367,7 +367,7 @@ public: sendToScrollArea->setWidgetResizable(true); sendToWidgets = new QWidget(); sendToWidgets->setObjectName(QStringLiteral("sendToWidgets")); - sendToWidgets->setGeometry(QRect(0, 0, 841, 321)); + sendToWidgets->setGeometry(QRect(0, 0, 849, 369)); sendToLayout = new QVBoxLayout(sendToWidgets); sendToLayout->setSpacing(6); sendToLayout->setContentsMargins(11, 11, 11, 11); @@ -641,9 +641,9 @@ public: MainWindow->setCentralWidget(centralWidget); menuBar = new QMenuBar(MainWindow); menuBar->setObjectName(QStringLiteral("menuBar")); - menuBar->setGeometry(QRect(0, 0, 889, 22)); - menuBalance = new QMenu(menuBar); - menuBalance->setObjectName(QStringLiteral("menuBalance")); + menuBar->setGeometry(QRect(0, 0, 889, 19)); + menuFile = new QMenu(menuBar); + menuFile->setObjectName(QStringLiteral("menuFile")); menuHelp = new QMenu(menuBar); menuHelp->setObjectName(QStringLiteral("menuHelp")); MainWindow->setMenuBar(menuBar); @@ -667,20 +667,20 @@ public: QWidget::setTabOrder(btnRecieveNewAddr, txtRecieve); QWidget::setTabOrder(txtRecieve, transactionsTable); - menuBar->addAction(menuBalance->menuAction()); + menuBar->addAction(menuFile->menuAction()); menuBar->addAction(menuHelp->menuAction()); - menuBalance->addAction(actionImport_Private_Key); - menuBalance->addAction(actionTurnstile_Migration); - menuBalance->addAction(actionSettings); - menuBalance->addSeparator(); - menuBalance->addAction(actionExit); + menuFile->addAction(actionImport_Private_Key); + menuFile->addAction(actionTurnstile_Migration); + menuFile->addAction(actionSettings); + menuFile->addSeparator(); + menuFile->addAction(actionExit); menuHelp->addAction(actionDonate); menuHelp->addAction(actionCheck_for_Updates); menuHelp->addAction(actionAbout); retranslateUi(MainWindow); - tabWidget->setCurrentIndex(0); + tabWidget->setCurrentIndex(3); QMetaObject::connectSlotsByName(MainWindow); @@ -689,13 +689,16 @@ public: void retranslateUi(QMainWindow *MainWindow) { MainWindow->setWindowTitle(QApplication::translate("MainWindow", "zec-qt-wallet", nullptr)); - actionExit->setText(QApplication::translate("MainWindow", "Exit", nullptr)); - actionAbout->setText(QApplication::translate("MainWindow", "About", nullptr)); - actionSettings->setText(QApplication::translate("MainWindow", "Settings", nullptr)); - actionDonate->setText(QApplication::translate("MainWindow", "Donate", nullptr)); - actionCheck_for_Updates->setText(QApplication::translate("MainWindow", "Check github.com for Updates", nullptr)); - actionTurnstile_Migration->setText(QApplication::translate("MainWindow", "Sapling Turnstile", nullptr)); - actionImport_Private_Key->setText(QApplication::translate("MainWindow", "Import Private Key", nullptr)); + actionExit->setText(QApplication::translate("MainWindow", "E&xit", nullptr)); + actionAbout->setText(QApplication::translate("MainWindow", "&About", nullptr)); + actionSettings->setText(QApplication::translate("MainWindow", "&Settings", nullptr)); +#ifndef QT_NO_SHORTCUT + actionSettings->setShortcut(QApplication::translate("MainWindow", "Ctrl+P", nullptr)); +#endif // QT_NO_SHORTCUT + actionDonate->setText(QApplication::translate("MainWindow", "&Donate", nullptr)); + actionCheck_for_Updates->setText(QApplication::translate("MainWindow", "Check github.com for &Updates", nullptr)); + actionTurnstile_Migration->setText(QApplication::translate("MainWindow", "Sapling &Turnstile", nullptr)); + actionImport_Private_Key->setText(QApplication::translate("MainWindow", "&Import Private Key", nullptr)); groupBox->setTitle(QApplication::translate("MainWindow", "Summary", nullptr)); label->setText(QApplication::translate("MainWindow", "Shielded", nullptr)); balSheilded->setText(QString()); @@ -740,8 +743,8 @@ public: qrcodeDisplay->setText(QString()); tabWidget->setTabText(tabWidget->indexOf(tab_3), QApplication::translate("MainWindow", "Receive", nullptr)); tabWidget->setTabText(tabWidget->indexOf(tab_4), QApplication::translate("MainWindow", "Transactions", nullptr)); - menuBalance->setTitle(QApplication::translate("MainWindow", "File", nullptr)); - menuHelp->setTitle(QApplication::translate("MainWindow", "Help", nullptr)); + menuFile->setTitle(QApplication::translate("MainWindow", "&File", nullptr)); + menuHelp->setTitle(QApplication::translate("MainWindow", "&Help", nullptr)); } // retranslateUi }; diff --git a/zec-qt-wallet.pro b/zec-qt-wallet.pro index ebda8db..d6e2cd9 100644 --- a/zec-qt-wallet.pro +++ b/zec-qt-wallet.pro @@ -76,7 +76,7 @@ FORMS += \ src/confirm.ui \ src/turnstile.ui \ src/turnstileprogress.ui \ - src/privkey.ui + src/privkey.ui \ src/memodialog.ui # Default rules for deployment.