diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-07-22 23:15:38 +0000 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-07-22 23:15:38 +0000 |
commit | ff4be740b56a733beb5c7978b56c6602fae51a2e (patch) | |
tree | 2ad1b7b202c6c44c17f499b8cf8c4aa174e62d60 /src/qt | |
parent | 222ac2b12ab42d7a0ea66cd6fe4e25efa3c31333 (diff) | |
parent | 4f620dd0f0d0cd9ae1e2bb0403e07bd303e5b3ba (diff) | |
download | bitcoin-ff4be740b56a733beb5c7978b56c6602fae51a2e.tar.xz |
Merge branch '0.5.x' into 0.6.0.x
Diffstat (limited to 'src/qt')
-rw-r--r-- | src/qt/addressbookpage.cpp | 2 | ||||
-rw-r--r-- | src/qt/bitcoingui.cpp | 3 | ||||
-rw-r--r-- | src/qt/transactionview.cpp | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp index 32d05053ce..11fbed88f0 100644 --- a/src/qt/addressbookpage.cpp +++ b/src/qt/addressbookpage.cpp @@ -96,6 +96,8 @@ void AddressBookPage::setModel(AddressTableModel *model) proxyModel = new QSortFilterProxyModel(this); proxyModel->setSourceModel(model); proxyModel->setDynamicSortFilter(true); + proxyModel->setSortCaseSensitivity(Qt::CaseInsensitive); + proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive); switch(tab) { case ReceivingTab: diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 4918dddb92..c9d9d1907d 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -313,6 +313,7 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel) this->clientModel = clientModel; if(clientModel) { + // Replace some strings and icons, when using the testnet if(clientModel->isTestNet()) { QString title_testnet = windowTitle() + QString(" ") + tr("[testnet]"); @@ -327,6 +328,8 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel) trayIcon->setToolTip(title_testnet); trayIcon->setIcon(QIcon(":/icons/toolbar_testnet")); } + + aboutAction->setIcon(QIcon(":/icons/toolbar_testnet")); } // Keep up to date with client diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp index eaed48bfdf..13d0b7c474 100644 --- a/src/qt/transactionview.cpp +++ b/src/qt/transactionview.cpp @@ -158,6 +158,8 @@ void TransactionView::setModel(WalletModel *model) transactionProxyModel = new TransactionFilterProxy(this); transactionProxyModel->setSourceModel(model->getTransactionTableModel()); transactionProxyModel->setDynamicSortFilter(true); + transactionProxyModel->setSortCaseSensitivity(Qt::CaseInsensitive); + transactionProxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive); transactionProxyModel->setSortRole(Qt::EditRole); |