From 17a99960c7d5b1482675fc83e44cb4f17f2069a5 Mon Sep 17 00:00:00 2001 From: Peter Bushnell Date: Fri, 22 May 2020 08:59:07 +0100 Subject: [PATCH 1/2] Modal overlay back wallet text appears truncated --- src/qt/forms/modaloverlay.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qt/forms/modaloverlay.ui b/src/qt/forms/modaloverlay.ui index b1f539eb94..73acd9e465 100644 --- a/src/qt/forms/modaloverlay.ui +++ b/src/qt/forms/modaloverlay.ui @@ -424,7 +424,7 @@ - Please backup your wallet as soon + Please backup your wallet as soon as possible. Please make sure to keep an updated antivirus and operating system. We can not recover Your funds if you visit phishing site or lose your backup. Please make sure to keep backups of your private keys or files. We do not store your private keys on this wallet. And you as a user, are entirely responsible for your funds and your own security. From 67e96c047e3f38facb7c6999fc2e34c72c9905e7 Mon Sep 17 00:00:00 2001 From: timemarkovqtum Date: Tue, 26 May 2020 11:11:49 +0200 Subject: [PATCH 2/2] Add Staking, Delegations and Super Staking under one menu --- src/qt/bitcoingui.cpp | 39 ++++++++++++++++----------------------- src/qt/bitcoingui.h | 1 + 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 1a7e8da365..12010c461e 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -326,12 +326,16 @@ void BitcoinGUI::createActions() sendToContractAction = new QAction(tr("Send To"), this); callContractAction = new QAction(tr("Call"), this); - stakeAction = new QAction(platformStyle->MultiStatesIcon(":/icons/tx_mined"), tr("&Stake"), this); - stakeAction->setStatusTip(tr("Show stake of wallet")); - stakeAction->setToolTip(stakeAction->statusTip()); - stakeAction->setCheckable(true); - stakeAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_4)); - tabGroup->addAction(stakeAction); + walletStakeAction = new QAction(platformStyle->MultiStatesIcon(":/icons/tx_mined"), tr("&Stake"), this); + walletStakeAction->setStatusTip(tr("Show stake of wallet")); + walletStakeAction->setToolTip(walletStakeAction->statusTip()); + walletStakeAction->setCheckable(true); + walletStakeAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_4)); + tabGroup->addAction(walletStakeAction); + + stakeAction = new QAction(tr("Staking"), this); + delegationAction = new QAction(tr("Delegations"), this); + superStakerAction = new QAction(tr("Super Staking"), this); QRCTokenAction = new QAction(platformStyle->MultiStatesIcon(":/icons/qrctoken"), tr("&QRC Tokens"), this); QRCTokenAction->setStatusTip(tr("QRC Tokens (send, receive or add Tokens in list)")); @@ -340,20 +344,6 @@ void BitcoinGUI::createActions() QRCTokenAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_5)); tabGroup->addAction(QRCTokenAction); - delegationAction = new QAction(platformStyle->MultiStatesIcon(":/icons/tx_mined"), tr("&Delegations"), this); - delegationAction->setStatusTip(tr("Delegate coins for staking to supers stakers")); - delegationAction->setToolTip(delegationAction->statusTip()); - delegationAction->setCheckable(true); - delegationAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_6)); - tabGroup->addAction(delegationAction); - - superStakerAction = new QAction(platformStyle->MultiStatesIcon(":/icons/tx_mined"), tr("S&uper Stakers"), this); - superStakerAction->setStatusTip(tr("Supers stakers (add, remove and configure super stakers)")); - superStakerAction->setToolTip(superStakerAction->statusTip()); - superStakerAction->setCheckable(true); - superStakerAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_7)); - tabGroup->addAction(superStakerAction); - #ifdef ENABLE_WALLET // These showNormalIfMinimized are needed because Send Coins and Receive Coins // can be triggered from the tray menu, and need to show the GUI to be useful. @@ -633,10 +623,12 @@ void BitcoinGUI::createToolBars() contractActions.append(sendToContractAction); contractActions.append(callContractAction); appNavigationBar->mapGroup(smartContractAction, contractActions); - appNavigationBar->addAction(stakeAction); + QList walletStakeActions; + walletStakeActions.append(stakeAction); + walletStakeActions.append(delegationAction); + walletStakeActions.append(superStakerAction); + appNavigationBar->mapGroup(walletStakeAction, walletStakeActions); appNavigationBar->addAction(QRCTokenAction); - appNavigationBar->addAction(delegationAction); - appNavigationBar->addAction(superStakerAction); appNavigationBar->buildUi(); overviewAction->setChecked(true); } @@ -853,6 +845,7 @@ void BitcoinGUI::setWalletActionsEnabled(bool enabled) stakeAction->setEnabled(enabled); delegationAction->setEnabled(enabled); superStakerAction->setEnabled(enabled); + walletStakeAction->setEnabled(enabled); m_close_wallet_action->setEnabled(enabled); } diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index fe6a361c61..bf05fbaaf2 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -170,6 +170,7 @@ class BitcoinGUI : public QMainWindow QAction* addTokenAction = nullptr; QAction* delegationAction = nullptr; QAction* superStakerAction = nullptr; + QAction* walletStakeAction = nullptr; QAction* m_create_wallet_action{nullptr}; QAction* m_open_wallet_action{nullptr}; QMenu* m_open_wallet_menu{nullptr};