diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp index 93a18f50c..aecb2fabf 100755 --- a/src/qt/addressbookpage.cpp +++ b/src/qt/addressbookpage.cpp @@ -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())); diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index 4fc012618..ef0d8bbc8 100755 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -131,12 +131,12 @@ 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 @@ -144,6 +144,11 @@ CoinControlDialog::CoinControlDialog(QWidget* parent, bool fMultisigEnabled) : Q 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); @@ -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 flgCheckbox = Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable; QFlags flgTristate = Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsTristate; diff --git a/src/qt/forms/coincontroldialog.ui b/src/qt/forms/coincontroldialog.ui index fe21c3921..847c6593a 100755 --- a/src/qt/forms/coincontroldialog.ui +++ b/src/qt/forms/coincontroldialog.ui @@ -443,6 +443,9 @@ Qt::CustomContextMenu + + 0 + false @@ -467,21 +470,21 @@ - Received with label + Label - Received with address + Address - Type + Type - + Date diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui index 446ad22bb..4da4f0a1e 100644 --- a/src/qt/forms/optionsdialog.ui +++ b/src/qt/forms/optionsdialog.ui @@ -25,7 +25,7 @@ - 2 + 4 @@ -590,13 +590,6 @@ https://www.transifex.com/axiv-project/axiv-project-translations - - - - Qt::Horizontal - - - diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui index 722b061d5..a053c9199 100644 --- a/src/qt/forms/sendcoinsdialog.ui +++ b/src/qt/forms/sendcoinsdialog.ui @@ -161,7 +161,7 @@ - + 1 @@ -171,68 +171,6 @@ 10 - - - - 15 - - - - - 6 - - - - - - 0 - 0 - - - - - 0 - 20 - - - - - 12 - 75 - true - - - - font-weight:bold; - - - Coin Control Features - - - - - - - - 0 - 1 - - - - - 16777215 - 1 - - - - Qt::Horizontal - - - - - - - @@ -869,7 +807,7 @@ 0 0 938 - 72 + 76 @@ -1575,12 +1513,12 @@ - - - 0 - 0 - - + + + 0 + 0 + + Andale Mono diff --git a/src/qt/res/css/default.css b/src/qt/res/css/default.css index c7f8e1843..b9f46f3c6 100755 --- a/src/qt/res/css/default.css +++ b/src/qt/res/css/default.css @@ -40,6 +40,7 @@ QStatusBar { background-color:#2d303a; background-color:rgba(0,0,0,0.1); min-height:50px; +color:#a8ad99; } QWidget { @@ -267,7 +268,7 @@ outline:0; /* Remove Annoying Focus Rectangle */ QGroupBox { background-color:transparent; -color:#333; +color:#f9ffdc; } QToolTip { @@ -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 { @@ -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) */ @@ -808,7 +809,7 @@ QTableView:focus { QTreeWidget { /* Tree Background */ background-color:#fcfcfc; alternate-background-color:#f2f2f2; -color:#333; +color:#f9ffdc; } QScrollBar { @@ -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 */ @@ -1188,7 +1190,7 @@ color: #f9ffdc; } QDialog#RPCConsole QTableView#peerWidget::item { /* Peers Table Items */ -color:#333; +color:#f9ffdc; } QDialog#RPCConsole QPushButton#openDebugLogfileButton { @@ -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) */