neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Align HD wallet status icon code with Bitcoin code

Browse Source 
Rename labelEncryptionIcon to labelWalletEncryptionIcon
Reorder icons in Makefile.qt.include
Add missing entries in debian/copyright
This commit is contained in:
Alexander Block 2017-09-18 18:34:54 +02:00
parent 5bf3dadcb6
commit ae90d0f09e
4 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/debian/copyright
View File

@ -62,6 +62,10 @@ Files: src/qt/res/icons/tx_mined.png
src/qt/res/src/mine.svg src/qt/res/src/mine.svg
src/qt/res/icons/fontbigger.png src/qt/res/icons/fontbigger.png
src/qt/res/icons/fontsmaller.png src/qt/res/icons/fontsmaller.png
src/qt/res/icons/*/hd_disabled.png
src/qt/res/src/hd_disabled.svg
src/qt/res/icons/*/hd_enabled.png
src/qt/res/src/hd_enabled.svg
Copyright: Jonas Schnelli Copyright: Jonas Schnelli
License: Expat License: Expat
Comment: Comment:

6
src/Makefile.qt.include
View File

@ -215,6 +215,7 @@ RES_ICONS = \
qt/res/icons/drkblue/synced.png \ qt/res/icons/drkblue/synced.png \
qt/res/icons/drkblue/transaction0.png \ qt/res/icons/drkblue/transaction0.png \
qt/res/icons/drkblue/transaction2.png \ qt/res/icons/drkblue/transaction2.png \
qt/res/icons/drkblue/transaction_abandoned.png \
qt/res/icons/drkblue/transaction_conflicted.png \ qt/res/icons/drkblue/transaction_conflicted.png \
qt/res/icons/drkblue/tx_inout.png \ qt/res/icons/drkblue/tx_inout.png \
qt/res/icons/drkblue/tx_input.png \ qt/res/icons/drkblue/tx_input.png \
@ -225,7 +226,6 @@ RES_ICONS = \
qt/res/icons/drkblue/verify.png \ qt/res/icons/drkblue/verify.png \
qt/res/icons/drkblue/fontbigger.png \ qt/res/icons/drkblue/fontbigger.png \
qt/res/icons/drkblue/fontsmaller.png \ qt/res/icons/drkblue/fontsmaller.png \
qt/res/icons/drkblue/transaction_abandoned.png \
qt/res/icons/drkblue/network_disabled.png \ qt/res/icons/drkblue/network_disabled.png \
qt/res/icons/crownium/add.png \ qt/res/icons/crownium/add.png \
qt/res/icons/crownium/address-book.png \ qt/res/icons/crownium/address-book.png \
@ -269,6 +269,7 @@ RES_ICONS = \
qt/res/icons/crownium/synced.png \ qt/res/icons/crownium/synced.png \
qt/res/icons/crownium/transaction0.png \ qt/res/icons/crownium/transaction0.png \
qt/res/icons/crownium/transaction2.png \ qt/res/icons/crownium/transaction2.png \
qt/res/icons/crownium/transaction_abandoned.png \
qt/res/icons/crownium/transaction_conflicted.png \ qt/res/icons/crownium/transaction_conflicted.png \
qt/res/icons/crownium/tx_inout.png \ qt/res/icons/crownium/tx_inout.png \
qt/res/icons/crownium/tx_input.png \ qt/res/icons/crownium/tx_input.png \
@ -279,7 +280,6 @@ RES_ICONS = \
qt/res/icons/crownium/verify.png \ qt/res/icons/crownium/verify.png \
qt/res/icons/crownium/fontbigger.png \ qt/res/icons/crownium/fontbigger.png \
qt/res/icons/crownium/fontsmaller.png \ qt/res/icons/crownium/fontsmaller.png \
qt/res/icons/crownium/transaction_abandoned.png \
qt/res/icons/crownium/network_disabled.png \ qt/res/icons/crownium/network_disabled.png \
qt/res/icons/light/add.png \ qt/res/icons/light/add.png \
qt/res/icons/light/address-book.png \ qt/res/icons/light/address-book.png \
@ -377,6 +377,7 @@ RES_ICONS = \
qt/res/icons/trad/synced.png \ qt/res/icons/trad/synced.png \
qt/res/icons/trad/transaction0.png \ qt/res/icons/trad/transaction0.png \
qt/res/icons/trad/transaction2.png \ qt/res/icons/trad/transaction2.png \
qt/res/icons/trad/transaction_abandoned.png \
qt/res/icons/trad/transaction_conflicted.png \ qt/res/icons/trad/transaction_conflicted.png \
qt/res/icons/trad/tx_inout.png \ qt/res/icons/trad/tx_inout.png \
qt/res/icons/trad/tx_input.png \ qt/res/icons/trad/tx_input.png \
@ -387,7 +388,6 @@ RES_ICONS = \
qt/res/icons/trad/verify.png \ qt/res/icons/trad/verify.png \
qt/res/icons/trad/fontbigger.png \ qt/res/icons/trad/fontbigger.png \
qt/res/icons/trad/fontsmaller.png \ qt/res/icons/trad/fontsmaller.png \
qt/res/icons/trad/transaction_abandoned.png \
qt/res/icons/trad/network_disabled.png qt/res/icons/trad/network_disabled.png
BITCOIN_QT_CPP = \ BITCOIN_QT_CPP = \

26
src/qt/bitcoingui.cpp
View File

@ -84,7 +84,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *n
clientModel(0), clientModel(0),
walletFrame(0), walletFrame(0),
unitDisplayControl(0), unitDisplayControl(0),
labelEncryptionIcon(0), labelWalletEncryptionIcon(0),
labelWalletHDStatusIcon(0), labelWalletHDStatusIcon(0),
labelConnectionsIcon(0), labelConnectionsIcon(0),
labelBlocksIcon(0), labelBlocksIcon(0),
@ -207,7 +207,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *n
frameBlocksLayout->setContentsMargins(3,0,3,0); frameBlocksLayout->setContentsMargins(3,0,3,0);
frameBlocksLayout->setSpacing(3); frameBlocksLayout->setSpacing(3);
unitDisplayControl = new UnitDisplayStatusBarControl(platformStyle); unitDisplayControl = new UnitDisplayStatusBarControl(platformStyle);
labelEncryptionIcon = new QLabel(); labelWalletEncryptionIcon = new QLabel();
labelWalletHDStatusIcon = new QLabel(); labelWalletHDStatusIcon = new QLabel();
labelConnectionsIcon = new GUIUtil::ClickableLabel(); labelConnectionsIcon = new GUIUtil::ClickableLabel();
@ -217,7 +217,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *n
frameBlocksLayout->addStretch(); frameBlocksLayout->addStretch();
frameBlocksLayout->addWidget(unitDisplayControl); frameBlocksLayout->addWidget(unitDisplayControl);
frameBlocksLayout->addStretch(); frameBlocksLayout->addStretch();
frameBlocksLayout->addWidget(labelEncryptionIcon); frameBlocksLayout->addWidget(labelWalletEncryptionIcon);
frameBlocksLayout->addWidget(labelWalletHDStatusIcon); frameBlocksLayout->addWidget(labelWalletHDStatusIcon);
} }
frameBlocksLayout->addStretch(); frameBlocksLayout->addStretch();
@ -1308,7 +1308,7 @@ void BitcoinGUI::setEncryptionStatus(int status)
switch(status) switch(status)
{ {
case WalletModel::Unencrypted: case WalletModel::Unencrypted:
labelEncryptionIcon->hide(); labelWalletEncryptionIcon->hide();
encryptWalletAction->setChecked(false); encryptWalletAction->setChecked(false);
changePassphraseAction->setEnabled(false); changePassphraseAction->setEnabled(false);
unlockWalletAction->setVisible(false); unlockWalletAction->setVisible(false);
@ -1316,9 +1316,9 @@ void BitcoinGUI::setEncryptionStatus(int status)
encryptWalletAction->setEnabled(true); encryptWalletAction->setEnabled(true);
break; break;
case WalletModel::Unlocked: case WalletModel::Unlocked:
labelEncryptionIcon->show(); labelWalletEncryptionIcon->show();
labelEncryptionIcon->setPixmap(QIcon(":/icons/" + theme + "/lock_open").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE)); labelWalletEncryptionIcon->setPixmap(QIcon(":/icons/" + theme + "/lock_open").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
labelEncryptionIcon->setToolTip(tr("Wallet is <b>encrypted</b> and currently <b>unlocked</b>")); labelWalletEncryptionIcon->setToolTip(tr("Wallet is <b>encrypted</b> and currently <b>unlocked</b>"));
encryptWalletAction->setChecked(true); encryptWalletAction->setChecked(true);
changePassphraseAction->setEnabled(true); changePassphraseAction->setEnabled(true);
unlockWalletAction->setVisible(false); unlockWalletAction->setVisible(false);
@ -1326,9 +1326,9 @@ void BitcoinGUI::setEncryptionStatus(int status)
encryptWalletAction->setEnabled(false); // TODO: decrypt currently not supported encryptWalletAction->setEnabled(false); // TODO: decrypt currently not supported
break; break;
case WalletModel::UnlockedForMixingOnly: case WalletModel::UnlockedForMixingOnly:
labelEncryptionIcon->show(); labelWalletEncryptionIcon->show();
labelEncryptionIcon->setPixmap(QIcon(":/icons/" + theme + "/lock_open").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE)); labelWalletEncryptionIcon->setPixmap(QIcon(":/icons/" + theme + "/lock_open").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
labelEncryptionIcon->setToolTip(tr("Wallet is <b>encrypted</b> and currently <b>unlocked</b> for mixing only")); labelWalletEncryptionIcon->setToolTip(tr("Wallet is <b>encrypted</b> and currently <b>unlocked</b> for mixing only"));
encryptWalletAction->setChecked(true); encryptWalletAction->setChecked(true);
changePassphraseAction->setEnabled(true); changePassphraseAction->setEnabled(true);
unlockWalletAction->setVisible(true); unlockWalletAction->setVisible(true);
@ -1336,9 +1336,9 @@ void BitcoinGUI::setEncryptionStatus(int status)
encryptWalletAction->setEnabled(false); // TODO: decrypt currently not supported encryptWalletAction->setEnabled(false); // TODO: decrypt currently not supported
break; break;
case WalletModel::Locked: case WalletModel::Locked:
labelEncryptionIcon->show(); labelWalletEncryptionIcon->show();
labelEncryptionIcon->setPixmap(QIcon(":/icons/" + theme + "/lock_closed").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE)); labelWalletEncryptionIcon->setPixmap(QIcon(":/icons/" + theme + "/lock_closed").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
labelEncryptionIcon->setToolTip(tr("Wallet is <b>encrypted</b> and currently <b>locked</b>")); labelWalletEncryptionIcon->setToolTip(tr("Wallet is <b>encrypted</b> and currently <b>locked</b>"));
encryptWalletAction->setChecked(true); encryptWalletAction->setChecked(true);
changePassphraseAction->setEnabled(true); changePassphraseAction->setEnabled(true);
unlockWalletAction->setVisible(true); unlockWalletAction->setVisible(true);

2
src/qt/bitcoingui.h
View File

@ -85,7 +85,7 @@ private:
WalletFrame *walletFrame; WalletFrame *walletFrame;
UnitDisplayStatusBarControl *unitDisplayControl; UnitDisplayStatusBarControl *unitDisplayControl;
QLabel *labelEncryptionIcon; QLabel *labelWalletEncryptionIcon;
QLabel *labelWalletHDStatusIcon; QLabel *labelWalletHDStatusIcon;
QLabel *labelConnectionsIcon; QLabel *labelConnectionsIcon;
QLabel *labelBlocksIcon; QLabel *labelBlocksIcon;