diff options
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/askpassphrasedialog.cpp | 3 | ||||
| -rw-r--r-- | src/qt/bitcoingui.cpp | 6 | ||||
| -rw-r--r-- | src/qt/overviewpage.cpp | 2 | ||||
| -rw-r--r-- | src/qt/res/icons/address-book.png | bin | 1211 -> 1851 bytes | |||
| -rw-r--r-- | src/qt/res/icons/export.png | bin | 1339 -> 2148 bytes | |||
| -rw-r--r-- | src/qt/res/icons/history.png | bin | 746 -> 1432 bytes | |||
| -rw-r--r-- | src/qt/res/icons/key.png | bin | 1239 -> 1727 bytes | |||
| -rw-r--r-- | src/qt/res/icons/lock_closed.png | bin | 1237 -> 1679 bytes | |||
| -rw-r--r-- | src/qt/res/icons/lock_open.png | bin | 1442 -> 1644 bytes | |||
| -rw-r--r-- | src/qt/res/icons/overview.png | bin | 7015 -> 7936 bytes | |||
| -rw-r--r-- | src/qt/res/icons/receive.png | bin | 1815 -> 1437 bytes | |||
| -rw-r--r-- | src/qt/res/icons/send.png | bin | 1806 -> 1487 bytes | |||
| -rw-r--r-- | src/qt/res/icons/synced.png | bin | 698 -> 781 bytes |
13 files changed, 6 insertions, 5 deletions
diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp index 89cdf43ba4..a574ef925b 100644 --- a/src/qt/askpassphrasedialog.cpp +++ b/src/qt/askpassphrasedialog.cpp @@ -101,7 +101,8 @@ void AskPassphraseDialog::accept() if(model->setWalletEncrypted(true, newpass1)) { QMessageBox::warning(this, tr("Wallet encrypted"), - tr("Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.")); + tr("Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.")); + QApplication::quit(); } else { diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 5ae3ce33e8..8641c723b0 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -478,11 +478,11 @@ void BitcoinGUI::error(const QString &title, const QString &message) void BitcoinGUI::changeEvent(QEvent *e) { #ifndef Q_WS_MAC // Ignored on Mac - if (e->type() == QEvent::WindowStateChange) + if(e->type() == QEvent::WindowStateChange) { - if (clientModel->getOptionsModel()->getMinimizeToTray()) + if(clientModel && clientModel->getOptionsModel()->getMinimizeToTray()) { - if (isMinimized()) + if(isMinimized()) { hide(); e->ignore(); diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index fe0987178c..5b5a8f5271 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -111,7 +111,7 @@ OverviewPage::OverviewPage(QWidget *parent) : ui->labelNumTransactions->setToolTip(tr("Total number of transactions in wallet")); // Recent transactions - ui->listTransactions->setStyleSheet("background:transparent"); + ui->listTransactions->setStyleSheet("QListView { background:transparent }"); ui->listTransactions->setItemDelegate(txdelegate); ui->listTransactions->setIconSize(QSize(DECORATION_SIZE, DECORATION_SIZE)); ui->listTransactions->setSelectionMode(QAbstractItemView::NoSelection); diff --git a/src/qt/res/icons/address-book.png b/src/qt/res/icons/address-book.png Binary files differindex 1086fbeb63..dbfc28ab3d 100644 --- a/src/qt/res/icons/address-book.png +++ b/src/qt/res/icons/address-book.png diff --git a/src/qt/res/icons/export.png b/src/qt/res/icons/export.png Binary files differindex 69d59a38d2..1df9c2398d 100644 --- a/src/qt/res/icons/export.png +++ b/src/qt/res/icons/export.png diff --git a/src/qt/res/icons/history.png b/src/qt/res/icons/history.png Binary files differindex 60f1351783..10ac0e1592 100644 --- a/src/qt/res/icons/history.png +++ b/src/qt/res/icons/history.png diff --git a/src/qt/res/icons/key.png b/src/qt/res/icons/key.png Binary files differindex 757cad47ed..ece0164f77 100644 --- a/src/qt/res/icons/key.png +++ b/src/qt/res/icons/key.png diff --git a/src/qt/res/icons/lock_closed.png b/src/qt/res/icons/lock_closed.png Binary files differindex ce8da0bec7..c566510c40 100644 --- a/src/qt/res/icons/lock_closed.png +++ b/src/qt/res/icons/lock_closed.png diff --git a/src/qt/res/icons/lock_open.png b/src/qt/res/icons/lock_open.png Binary files differindex 6a3a8edb23..c98ca8663b 100644 --- a/src/qt/res/icons/lock_open.png +++ b/src/qt/res/icons/lock_open.png diff --git a/src/qt/res/icons/overview.png b/src/qt/res/icons/overview.png Binary files differindex 6b94b43a2c..3b90fe5569 100644 --- a/src/qt/res/icons/overview.png +++ b/src/qt/res/icons/overview.png diff --git a/src/qt/res/icons/receive.png b/src/qt/res/icons/receive.png Binary files differindex e8f418a4f8..53ad1d1565 100644 --- a/src/qt/res/icons/receive.png +++ b/src/qt/res/icons/receive.png diff --git a/src/qt/res/icons/send.png b/src/qt/res/icons/send.png Binary files differindex 55ce550b4f..ceb91ea66d 100644 --- a/src/qt/res/icons/send.png +++ b/src/qt/res/icons/send.png diff --git a/src/qt/res/icons/synced.png b/src/qt/res/icons/synced.png Binary files differindex 8e428b6a70..4d7e0e8821 100644 --- a/src/qt/res/icons/synced.png +++ b/src/qt/res/icons/synced.png |
