From de11d828566829623a4bdb3f0266356de8394a1a Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Tue, 10 May 2011 13:32:56 +0200 Subject: [PATCH] update model --- BitcoinGUI.cpp | 19 ++++++++++++------- TransactionTableModel.cpp | 7 ++++++- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/BitcoinGUI.cpp b/BitcoinGUI.cpp index 3ee74a1e5..f0a66334d 100644 --- a/BitcoinGUI.cpp +++ b/BitcoinGUI.cpp @@ -27,7 +27,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent): QMainWindow(parent) { resize(850, 550); - setWindowTitle("Bitcoin"); + setWindowTitle(tr("Bitcoin")); setWindowIcon(QIcon(":icons/bitcoin")); QAction *quit = new QAction(QIcon(":/icons/quit"), "&Quit", this); @@ -70,7 +70,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent): hbox_balance->addWidget(new QLabel(tr("Balance:"))); hbox_balance->addSpacing(5);/* Add some spacing between the label and the text */ - QLabel *label_balance = new QLabel(QLocale::system().toString(1345.54)); /* TODO: use locale to format amount */ + QLabel *label_balance = new QLabel(QLocale::system().toString(1345.54)); label_balance->setFont(QFont("Teletype")); hbox_balance->addWidget(label_balance); hbox_balance->addStretch(1); @@ -83,10 +83,6 @@ BitcoinGUI::BitcoinGUI(QWidget *parent): /* Transaction table: * TransactionView * TransactionModel - * Selection behavior - * selection mode - * QAbstractItemView::SelectItems - * QAbstractItemView::ExtendedSelection */ QTableView *transaction_table = new QTableView(this); @@ -105,13 +101,22 @@ BitcoinGUI::BitcoinGUI(QWidget *parent): TransactionTableModel::Debit, 79); transaction_table->horizontalHeader()->resizeSection( TransactionTableModel::Credit, 79); - /* TODO: alignment; debit/credit columns must align right */ + /* setupTabs */ QTabBar *tabs = new QTabBar(this); tabs->addTab(tr("All transactions")); tabs->addTab(tr("Sent/Received")); tabs->addTab(tr("Sent")); tabs->addTab(tr("Received")); + /* QSortFilterProxyModel + setFilterRole : filter on user role + setFilterKeyColumn + setFilterRegExp / setFilterFixedString + "^." + "^[sr]" + "^[s]" + "^[r]" + */ vbox->addWidget(tabs); vbox->addWidget(transaction_table); diff --git a/TransactionTableModel.cpp b/TransactionTableModel.cpp index e5cf25816..aa3128c5a 100644 --- a/TransactionTableModel.cpp +++ b/TransactionTableModel.cpp @@ -12,7 +12,7 @@ static Qt::AlignmentFlag column_alignments[] = { TransactionTableModel::TransactionTableModel(QObject *parent): QAbstractTableModel(parent) { - columns << "Status" << "Date" << "Description" << "Debit" << "Credit"; + columns << tr("Status") << tr("Date") << tr("Description") << tr("Debit") << tr("Credit"); } int TransactionTableModel::rowCount(const QModelIndex &parent) const @@ -41,6 +41,11 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const { return column_alignments[index.column()]; } + /* user role: transaction type + "s" (sent) + "r" (received) + "g" (generated) + */ return QVariant(); }