Skip to content

Coin Control overhaul, various style fixes #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
phorevendors wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Coin Control overhaul, various style fixes #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/qt/addressbookpage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,9 @@ void AddressBookPage::setModel(AddressTableModel* model)
ui->tableView->horizontalHeader()->setSectionResizeMode(AddressTableModel::Address, QHeaderView::ResizeToContents);
#endif

ui->tableView->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft | Qt::AlignVCenter);
ui->tableView->horizontalHeader()->setTextElideMode(Qt::ElideRight);

connect(ui->tableView->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
this, SLOT(selectionChanged()));

Expand Down
17 changes: 11 additions & 6 deletions src/qt/coincontroldialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,19 +131,24 @@ CoinControlDialog::CoinControlDialog(QWidget* parent, bool fMultisigEnabled) : Q
// see https://github.com/bitcoin/bitcoin/issues/5716
ui->treeWidget->headerItem()->setText(COLUMN_CHECKBOX, QString());

ui->treeWidget->setColumnWidth(COLUMN_CHECKBOX, 84);
ui->treeWidget->setColumnWidth(COLUMN_AMOUNT, 100);
ui->treeWidget->setColumnWidth(COLUMN_LABEL, 170);
ui->treeWidget->setColumnWidth(COLUMN_ADDRESS, 190);
ui->treeWidget->setColumnWidth(COLUMN_CHECKBOX, 40);
ui->treeWidget->setColumnWidth(COLUMN_AMOUNT, 120);
ui->treeWidget->setColumnWidth(COLUMN_LABEL, 110);
ui->treeWidget->setColumnWidth(COLUMN_ADDRESS, 220);
ui->treeWidget->setColumnWidth(COLUMN_DATE, 80);
ui->treeWidget->setColumnWidth(COLUMN_CONFIRMATIONS, 100);
ui->treeWidget->setColumnWidth(COLUMN_CONFIRMATIONS, 140);
ui->treeWidget->setColumnWidth(COLUMN_PRIORITY, 100);
ui->treeWidget->setColumnHidden(COLUMN_TXHASH, true); // store transacton hash in this column, but dont show it
ui->treeWidget->setColumnHidden(COLUMN_VOUT_INDEX, true); // store vout index in this column, but dont show it
ui->treeWidget->setColumnHidden(COLUMN_AMOUNT_INT64, true); // store amount int64 in this column, but dont show it
ui->treeWidget->setColumnHidden(COLUMN_PRIORITY_INT64, true); // store priority int64 in this column, but dont show it
ui->treeWidget->setColumnHidden(COLUMN_DATE_INT64, true); // store date int64 in this column, but dont show it

ui->treeWidget->header()->setDefaultAlignment(Qt::AlignLeft | Qt::AlignVCenter);
ui->treeWidget->header()->setTextElideMode(Qt::ElideRight);

//ui->treeWidget->header()->setDefaultAlignment(Qt::AlignLeft);

// default view is sorted by amount desc
sortView(COLUMN_AMOUNT_INT64, Qt::DescendingOrder);

Expand Down Expand Up @@ -740,7 +745,7 @@ void CoinControlDialog::updateView()

ui->treeWidget->clear();
ui->treeWidget->setEnabled(false); // performance, otherwise updateLabels would be called for every checked checkbox
ui->treeWidget->setAlternatingRowColors(!treeMode);
//ui->treeWidget->setAlternatingRowColors(!treeMode);
QFlags<Qt::ItemFlag> flgCheckbox = Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable;
QFlags<Qt::ItemFlag> flgTristate = Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsTristate;

Expand Down
11 changes: 7 additions & 4 deletions src/qt/forms/coincontroldialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,9 @@
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>
<property name="indentation">
<number>0</number>
</property>
<property name="sortingEnabled">
<bool>false</bool>
</property>
Expand All @@ -467,21 +470,21 @@
</column>
<column>
<property name="text">
<string>Received with label</string>
<string>Label</string>
</property>
</column>
<column>
<property name="text">
<string>Received with address</string>
<string>Address</string>
</property>
</column>
<column>
<property name="text">
<string>Type</string>
<string>Type</string>
</property>
</column>
<column>
<property name="text">
<property name="text">
<string>Date</string>
</property>
</column>
Expand Down
9 changes: 1 addition & 8 deletions src/qt/forms/optionsdialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</font>
</property>
<property name="currentIndex">
<number>2</number>
<number>4</number>
</property>
<widget class="QWidget" name="tabMain">
<attribute name="title">
Expand Down Expand Up @@ -590,13 +590,6 @@ https://www.transifex.com/axiv-project/axiv-project-translations</string>
</item>
</layout>
</item>
<item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2_Display">
<item>
Expand Down
78 changes: 8 additions & 70 deletions src/qt/forms/sendcoinsdialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
</property>
<item>
<widget class="QFrame" name="frameCoinControl_BG">
<layout class="QVBoxLayout" name="verticalLayoutCoinControl" stretch="0,0,0,0,0,0">
<layout class="QVBoxLayout" name="verticalLayoutCoinControl" stretch="0,0,0,0,0">
<property name="spacing">
<number>1</number>
</property>
Expand All @@ -171,68 +171,6 @@
<property name="topMargin">
<number>10</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayoutCoinControl1">
<property name="bottomMargin">
<number>15</number>
</property>
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
<number>6</number>
</property>
<item>
<widget class="QLabel" name="labelCoinControlFeatures">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="styleSheet">
<string notr="true">font-weight:bold;</string>
</property>
<property name="text">
<string>Coin Control Features</string>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line">
<property name="minimumSize">
<size>
<width>0</width>
<height>1</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>1</height>
</size>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayoutCoinControl2" stretch="0,0,0,0">
<property name="spacing">
Expand Down Expand Up @@ -869,7 +807,7 @@
<x>0</x>
<y>0</y>
<width>938</width>
<height>72</height>
<height>76</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,1">
Expand Down Expand Up @@ -1575,12 +1513,12 @@
</property>
<item>
<widget class="QPushButton" name="sendButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<family>Andale Mono</family>
Expand Down
22 changes: 12 additions & 10 deletions src/qt/res/css/default.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ QStatusBar {
background-color:#2d303a;
background-color:rgba(0,0,0,0.1);
min-height:50px;
color:#a8ad99;
}

QWidget {
Expand Down Expand Up @@ -267,7 +268,7 @@ outline:0; /* Remove Annoying Focus Rectangle */

QGroupBox {
background-color:transparent;
color:#333;
color:#f9ffdc;
}

QToolTip {
Expand Down Expand Up @@ -359,7 +360,7 @@ letter-spacing:1px;

QPushButton:hover {
/* background-color: qlineargradient(y1:0, y2: 1, stop: 0 #ffffff, stop: 0.1 #ffffff, stop: 0.101 #f9ffdc, stop: 0.9 #f9ffdc, stop: 0.901 #ffffff, stop: 1 #ffffff); */
background:transparent;
background-color: #dee4c4;
}

QPushButton:focus {
Expand All @@ -370,7 +371,7 @@ QPushButton:focus {
QPushButton:pressed {
background-color: #f9ffdc;
border:1px solid #000000;
background-color: qlineargradient(y1:0, y2: 1, stop: 0 #00ff00, stop: 0.1 #00ff00, stop: 0.101 #f9ffdc, stop: 0.9 #f9ffdc, stop: 0.901 #00ff00, stop: 1 #00ff00);
/* background-color: qlineargradient(y1:0, y2: 1, stop: 0 #00ff00, stop: 0.1 #00ff00, stop: 0.101 #f9ffdc, stop: 0.9 #f9ffdc, stop: 0.901 #00ff00, stop: 1 #00ff00); */
}

/* Special handling for statusbar-icons (which are partly QPushButtons) */
Expand Down Expand Up @@ -808,7 +809,7 @@ QTableView:focus {
QTreeWidget { /* Tree Background */
background-color:#fcfcfc;
alternate-background-color:#f2f2f2;
color:#333;
color:#f9ffdc;
}

QScrollBar {
Expand Down Expand Up @@ -1047,7 +1048,8 @@ border:1px solid #9e9e9e;
/**************************** SEND AND RECEIVE ADDRESSES DIALOG *****************************/

QWidget#AddressBookPage {
background-color:transparent;
/* background-color:transparent; */
background-color: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop: 0 #484E5E, stop: 1 #2C2F38);
}

/* QWidget#AddressBookPage QPushButton#newAddress { /* New Address Button */
Expand Down Expand Up @@ -1188,7 +1190,7 @@ color: #f9ffdc;
}

QDialog#RPCConsole QTableView#peerWidget::item { /* Peers Table Items */
color:#333;
color:#f9ffdc;
}

QDialog#RPCConsole QPushButton#openDebugLogfileButton {
Expand Down Expand Up @@ -1903,16 +1905,16 @@ color:transparent;

QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget { /* Coin Control Widget Container */
outline:0;
background-color:#ffffff;
border:1px solid #333;
background-color:transparent;
border:0;
}

QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item {
}

QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:selected { /* Coin Control Item (selected) */
background-color: #f9ffdc;
color:#fff;
background-color: rgba(0,0,0,0.2);
color:#f9ffdc;
}

QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:checked { /* Coin Control Item (checked) */
Expand Down