Skip to content

Commit 2e2c5de

Browse files
Ciip1996Ciip1996
authored
Merge branch 'new-ui_v1.5white' into new-ui_v1.4
2 parents cfefebb + 0706d47 commit 2e2c5de

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1511
-2155
lines changed

‎src/Makefile.qt.include‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,7 @@ RES_ICONS = \
342342
qt/res/icons/light/overview.png \
343343
qt/res/icons/light/quit.png \
344344
qt/res/icons/light/receive.png \
345+
qt/res/icons/light/refresh.png \
345346
qt/res/icons/light/remove.png \
346347
qt/res/icons/light/send.png \
347348
qt/res/icons/light/synced.png \
@@ -423,6 +424,7 @@ RES_ICONS = \
423424
qt/res/icons/pac/connect2_16.png \
424425
qt/res/icons/pac/connect3_16.png \
425426
qt/res/icons/pac/connect4_16.png \
427+
qt/res/icons/pac/refresh.png \
426428
qt/res/icons/pac/transaction0.png \
427429
qt/res/icons/pac/transaction2.png \
428430
qt/res/icons/pac/transaction_conflicted.png \
@@ -574,8 +576,11 @@ RES_IMAGES = \
574576
qt/res/images/light/unchecked.png \
575577
qt/res/images/light/checked.png \
576578
qt/res/images/light/drkblue_downArrow.png \
579+
qt/res/images/light/drkblue_downArrow_black.png \
577580
qt/res/images/light/drkblue_downArrow_small.png \
578581
qt/res/images/light/drkblue_upArrow_small.png \
582+
qt/res/images/light/drkblue_downArrow_small_black.png \
583+
qt/res/images/light/drkblue_upArrow_small_black.png \
579584
qt/res/images/light/drkblue_leftArrow_small.png \
580585
qt/res/images/light/drkblue_rightArrow_small.png \
581586
qt/res/images/light/drkblue_qtreeview_selected.png \

‎src/qt/bitcoingui.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -773,14 +773,14 @@ void BitcoinGUI::createHeaderBar()
773773
btnRefresh->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
774774
btnRefresh->setFixedHeight(20);
775775
btnRefresh->setFixedWidth(20);
776-
btnRefresh->setIcon(QIcon(":/movies/spinner-000"));
776+
btnRefresh->setObjectName("refreshTopBar");
777777

778778
btnCopyNews->setProperty("class","QuickButton");
779779
btnCopyNews->setToolTip("Copy news.");
780780
btnCopyNews->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
781781
btnCopyNews->setFixedHeight(24);
782782
btnCopyNews->setFixedWidth(24);
783-
btnCopyNews->setIcon(QIcon(":/icons/pac/editcopy"));
783+
btnCopyNews->setObjectName("copyNews");
784784

785785
profileImgLayout->setContentsMargins(0,0,0,0);
786786
profileImgLayout->addWidget(btnImg);

‎src/qt/forms/overviewpage.ui‎

Lines changed: 74 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,22 @@
132132
</item>
133133
<item>
134134
<layout class="QHBoxLayout" name="horizontalLayout_3">
135+
<item>
136+
<spacer name="horizontalSpacer_12">
137+
<property name="orientation">
138+
<enum>Qt::Horizontal</enum>
139+
</property>
140+
<property name="sizeType">
141+
<enum>QSizePolicy::Fixed</enum>
142+
</property>
143+
<property name="sizeHint" stdset="0">
144+
<size>
145+
<width>20</width>
146+
<height>20</height>
147+
</size>
148+
</property>
149+
</spacer>
150+
</item>
135151
<item>
136152
<widget class="QLabel" name="labelBalanceText">
137153
<property name="sizePolicy">
@@ -156,8 +172,27 @@
156172
<property name="class" stdset="0">
157173
<string>titleLabel</string>
158174
</property>
175+
<property name="class2" stdset="0">
176+
<string>yellowUnderline</string>
177+
</property>
159178
</widget>
160179
</item>
180+
<item>
181+
<spacer name="horizontalSpacer_13">
182+
<property name="orientation">
183+
<enum>Qt::Horizontal</enum>
184+
</property>
185+
<property name="sizeType">
186+
<enum>QSizePolicy::Fixed</enum>
187+
</property>
188+
<property name="sizeHint" stdset="0">
189+
<size>
190+
<width>20</width>
191+
<height>20</height>
192+
</size>
193+
</property>
194+
</spacer>
195+
</item>
161196
</layout>
162197
</item>
163198
<item>
@@ -793,7 +828,7 @@
793828
</size>
794829
</property>
795830
<property name="styleSheet">
796-
<string notr="true">border-image: url(&quot;:/icons/pac/info&quot;);</string>
831+
<string notr="true"/>
797832
</property>
798833
<property name="text">
799834
<string/>
@@ -859,6 +894,22 @@
859894
</item>
860895
<item>
861896
<layout class="QHBoxLayout" name="horizontalLayout_2">
897+
<item>
898+
<spacer name="horizontalSpacer_11">
899+
<property name="orientation">
900+
<enum>Qt::Horizontal</enum>
901+
</property>
902+
<property name="sizeType">
903+
<enum>QSizePolicy::Fixed</enum>
904+
</property>
905+
<property name="sizeHint" stdset="0">
906+
<size>
907+
<width>20</width>
908+
<height>20</height>
909+
</size>
910+
</property>
911+
</spacer>
912+
</item>
862913
<item>
863914
<widget class="QLabel" name="label_4">
864915
<property name="font">
@@ -868,6 +919,9 @@
868919
<bold>false</bold>
869920
</font>
870921
</property>
922+
<property name="styleSheet">
923+
<string notr="true"/>
924+
</property>
871925
<property name="text">
872926
<string>RECENT TRANSACTIONS</string>
873927
</property>
@@ -877,8 +931,27 @@
877931
<property name="class" stdset="0">
878932
<string>titleLabel</string>
879933
</property>
934+
<property name="class2" stdset="0">
935+
<string>yellowUnderline</string>
936+
</property>
880937
</widget>
881938
</item>
939+
<item>
940+
<spacer name="horizontalSpacer_10">
941+
<property name="orientation">
942+
<enum>Qt::Horizontal</enum>
943+
</property>
944+
<property name="sizeType">
945+
<enum>QSizePolicy::Fixed</enum>
946+
</property>
947+
<property name="sizeHint" stdset="0">
948+
<size>
949+
<width>20</width>
950+
<height>20</height>
951+
</size>
952+
</property>
953+
</spacer>
954+
</item>
882955
</layout>
883956
</item>
884957
<item>

‎src/qt/forms/privatepage.ui‎

Lines changed: 58 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@
9494
<property name="frameShadow">
9595
<enum>QFrame::Raised</enum>
9696
</property>
97+
<property name="class" stdset="0">
98+
<string>container</string>
99+
</property>
97100
<layout class="QVBoxLayout" name="VerticalLayout_PS1">
98101
<item>
99102
<layout class="QVBoxLayout" name="verticalLayout_3">
@@ -174,7 +177,7 @@
174177
<string>Information about PrivateSend and Mixing</string>
175178
</property>
176179
<property name="styleSheet">
177-
<string notr="true">border-image: url(&quot;:/icons/pac/info&quot;);</string>
180+
<string notr="true"/>
178181
</property>
179182
<property name="text">
180183
<string/>
@@ -187,21 +190,60 @@
187190
</layout>
188191
</item>
189192
<item>
190-
<widget class="QLabel" name="labelPrivateSendHeader">
191-
<property name="font">
192-
<font>
193-
<pointsize>18</pointsize>
194-
<weight>50</weight>
195-
<bold>false</bold>
196-
</font>
197-
</property>
198-
<property name="text">
199-
<string>PRIVATE</string>
200-
</property>
201-
<property name="alignment">
202-
<set>Qt::AlignCenter</set>
203-
</property>
204-
</widget>
193+
<layout class="QHBoxLayout" name="horizontalLayout_3">
194+
<item>
195+
<spacer name="horizontalSpacer_7">
196+
<property name="orientation">
197+
<enum>Qt::Horizontal</enum>
198+
</property>
199+
<property name="sizeType">
200+
<enum>QSizePolicy::Preferred</enum>
201+
</property>
202+
<property name="sizeHint" stdset="0">
203+
<size>
204+
<width>40</width>
205+
<height>20</height>
206+
</size>
207+
</property>
208+
</spacer>
209+
</item>
210+
<item>
211+
<widget class="QLabel" name="labelPrivateSendHeader">
212+
<property name="font">
213+
<font>
214+
<pointsize>18</pointsize>
215+
<weight>50</weight>
216+
<bold>false</bold>
217+
</font>
218+
</property>
219+
<property name="text">
220+
<string>PRIVATE</string>
221+
</property>
222+
<property name="alignment">
223+
<set>Qt::AlignCenter</set>
224+
</property>
225+
<property name="class2" stdset="0">
226+
<string>yellowUnderline</string>
227+
</property>
228+
</widget>
229+
</item>
230+
<item>
231+
<spacer name="horizontalSpacer_8">
232+
<property name="orientation">
233+
<enum>Qt::Horizontal</enum>
234+
</property>
235+
<property name="sizeType">
236+
<enum>QSizePolicy::Preferred</enum>
237+
</property>
238+
<property name="sizeHint" stdset="0">
239+
<size>
240+
<width>40</width>
241+
<height>20</height>
242+
</size>
243+
</property>
244+
</spacer>
245+
</item>
246+
</layout>
205247
</item>
206248
</layout>
207249
</item>

0 commit comments

Comments
 (0)