neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge #866: [UI] Column alignement of Transaction-Tab adjusted

Browse Source 
191ca63 [UI] Column alignement of Transaction-Tab adjusted
This commit is contained in:
crowning- 2016-06-06 07:44:59 +02:00 committed by Holger Schinzel
parent ee31604d59
commit 5ac043c1ba
5 changed files with 59 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qt/res/css/crownium.css
View File

@ -1508,13 +1508,27 @@ border:1px solid #d7d7d7;
/* TRANSACTIONS PAGE */ /* TRANSACTIONS PAGE */
TransactionView QLineEdit { /* Address Filter */ TransactionView QLineEdit { /* Filters */
margin-bottom:2px; margin-bottom:2px;
margin-right:1px; margin-right:1px;
min-width:111px; min-width:111px;
text-align:center; text-align:center;
} }
TransactionView QLineEdit#addressWidget { /* Address Filter */
margin-bottom:2px;
margin-right:1px;
min-width:405px;
text-align:center;
}
TransactionView QLineEdit#amountWidget { /* Amount Filter */
margin-bottom:2px;
margin-right:1px;
max-width:100px;
text-align:center;
}
TransactionView QComboBox { TransactionView QComboBox {
margin-bottom:1px; margin-bottom:1px;
margin-right:1px; margin-right:1px;

16
src/qt/res/css/drkblue.css
View File

@ -1491,13 +1491,27 @@ border:1px solid #d7d7d7;
/* TRANSACTIONS PAGE */ /* TRANSACTIONS PAGE */
TransactionView QLineEdit { /* Address Filter */ TransactionView QLineEdit { /* Filters */
margin-bottom:2px; margin-bottom:2px;
margin-right:1px; margin-right:1px;
min-width:111px; min-width:111px;
text-align:center; text-align:center;
} }
TransactionView QLineEdit#addressWidget { /* Address Filter */
margin-bottom:2px;
margin-right:1px;
min-width:405px;
text-align:center;
}
TransactionView QLineEdit#amountWidget { /* Amount Filter */
margin-bottom:2px;
margin-right:1px;
max-width:100px;
text-align:center;
}
TransactionView QComboBox { TransactionView QComboBox {
margin-bottom:1px; margin-bottom:1px;
margin-right:1px; margin-right:1px;

16
src/qt/res/css/light.css
View File

@ -1501,13 +1501,27 @@ border:1px solid #d7d7d7;
/* TRANSACTIONS PAGE */ /* TRANSACTIONS PAGE */
TransactionView QLineEdit { /* Address Filter */ TransactionView QLineEdit { /* Filters */
margin-bottom:2px; margin-bottom:2px;
margin-right:1px; margin-right:1px;
min-width:111px; min-width:111px;
text-align:center; text-align:center;
} }
TransactionView QLineEdit#addressWidget { /* Address Filter */
margin-bottom:2px;
margin-right:1px;
min-width:405px;
text-align:center;
}
TransactionView QLineEdit#amountWidget { /* Amount Filter */
margin-bottom:2px;
margin-right:1px;
max-width:100px;
text-align:center;
}
TransactionView QComboBox { TransactionView QComboBox {
margin-bottom:1px; margin-bottom:1px;
margin-right:1px; margin-right:1px;

2
src/qt/transactiontablemodel.cpp
View File

@ -243,7 +243,7 @@ TransactionTableModel::TransactionTableModel(const PlatformStyle *platformStyle,
fProcessingQueuedTransactions(false), fProcessingQueuedTransactions(false),
platformStyle(platformStyle) platformStyle(platformStyle)
{ {
columns << QString() << QString() << tr("Date") << tr("Type") << tr("Label") << BitcoinUnits::getAmountColumnTitle(walletModel->getOptionsModel()->getDisplayUnit()); columns << QString() << QString() << tr("Date") << tr("Type") << tr("Address / Label") << BitcoinUnits::getAmountColumnTitle(walletModel->getOptionsModel()->getDisplayUnit());
priv->refreshWallet(); priv->refreshWallet();
connect(walletModel->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit())); connect(walletModel->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit()));

26
src/qt/transactionview.cpp
View File

@ -46,15 +46,13 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa
QHBoxLayout *hlayout = new QHBoxLayout(); QHBoxLayout *hlayout = new QHBoxLayout();
hlayout->setContentsMargins(0,0,0,0); hlayout->setContentsMargins(0,0,0,0);
if (platformStyle->getUseExtraSpacing()) { if (platformStyle->getUseExtraSpacing()) {
hlayout->setSpacing(5);
hlayout->addSpacing(26);
} else {
hlayout->setSpacing(0); hlayout->setSpacing(0);
hlayout->addSpacing(23); hlayout->addSpacing(6);
} else {
hlayout->setSpacing(1);
hlayout->addSpacing(5);
} }
QString theme = GUIUtil::getThemeName(); QString theme = GUIUtil::getThemeName();
watchOnlyWidget = new QComboBox(this); watchOnlyWidget = new QComboBox(this);
watchOnlyWidget->setFixedWidth(24); watchOnlyWidget->setFixedWidth(24);
@ -65,7 +63,7 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa
dateWidget = new QComboBox(this); dateWidget = new QComboBox(this);
if (platformStyle->getUseExtraSpacing()) { if (platformStyle->getUseExtraSpacing()) {
dateWidget->setFixedWidth(121); dateWidget->setFixedWidth(120);
} else { } else {
dateWidget->setFixedWidth(120); dateWidget->setFixedWidth(120);
} }
@ -81,9 +79,9 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa
typeWidget = new QComboBox(this); typeWidget = new QComboBox(this);
if (platformStyle->getUseExtraSpacing()) { if (platformStyle->getUseExtraSpacing()) {
typeWidget->setFixedWidth(TYPE_COLUMN_WIDTH+1);
} else {
typeWidget->setFixedWidth(TYPE_COLUMN_WIDTH); typeWidget->setFixedWidth(TYPE_COLUMN_WIDTH);
} else {
typeWidget->setFixedWidth(TYPE_COLUMN_WIDTH-1);
} }
typeWidget->addItem(tr("All"), TransactionFilterProxy::ALL_TYPES); typeWidget->addItem(tr("All"), TransactionFilterProxy::ALL_TYPES);
@ -108,6 +106,7 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa
#if QT_VERSION >= 0x040700 #if QT_VERSION >= 0x040700
addressWidget->setPlaceholderText(tr("Enter address or label to search")); addressWidget->setPlaceholderText(tr("Enter address or label to search"));
#endif #endif
addressWidget->setObjectName("addressWidget");
hlayout->addWidget(addressWidget); hlayout->addWidget(addressWidget);
amountWidget = new QLineEdit(this); amountWidget = new QLineEdit(this);
@ -115,11 +114,12 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa
amountWidget->setPlaceholderText(tr("Min amount")); amountWidget->setPlaceholderText(tr("Min amount"));
#endif #endif
if (platformStyle->getUseExtraSpacing()) { if (platformStyle->getUseExtraSpacing()) {
amountWidget->setFixedWidth(97); amountWidget->setFixedWidth(118);
} else { } else {
amountWidget->setFixedWidth(100); amountWidget->setFixedWidth(125);
} }
amountWidget->setValidator(new QDoubleValidator(0, 1e20, 8, this)); amountWidget->setValidator(new QDoubleValidator(0, 1e20, 8, this));
amountWidget->setObjectName("amountWidget");
hlayout->addWidget(amountWidget); hlayout->addWidget(amountWidget);
QVBoxLayout *vlayout = new QVBoxLayout(this); QVBoxLayout *vlayout = new QVBoxLayout(this);
@ -592,6 +592,6 @@ bool TransactionView::eventFilter(QObject *obj, QEvent *event)
// show/hide column Watch-only // show/hide column Watch-only
void TransactionView::updateWatchOnlyColumn(bool fHaveWatchOnly) void TransactionView::updateWatchOnlyColumn(bool fHaveWatchOnly)
{ {
watchOnlyWidget->setVisible(fHaveWatchOnly); watchOnlyWidget->setVisible(true);
transactionView->setColumnHidden(TransactionTableModel::Watchonly, !fHaveWatchOnly); transactionView->setColumnHidden(TransactionTableModel::Watchonly, !fHaveWatchOnly);
} }