From 5a676a06e6eda184b28eddb63b0842641464bffa Mon Sep 17 00:00:00 2001 From: crowning- Date: Tue, 18 Aug 2015 21:46:21 +0200 Subject: [PATCH 1/3] UI: Coding and CSS changes for sum of selected transactions on Transaction page --- src/qt/res/css/drkblue.css | 9 +++++++++ src/qt/walletview.cpp | 2 ++ 2 files changed, 11 insertions(+) diff --git a/src/qt/res/css/drkblue.css b/src/qt/res/css/drkblue.css index 1010db3822871..48499b35ad840 100644 --- a/src/qt/res/css/drkblue.css +++ b/src/qt/res/css/drkblue.css @@ -1498,6 +1498,15 @@ margin-bottom:1px; margin-right:1px; } +QLabel#transactionSumLabel { /* Example of setObjectName for widgets without name*/ + color:#333333; + font-weight:bold; +} + +QLabel#transactionSum { /* Example of setObjectName for widgets without name*/ + color:#333333; +} + /* TRANSACTION DETAIL DIALOG */ QDialog#TransactionDescDialog { diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp index 0974fa7f5e49f..aafe75ce94b9e 100644 --- a/src/qt/walletview.cpp +++ b/src/qt/walletview.cpp @@ -51,10 +51,12 @@ WalletView::WalletView(QWidget *parent): // Sum of selected transactions QLabel *transactionSumLabel = new QLabel(); // Label + transactionSumLabel->setObjectName("transactionSumLabel"); transactionSumLabel->setText(tr("Selected amount:")); hbox_buttons->addWidget(transactionSumLabel); transactionSum = new QLabel(); // Amount + transactionSum->setObjectName("transactionSum"); transactionSum->setMinimumSize(200, 8); transactionSum->setTextInteractionFlags(Qt::TextSelectableByMouse); hbox_buttons->addWidget(transactionSum); From a45cd7b54bffd1b73d7a98ef3006edfc70aad07d Mon Sep 17 00:00:00 2001 From: crowning- Date: Mon, 24 Aug 2015 11:23:55 +0200 Subject: [PATCH 2/3] Revert "UI: Coding and CSS changes for sum of selected transactions on Transaction page" This reverts commit 5a676a06e6eda184b28eddb63b0842641464bffa. --- src/qt/res/css/drkblue.css | 9 --------- src/qt/walletview.cpp | 2 -- 2 files changed, 11 deletions(-) diff --git a/src/qt/res/css/drkblue.css b/src/qt/res/css/drkblue.css index 48499b35ad840..1010db3822871 100644 --- a/src/qt/res/css/drkblue.css +++ b/src/qt/res/css/drkblue.css @@ -1498,15 +1498,6 @@ margin-bottom:1px; margin-right:1px; } -QLabel#transactionSumLabel { /* Example of setObjectName for widgets without name*/ - color:#333333; - font-weight:bold; -} - -QLabel#transactionSum { /* Example of setObjectName for widgets without name*/ - color:#333333; -} - /* TRANSACTION DETAIL DIALOG */ QDialog#TransactionDescDialog { diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp index aafe75ce94b9e..0974fa7f5e49f 100644 --- a/src/qt/walletview.cpp +++ b/src/qt/walletview.cpp @@ -51,12 +51,10 @@ WalletView::WalletView(QWidget *parent): // Sum of selected transactions QLabel *transactionSumLabel = new QLabel(); // Label - transactionSumLabel->setObjectName("transactionSumLabel"); transactionSumLabel->setText(tr("Selected amount:")); hbox_buttons->addWidget(transactionSumLabel); transactionSum = new QLabel(); // Amount - transactionSum->setObjectName("transactionSum"); transactionSum->setMinimumSize(200, 8); transactionSum->setTextInteractionFlags(Qt::TextSelectableByMouse); hbox_buttons->addWidget(transactionSum); From eff7231c3e0830524484ec04114040fba919680d Mon Sep 17 00:00:00 2001 From: crowning- Date: Mon, 11 Jan 2016 21:41:23 +0100 Subject: [PATCH 3/3] Transaction View: LastMonth calculation fixed --- src/qt/transactionview.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp index 1fc99c81afe7b..2787453017acb 100644 --- a/src/qt/transactionview.cpp +++ b/src/qt/transactionview.cpp @@ -280,9 +280,16 @@ void TransactionView::chooseDate(int idx) TransactionFilterProxy::MAX_DATE); break; case LastMonth: - transactionProxyModel->setDateRange( + if (current.month() == 1){ + transactionProxyModel->setDateRange( + QDateTime(QDate(current.year()-1, 12, 1)), + QDateTime(QDate(current.year(), current.month(), 1))); + } + else { + transactionProxyModel->setDateRange( QDateTime(QDate(current.year(), current.month()-1, 1)), QDateTime(QDate(current.year(), current.month(), 1))); + } break; case ThisYear: transactionProxyModel->setDateRange(