Skip to content

Commit 7aa9c43

Browse files
UdjinM6UdjinM6
authored
Few Qt tweaks (#3199)
* Fix "out of sync" label * Fix fallback fee warning label It's too long in some languages (e.g. ru) and this breaks ui * Drop sub-tabs on the Masternode tab
1 parent fd50c1c commit 7aa9c43

File tree

5 files changed

+150
-151
lines changed

5 files changed

+150
-151
lines changed

‎src/qt/forms/masternodelist.ui‎

Lines changed: 114 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
</property>
1616
<layout class="QVBoxLayout" name="topLayout">
1717
<property name="leftMargin">
18-
<number>0</number>
18+
<number>20</number>
1919
</property>
2020
<property name="topMargin">
2121
<number>0</number>
2222
</property>
2323
<property name="rightMargin">
24-
<number>0</number>
24+
<number>20</number>
2525
</property>
2626
<property name="bottomMargin">
2727
<number>0</number>
@@ -45,138 +45,128 @@
4545
</spacer>
4646
</item>
4747
<item>
48-
<widget class="QTabWidget" name="tabWidget">
49-
<property name="currentIndex">
50-
<number>0</number>
51-
</property>
52-
<widget class="QWidget" name="tabDIP3Masternodes">
53-
<attribute name="title">
54-
<string>DIP3 Masternodes</string>
55-
</attribute>
56-
<layout class="QGridLayout" name="gridLayout_3">
57-
<item row="0" column="0">
58-
<layout class="QHBoxLayout" name="horizontalLayout_4">
59-
<property name="bottomMargin">
60-
<number>0</number>
48+
<layout class="QGridLayout" name="gridLayout_3">
49+
<item row="0" column="0">
50+
<layout class="QHBoxLayout" name="horizontalLayout_4">
51+
<property name="bottomMargin">
52+
<number>0</number>
53+
</property>
54+
<item>
55+
<widget class="QLabel" name="label_filter_2">
56+
<property name="text">
57+
<string>Filter List:</string>
6158
</property>
62-
<item>
63-
<widget class="QLabel" name="label_filter_2">
64-
<property name="text">
65-
<string>Filter List:</string>
66-
</property>
67-
</widget>
68-
</item>
69-
<item>
70-
<widget class="QLineEdit" name="filterLineEditDIP3">
71-
<property name="toolTip">
72-
<string>Filter masternode list</string>
73-
</property>
74-
</widget>
75-
</item>
76-
<item>
77-
<widget class="QCheckBox" name="checkBoxMyMasternodesOnly">
78-
<property name="toolTip">
79-
<string>Show only masternodes this wallet has keys for.</string>
80-
</property>
81-
<property name="text">
82-
<string>My masternodes only</string>
83-
</property>
84-
</widget>
85-
</item>
86-
<item>
87-
<spacer name="horizontalSpacer_4">
88-
<property name="orientation">
89-
<enum>Qt::Horizontal</enum>
90-
</property>
91-
<property name="sizeHint" stdset="0">
92-
<size>
93-
<width>10</width>
94-
<height>20</height>
95-
</size>
96-
</property>
97-
</spacer>
98-
</item>
99-
<item>
100-
<widget class="QLabel" name="label_count_2">
101-
<property name="text">
102-
<string>Node Count:</string>
103-
</property>
104-
</widget>
105-
</item>
106-
<item>
107-
<widget class="QLabel" name="countLabelDIP3">
108-
<property name="text">
109-
<string>0</string>
110-
</property>
111-
</widget>
112-
</item>
113-
</layout>
59+
</widget>
11460
</item>
115-
<item row="1" column="0">
116-
<widget class="QTableWidget" name="tableWidgetMasternodesDIP3">
117-
<property name="editTriggers">
118-
<set>QAbstractItemView::NoEditTriggers</set>
61+
<item>
62+
<widget class="QLineEdit" name="filterLineEditDIP3">
63+
<property name="toolTip">
64+
<string>Filter masternode list</string>
11965
</property>
120-
<property name="alternatingRowColors">
121-
<bool>true</bool>
66+
</widget>
67+
</item>
68+
<item>
69+
<widget class="QCheckBox" name="checkBoxMyMasternodesOnly">
70+
<property name="toolTip">
71+
<string>Show only masternodes this wallet has keys for.</string>
12272
</property>
123-
<property name="selectionMode">
124-
<enum>QAbstractItemView::SingleSelection</enum>
73+
<property name="text">
74+
<string>My masternodes only</string>
12575
</property>
126-
<property name="selectionBehavior">
127-
<enum>QAbstractItemView::SelectRows</enum>
76+
</widget>
77+
</item>
78+
<item>
79+
<spacer name="horizontalSpacer_4">
80+
<property name="orientation">
81+
<enum>Qt::Horizontal</enum>
82+
</property>
83+
<property name="sizeHint" stdset="0">
84+
<size>
85+
<width>10</width>
86+
<height>20</height>
87+
</size>
88+
</property>
89+
</spacer>
90+
</item>
91+
<item>
92+
<widget class="QLabel" name="label_count_2">
93+
<property name="text">
94+
<string>Node Count:</string>
12895
</property>
129-
<property name="sortingEnabled">
130-
<bool>true</bool>
96+
</widget>
97+
</item>
98+
<item>
99+
<widget class="QLabel" name="countLabelDIP3">
100+
<property name="text">
101+
<string>0</string>
131102
</property>
132-
<attribute name="horizontalHeaderStretchLastSection">
133-
<bool>true</bool>
134-
</attribute>
135-
<column>
136-
<property name="text">
137-
<string>Address</string>
138-
</property>
139-
</column>
140-
<column>
141-
<property name="text">
142-
<string>Status</string>
143-
</property>
144-
</column>
145-
<column>
146-
<property name="text">
147-
<string>PoSe Score</string>
148-
</property>
149-
</column>
150-
<column>
151-
<property name="text">
152-
<string>Registered</string>
153-
</property>
154-
</column>
155-
<column>
156-
<property name="text">
157-
<string>Last Paid</string>
158-
</property>
159-
</column>
160-
<column>
161-
<property name="text">
162-
<string>Next Payment</string>
163-
</property>
164-
</column>
165-
<column>
166-
<property name="text">
167-
<string>Payee</string>
168-
</property>
169-
</column>
170-
<column>
171-
<property name="text">
172-
<string>Operator Reward</string>
173-
</property>
174-
</column>
175103
</widget>
176104
</item>
177105
</layout>
178-
</widget>
179-
</widget>
106+
</item>
107+
<item row="1" column="0">
108+
<widget class="QTableWidget" name="tableWidgetMasternodesDIP3">
109+
<property name="editTriggers">
110+
<set>QAbstractItemView::NoEditTriggers</set>
111+
</property>
112+
<property name="alternatingRowColors">
113+
<bool>true</bool>
114+
</property>
115+
<property name="selectionMode">
116+
<enum>QAbstractItemView::SingleSelection</enum>
117+
</property>
118+
<property name="selectionBehavior">
119+
<enum>QAbstractItemView::SelectRows</enum>
120+
</property>
121+
<property name="sortingEnabled">
122+
<bool>true</bool>
123+
</property>
124+
<attribute name="horizontalHeaderStretchLastSection">
125+
<bool>true</bool>
126+
</attribute>
127+
<column>
128+
<property name="text">
129+
<string>Address</string>
130+
</property>
131+
</column>
132+
<column>
133+
<property name="text">
134+
<string>Status</string>
135+
</property>
136+
</column>
137+
<column>
138+
<property name="text">
139+
<string>PoSe Score</string>
140+
</property>
141+
</column>
142+
<column>
143+
<property name="text">
144+
<string>Registered</string>
145+
</property>
146+
</column>
147+
<column>
148+
<property name="text">
149+
<string>Last Paid</string>
150+
</property>
151+
</column>
152+
<column>
153+
<property name="text">
154+
<string>Next Payment</string>
155+
</property>
156+
</column>
157+
<column>
158+
<property name="text">
159+
<string>Payee</string>
160+
</property>
161+
</column>
162+
<column>
163+
<property name="text">
164+
<string>Operator Reward</string>
165+
</property>
166+
</column>
167+
</widget>
168+
</item>
169+
</layout>
180170
</item>
181171
</layout>
182172
</item>

‎src/qt/forms/sendcoinsdialog.ui‎

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -744,6 +744,38 @@
744744
</item>
745745
</layout>
746746
</item>
747+
<item>
748+
<spacer name="verticalSpacer_7">
749+
<property name="orientation">
750+
<enum>Qt::Vertical</enum>
751+
</property>
752+
<property name="sizeHint" stdset="0">
753+
<size>
754+
<width>1</width>
755+
<height>10</height>
756+
</size>
757+
</property>
758+
</spacer>
759+
</item>
760+
<item>
761+
<widget class="QLabel" name="fallbackFeeWarningLabel">
762+
<property name="toolTip">
763+
<string>Using the fallbackfee can result in sending a transaction that will take several hours or days (or never) to confirm. Consider choosing your fee manually or wait until you have validated the complete chain.</string>
764+
</property>
765+
<property name="font">
766+
<font>
767+
<weight>75</weight>
768+
<bold>true</bold>
769+
</font>
770+
</property>
771+
<property name="text">
772+
<string>Note: Not enough data for fee estimation, using the fallback fee instead.</string>
773+
</property>
774+
<property name="wordWrap">
775+
<bool>false</bool>
776+
</property>
777+
</widget>
778+
</item>
747779
<item>
748780
<spacer name="verticalSpacer_5">
749781
<property name="orientation">
@@ -759,37 +791,15 @@
759791
</item>
760792
</layout>
761793
</item>
762-
<item>
763-
<widget class="QLabel" name="fallbackFeeWarningLabel">
764-
<property name="toolTip">
765-
<string>Using the fallbackfee can result in sending a transaction that will take several hours or days (or never) to confirm. Consider choosing your fee manually or wait until you have validated the complete chain.</string>
766-
</property>
767-
<property name="font">
768-
<font>
769-
<weight>75</weight>
770-
<bold>true</bold>
771-
</font>
772-
</property>
773-
<property name="text">
774-
<string>Note: Not enough data for fee estimation, using the fallback fee instead.</string>
775-
</property>
776-
<property name="wordWrap">
777-
<bool>false</bool>
778-
</property>
779-
</widget>
780-
</item>
781794
<item>
782795
<spacer name="horizontalSpacer_4">
783796
<property name="orientation">
784797
<enum>Qt::Horizontal</enum>
785798
</property>
786-
<property name="sizeType">
787-
<enum>QSizePolicy::MinimumExpanding</enum>
788-
</property>
789799
<property name="sizeHint" stdset="0">
790800
<size>
791-
<width>40</width>
792-
<height>20</height>
801+
<width>1</width>
802+
<height>1</height>
793803
</size>
794804
</property>
795805
</spacer>

‎src/qt/res/css/light-hires.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ min-height:30px;
10071007
QWidget .QFrame#frame_2 .QLabel#labelTransactionsStatus { /* Recent Transactions Sync Status */
10081008
qproperty-alignment: 'AlignBottom | AlignRight';
10091009
min-width:93px;
1010-
margin-top:83px;
1010+
margin-top:0;
10111011
margin-left:16px;
10121012
margin-right:5px;
10131013
min-height:16px;

‎src/qt/res/css/light.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ min-height:30px;
10071007
QWidget .QFrame#frame_2 .QLabel#labelTransactionsStatus { /* Recent Transactions Sync Status */
10081008
qproperty-alignment: 'AlignBottom | AlignRight';
10091009
min-width:93px;
1010-
margin-top:83px;
1010+
margin-top:0;
10111011
margin-left:16px;
10121012
margin-right:5px;
10131013
min-height:16px;

‎src/qt/sendcoinsdialog.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,6 @@ void SendCoinsDialog::updateSmartFeeLabel()
752752
ui->labelSmartFee2->show(); // (Smart fee not initialized yet. This usually takes a few blocks...)
753753
ui->labelFeeEstimation->setText("");
754754
ui->fallbackFeeWarningLabel->setVisible(true);
755-
ui->fallbackFeeWarningLabel->setIndent(QFontMetrics(ui->fallbackFeeWarningLabel->font()).width("x"));
756755
}
757756
else
758757
{

0 commit comments

Comments
 (0)