diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc index c9f13fd0..bf7d777b 100644 --- a/src/qt/bitcoin.qrc +++ b/src/qt/bitcoin.qrc @@ -54,6 +54,9 @@ res/icons/digitalnote.png res/icons/digitalnote-16_testnet.png res/icons/mnodes.png + res/icons/message.png + res/icons/address-book-sidebar.png + res/icons/send-sidebar.png res/icons/dark/connect0_16.png @@ -128,4 +131,5 @@ locale/bitcoin_zh_CN.qm locale/bitcoin_zh_TW.qm + diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 9ed3d51e..4c5f3696 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -290,7 +290,7 @@ void DigitalNoteGUI::createActions() receiveCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_2)); tabGroup->addAction(receiveCoinsAction); - sendCoinsAction = new QAction(QIcon(":/icons/send"), tr("&Send"), this); + sendCoinsAction = new QAction(QIcon(":/icons/send-sidebar"), tr("&Send"), this); sendCoinsAction->setToolTip(tr("Send coins to a DigitalNote address")); sendCoinsAction->setCheckable(true); sendCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_3)); @@ -302,7 +302,7 @@ void DigitalNoteGUI::createActions() historyAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_4)); tabGroup->addAction(historyAction); - addressBookAction = new QAction(QIcon(":/icons/address-book"), tr("&Addresses"), this); + addressBookAction = new QAction(QIcon(":/icons/address-book-sidebar"), tr("&Addresses"), this); addressBookAction->setToolTip(tr("Edit the list of stored addresses and labels")); addressBookAction->setCheckable(true); addressBookAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_5)); @@ -313,7 +313,7 @@ void DigitalNoteGUI::createActions() masternodeManagerAction->setCheckable(true); tabGroup->addAction(masternodeManagerAction); - messageAction = new QAction(QIcon(":/icons/edit"), tr("&Messages"), this); + messageAction = new QAction(QIcon(":/icons/message"), tr("&Messages"), this); messageAction->setToolTip(tr("View and Send Encrypted messages")); messageAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_7)); messageAction->setCheckable(true); diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui index 4e47ad22..846f3087 100644 --- a/src/qt/forms/optionsdialog.ui +++ b/src/qt/forms/optionsdialog.ui @@ -26,7 +26,7 @@ QTabWidget::North - 0 + 3 @@ -465,6 +465,11 @@ + + QValidatedLineEdit + QLineEdit +
qvalidatedlineedit.h
+
DigitalNoteAmountField QSpinBox @@ -476,11 +481,6 @@ QComboBox
qvaluecombobox.h
- - QValidatedLineEdit - QLineEdit -
qvalidatedlineedit.h
-
diff --git a/src/qt/res/icons/add.png b/src/qt/res/icons/add.png index 2eaa75da..a4fc48d8 100644 Binary files a/src/qt/res/icons/add.png and b/src/qt/res/icons/add.png differ diff --git a/src/qt/res/icons/address-book-sidebar.png b/src/qt/res/icons/address-book-sidebar.png new file mode 100644 index 00000000..fdaf90fc Binary files /dev/null and b/src/qt/res/icons/address-book-sidebar.png differ diff --git a/src/qt/res/icons/address-book.png b/src/qt/res/icons/address-book.png index 03bae78e..6f7a1706 100644 Binary files a/src/qt/res/icons/address-book.png and b/src/qt/res/icons/address-book.png differ diff --git a/src/qt/res/icons/browse.png b/src/qt/res/icons/browse.png index 5a93614d..cd2905c8 100644 Binary files a/src/qt/res/icons/browse.png and b/src/qt/res/icons/browse.png differ diff --git a/src/qt/res/icons/clock1.png b/src/qt/res/icons/clock1.png index 6f852c09..921ba797 100644 Binary files a/src/qt/res/icons/clock1.png and b/src/qt/res/icons/clock1.png differ diff --git a/src/qt/res/icons/clock2.png b/src/qt/res/icons/clock2.png index 187a6efe..45d59025 100644 Binary files a/src/qt/res/icons/clock2.png and b/src/qt/res/icons/clock2.png differ diff --git a/src/qt/res/icons/clock3.png b/src/qt/res/icons/clock3.png index a6778c7c..8313e4f7 100644 Binary files a/src/qt/res/icons/clock3.png and b/src/qt/res/icons/clock3.png differ diff --git a/src/qt/res/icons/clock4.png b/src/qt/res/icons/clock4.png index ca09a139..e362d212 100644 Binary files a/src/qt/res/icons/clock4.png and b/src/qt/res/icons/clock4.png differ diff --git a/src/qt/res/icons/clock5.png b/src/qt/res/icons/clock5.png index 6f77fbd9..60f73717 100644 Binary files a/src/qt/res/icons/clock5.png and b/src/qt/res/icons/clock5.png differ diff --git a/src/qt/res/icons/configure.png b/src/qt/res/icons/configure.png index c9c24e1f..18e47efc 100644 Binary files a/src/qt/res/icons/configure.png and b/src/qt/res/icons/configure.png differ diff --git a/src/qt/res/icons/debugwindow.png b/src/qt/res/icons/debugwindow.png index d64c7d7f..aa71e880 100644 Binary files a/src/qt/res/icons/debugwindow.png and b/src/qt/res/icons/debugwindow.png differ diff --git a/src/qt/res/icons/edit.png b/src/qt/res/icons/edit.png index e0e76124..8fba7c4f 100644 Binary files a/src/qt/res/icons/edit.png and b/src/qt/res/icons/edit.png differ diff --git a/src/qt/res/icons/editconf.png b/src/qt/res/icons/editconf.png index 2cbfc273..bf886ee8 100644 Binary files a/src/qt/res/icons/editconf.png and b/src/qt/res/icons/editconf.png differ diff --git a/src/qt/res/icons/editcopy.png b/src/qt/res/icons/editcopy.png index 1809318b..34ae0ad1 100644 Binary files a/src/qt/res/icons/editcopy.png and b/src/qt/res/icons/editcopy.png differ diff --git a/src/qt/res/icons/editpaste.png b/src/qt/res/icons/editpaste.png index df3be8bd..10054f4b 100644 Binary files a/src/qt/res/icons/editpaste.png and b/src/qt/res/icons/editpaste.png differ diff --git a/src/qt/res/icons/export.png b/src/qt/res/icons/export.png index ea16b407..63d7ddd5 100644 Binary files a/src/qt/res/icons/export.png and b/src/qt/res/icons/export.png differ diff --git a/src/qt/res/icons/eye.png b/src/qt/res/icons/eye.png index c988a4fa..33a1a200 100644 Binary files a/src/qt/res/icons/eye.png and b/src/qt/res/icons/eye.png differ diff --git a/src/qt/res/icons/eye_minus.png b/src/qt/res/icons/eye_minus.png index db46ddf5..a0bff12b 100644 Binary files a/src/qt/res/icons/eye_minus.png and b/src/qt/res/icons/eye_minus.png differ diff --git a/src/qt/res/icons/eye_plus.png b/src/qt/res/icons/eye_plus.png index 572b6b63..16ab88e2 100644 Binary files a/src/qt/res/icons/eye_plus.png and b/src/qt/res/icons/eye_plus.png differ diff --git a/src/qt/res/icons/filesave.png b/src/qt/res/icons/filesave.png index e80e52da..06695db2 100644 Binary files a/src/qt/res/icons/filesave.png and b/src/qt/res/icons/filesave.png differ diff --git a/src/qt/res/icons/folder.png b/src/qt/res/icons/folder.png index d6bb5146..85d4a9cf 100644 Binary files a/src/qt/res/icons/folder.png and b/src/qt/res/icons/folder.png differ diff --git a/src/qt/res/icons/key.png b/src/qt/res/icons/key.png index 00255f78..551b03d0 100644 Binary files a/src/qt/res/icons/key.png and b/src/qt/res/icons/key.png differ diff --git a/src/qt/res/icons/lock_closed.png b/src/qt/res/icons/lock_closed.png index e827c229..3def8c96 100644 Binary files a/src/qt/res/icons/lock_closed.png and b/src/qt/res/icons/lock_closed.png differ diff --git a/src/qt/res/icons/lock_open.png b/src/qt/res/icons/lock_open.png index b61c6a1a..17afb114 100644 Binary files a/src/qt/res/icons/lock_open.png and b/src/qt/res/icons/lock_open.png differ diff --git a/src/qt/res/icons/message.png b/src/qt/res/icons/message.png new file mode 100644 index 00000000..e46c1653 Binary files /dev/null and b/src/qt/res/icons/message.png differ diff --git a/src/qt/res/icons/notsynced.png b/src/qt/res/icons/notsynced.png index 1f3bd172..417e0be1 100644 Binary files a/src/qt/res/icons/notsynced.png and b/src/qt/res/icons/notsynced.png differ diff --git a/src/qt/res/icons/quit.png b/src/qt/res/icons/quit.png index be4f2d2a..a1cdecae 100644 Binary files a/src/qt/res/icons/quit.png and b/src/qt/res/icons/quit.png differ diff --git a/src/qt/res/icons/remove.png b/src/qt/res/icons/remove.png index 6fa13322..7ca265d6 100644 Binary files a/src/qt/res/icons/remove.png and b/src/qt/res/icons/remove.png differ diff --git a/src/qt/res/icons/send-sidebar.png b/src/qt/res/icons/send-sidebar.png new file mode 100644 index 00000000..db6269d6 Binary files /dev/null and b/src/qt/res/icons/send-sidebar.png differ diff --git a/src/qt/res/icons/send.png b/src/qt/res/icons/send.png index 3574386b..b4ef4b34 100644 Binary files a/src/qt/res/icons/send.png and b/src/qt/res/icons/send.png differ diff --git a/src/qt/res/icons/staking_on.png b/src/qt/res/icons/staking_on.png index 6326668c..ab24eecf 100644 Binary files a/src/qt/res/icons/staking_on.png and b/src/qt/res/icons/staking_on.png differ diff --git a/src/qt/res/icons/synced.png b/src/qt/res/icons/synced.png index 9d780a0b..651e6afd 100644 Binary files a/src/qt/res/icons/synced.png and b/src/qt/res/icons/synced.png differ diff --git a/src/qt/res/icons/transaction0.png b/src/qt/res/icons/transaction0.png index 094f7486..b60e3427 100644 Binary files a/src/qt/res/icons/transaction0.png and b/src/qt/res/icons/transaction0.png differ diff --git a/src/qt/res/icons/transaction2.png b/src/qt/res/icons/transaction2.png index aa5073a1..76d5632f 100644 Binary files a/src/qt/res/icons/transaction2.png and b/src/qt/res/icons/transaction2.png differ diff --git a/src/qt/res/icons/transaction_conflicted.png b/src/qt/res/icons/transaction_conflicted.png index 1fe5dac5..90c0adc4 100644 Binary files a/src/qt/res/icons/transaction_conflicted.png and b/src/qt/res/icons/transaction_conflicted.png differ diff --git a/src/qt/res/icons/tx_inout.png b/src/qt/res/icons/tx_inout.png index 46eea277..8749fe8f 100644 Binary files a/src/qt/res/icons/tx_inout.png and b/src/qt/res/icons/tx_inout.png differ diff --git a/src/qt/res/icons/tx_input.png b/src/qt/res/icons/tx_input.png index 4a480ae6..934e5621 100644 Binary files a/src/qt/res/icons/tx_input.png and b/src/qt/res/icons/tx_input.png differ diff --git a/src/qt/res/icons/tx_mined.png b/src/qt/res/icons/tx_mined.png index d0deec0b..ea743ce2 100644 Binary files a/src/qt/res/icons/tx_mined.png and b/src/qt/res/icons/tx_mined.png differ diff --git a/src/qt/res/icons/tx_output.png b/src/qt/res/icons/tx_output.png index f9f704dc..43bbcb2a 100644 Binary files a/src/qt/res/icons/tx_output.png and b/src/qt/res/icons/tx_output.png differ diff --git a/src/qt/res/images/splash.png b/src/qt/res/images/splash.png index 9ebe093c..dc196cc2 100644 Binary files a/src/qt/res/images/splash.png and b/src/qt/res/images/splash.png differ