#include "walletmodel.h"
#include "addresstablemodel.h"
#include "transactiontablemodel.h"
-#include "guiutil.h"
+#include "bitcoinunits.h"
#include "csvmodelwriter.h"
#include "transactiondescdialog.h"
#include "editaddressdialog.h"
+#include "optionsmodel.h"
#include <QScrollBar>
#include <QComboBox>
#include <QMenu>
#include <QApplication>
#include <QClipboard>
-
-#include <QDebug>
+#include <QLabel>
+#include <QDateTimeEdit>
TransactionView::TransactionView(QWidget *parent) :
QWidget(parent), model(0), transactionProxyModel(0),
QHBoxLayout *hlayout = new QHBoxLayout();
hlayout->setContentsMargins(0,0,0,0);
+#ifdef Q_WS_MAC
+ hlayout->setSpacing(5);
+ hlayout->addSpacing(26);
+#else
hlayout->setSpacing(0);
-
hlayout->addSpacing(23);
+#endif
dateWidget = new QComboBox(this);
- dateWidget->setMaximumWidth(120);
- dateWidget->setMinimumWidth(120);
+#ifdef Q_WS_MAC
+ dateWidget->setFixedWidth(121);
+#else
+ dateWidget->setFixedWidth(120);
+#endif
dateWidget->addItem(tr("All"), All);
dateWidget->addItem(tr("Today"), Today);
dateWidget->addItem(tr("This week"), ThisWeek);
hlayout->addWidget(dateWidget);
typeWidget = new QComboBox(this);
- typeWidget->setMaximumWidth(120);
- typeWidget->setMinimumWidth(120);
+#ifdef Q_WS_MAC
+ typeWidget->setFixedWidth(121);
+#else
+ typeWidget->setFixedWidth(120);
+#endif
typeWidget->addItem(tr("All"), TransactionFilterProxy::ALL_TYPES);
typeWidget->addItem(tr("Received with"), TransactionFilterProxy::TYPE(TransactionRecord::RecvWithAddress) |
addressWidget = new QLineEdit(this);
#if QT_VERSION >= 0x040700
- addressWidget->setPlaceholderText("Enter address or label to search");
+ addressWidget->setPlaceholderText(tr("Enter address or label to search"));
#endif
hlayout->addWidget(addressWidget);
amountWidget = new QLineEdit(this);
#if QT_VERSION >= 0x040700
- amountWidget->setPlaceholderText("Min amount");
+ amountWidget->setPlaceholderText(tr("Min amount"));
+#endif
+#ifdef Q_WS_MAC
+ amountWidget->setFixedWidth(97);
+#else
+ amountWidget->setFixedWidth(100);
#endif
- amountWidget->setMaximumWidth(100);
- amountWidget->setMinimumWidth(100);
amountWidget->setValidator(new QDoubleValidator(0, 1e20, 8, this));
hlayout->addWidget(amountWidget);
QTableView *view = new QTableView(this);
vlayout->addLayout(hlayout);
+ vlayout->addWidget(createDateRangeWidget());
vlayout->addWidget(view);
vlayout->setSpacing(0);
int width = view->verticalScrollBar()->sizeHint().width();
// Cover scroll bar width with spacing
+#ifdef Q_WS_MAC
+ hlayout->addSpacing(width+2);
+#else
hlayout->addSpacing(width);
+#endif
// Always show scroll bar
view->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
view->setTabKeyNavigation(false);
transactionView = view;
// Actions
- QAction *copyAddressAction = new QAction("Copy address", this);
- QAction *copyLabelAction = new QAction("Copy label", this);
- QAction *editLabelAction = new QAction("Edit label", this);
- QAction *showDetailsAction = new QAction("Show details...", this);
+ QAction *copyAddressAction = new QAction(tr("Copy address"), this);
+ QAction *copyLabelAction = new QAction(tr("Copy label"), this);
+ QAction *editLabelAction = new QAction(tr("Edit label"), this);
+ QAction *showDetailsAction = new QAction(tr("Show details..."), this);
contextMenu = new QMenu();
contextMenu->addAction(copyAddressAction);
// Connect actions
connect(dateWidget, SIGNAL(activated(int)), this, SLOT(chooseDate(int)));
connect(typeWidget, SIGNAL(activated(int)), this, SLOT(chooseType(int)));
- connect(addressWidget, SIGNAL(textChanged(const QString&)), this, SLOT(changedPrefix(const QString&)));
- connect(amountWidget, SIGNAL(textChanged(const QString&)), this, SLOT(changedAmount(const QString&)));
+ connect(addressWidget, SIGNAL(textChanged(QString)), this, SLOT(changedPrefix(QString)));
+ connect(amountWidget, SIGNAL(textChanged(QString)), this, SLOT(changedAmount(QString)));
- connect(view, SIGNAL(doubleClicked(const QModelIndex&)), this, SIGNAL(doubleClicked(const QModelIndex&)));
+ connect(view, SIGNAL(doubleClicked(QModelIndex)), this, SIGNAL(doubleClicked(QModelIndex)));
connect(view,
- SIGNAL(customContextMenuRequested(const QPoint &)),
+ SIGNAL(customContextMenuRequested(QPoint)),
this,
- SLOT(contextualMenu(const QPoint &)));
+ SLOT(contextualMenu(QPoint)));
connect(copyAddressAction, SIGNAL(triggered()), this, SLOT(copyAddress()));
connect(copyLabelAction, SIGNAL(triggered()), this, SLOT(copyLabel()));
void TransactionView::chooseDate(int idx)
{
QDate current = QDate::currentDate();
+ dateRangeWidget->setVisible(false);
switch(dateWidget->itemData(idx).toInt())
{
case All:
TransactionFilterProxy::MAX_DATE);
break;
case Range:
- // TODO ask specific range
+ dateRangeWidget->setVisible(true);
+ dateRangeChanged();
break;
}
-
}
void TransactionView::chooseType(int idx)
void TransactionView::changedAmount(const QString &amount)
{
qint64 amount_parsed = 0;
- if(GUIUtil::parseMoney(amount, &amount_parsed))
+ if(BitcoinUnits::parse(model->getOptionsModel()->getDisplayUnit(), amount, &amount_parsed))
{
transactionProxyModel->setMinAmount(amount_parsed);
}
tr("Export Transaction Data"),
QDir::currentPath(),
tr("Comma separated file (*.csv)"));
- if(!filename.endsWith(".csv"))
- {
- filename += ".csv";
- }
+
+ if (filename.isNull()) return;
CSVModelWriter writer(filename);
// name, column, role
writer.setModel(transactionProxyModel);
- writer.addColumn("Confirmed", 0, TransactionTableModel::ConfirmedRole);
- writer.addColumn("Date", 0, TransactionTableModel::DateRole);
- writer.addColumn("Type", TransactionTableModel::Type, Qt::EditRole);
- writer.addColumn("Label", 0, TransactionTableModel::LabelRole);
- writer.addColumn("Address", 0, TransactionTableModel::AddressRole);
- writer.addColumn("Amount", 0, TransactionTableModel::FormattedAmountRole);
- writer.addColumn("ID", 0, TransactionTableModel::TxIDRole);
+ writer.addColumn(tr("Confirmed"), 0, TransactionTableModel::ConfirmedRole);
+ writer.addColumn(tr("Date"), 0, TransactionTableModel::DateRole);
+ writer.addColumn(tr("Type"), TransactionTableModel::Type, Qt::EditRole);
+ writer.addColumn(tr("Label"), 0, TransactionTableModel::LabelRole);
+ writer.addColumn(tr("Address"), 0, TransactionTableModel::AddressRole);
+ writer.addColumn(tr("Amount"), 0, TransactionTableModel::FormattedAmountRole);
+ writer.addColumn(tr("ID"), 0, TransactionTableModel::TxIDRole);
if(!writer.write())
{
dlg.exec();
}
}
+
+QWidget *TransactionView::createDateRangeWidget()
+{
+ dateRangeWidget = new QFrame();
+ dateRangeWidget->setFrameStyle(QFrame::Panel | QFrame::Raised);
+ dateRangeWidget->setContentsMargins(1,1,1,1);
+ QHBoxLayout *layout = new QHBoxLayout(dateRangeWidget);
+ layout->setContentsMargins(0,0,0,0);
+ layout->addSpacing(23);
+ layout->addWidget(new QLabel(tr("Range:")));
+
+ dateFrom = new QDateTimeEdit(this);
+ dateFrom->setDisplayFormat("dd/MM/yy");
+ dateFrom->setCalendarPopup(true);
+ dateFrom->setMinimumWidth(100);
+ dateFrom->setDate(QDate::currentDate().addDays(-7));
+ layout->addWidget(dateFrom);
+ layout->addWidget(new QLabel(tr("to")));
+
+ dateTo = new QDateTimeEdit(this);
+ dateTo->setDisplayFormat("dd/MM/yy");
+ dateTo->setCalendarPopup(true);
+ dateTo->setMinimumWidth(100);
+ dateTo->setDate(QDate::currentDate());
+ layout->addWidget(dateTo);
+ layout->addStretch();
+
+ // Hide by default
+ dateRangeWidget->setVisible(false);
+
+ // Notify on change
+ connect(dateFrom, SIGNAL(dateChanged(QDate)), this, SLOT(dateRangeChanged()));
+ connect(dateTo, SIGNAL(dateChanged(QDate)), this, SLOT(dateRangeChanged()));
+
+ return dateRangeWidget;
+}
+
+void TransactionView::dateRangeChanged()
+{
+ transactionProxyModel->setDateRange(
+ QDateTime(dateFrom->date()),
+ QDateTime(dateTo->date()).addDays(1));
+}
git://git.novaco.in / novacoin.git / blobdiff