Skip to content

Commit

Permalink
Merge branch 'new-ui_v1.5white' into new-ui_v1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ciip1996
Ciip1996 authored Mar 29, 2019
2 parents cfefebb + 0706d47 commit 2e2c5de
Show file tree
Hide file tree
Showing 65 changed files with 1,511 additions and 2,155 deletions.
5 changes: 5 additions & 0 deletions src/Makefile.qt.include
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@ RES_ICONS = \
qt/res/icons/light/overview.png \
qt/res/icons/light/quit.png \
qt/res/icons/light/receive.png \
qt/res/icons/light/refresh.png \
qt/res/icons/light/remove.png \
qt/res/icons/light/send.png \
qt/res/icons/light/synced.png \
Expand Down Expand Up @@ -423,6 +424,7 @@ RES_ICONS = \
qt/res/icons/pac/connect2_16.png \
qt/res/icons/pac/connect3_16.png \
qt/res/icons/pac/connect4_16.png \
qt/res/icons/pac/refresh.png \
qt/res/icons/pac/transaction0.png \
qt/res/icons/pac/transaction2.png \
qt/res/icons/pac/transaction_conflicted.png \
Expand Down Expand Up @@ -574,8 +576,11 @@ RES_IMAGES = \
qt/res/images/light/unchecked.png \
qt/res/images/light/checked.png \
qt/res/images/light/drkblue_downArrow.png \
qt/res/images/light/drkblue_downArrow_black.png \
qt/res/images/light/drkblue_downArrow_small.png \
qt/res/images/light/drkblue_upArrow_small.png \
qt/res/images/light/drkblue_downArrow_small_black.png \
qt/res/images/light/drkblue_upArrow_small_black.png \
qt/res/images/light/drkblue_leftArrow_small.png \
qt/res/images/light/drkblue_rightArrow_small.png \
qt/res/images/light/drkblue_qtreeview_selected.png \
Expand Down
4 changes: 2 additions & 2 deletions src/qt/bitcoingui.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -773,14 +773,14 @@ void BitcoinGUI::createHeaderBar()
btnRefresh->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
btnRefresh->setFixedHeight(20);
btnRefresh->setFixedWidth(20);
btnRefresh->setIcon(QIcon(":/movies/spinner-000"));
btnRefresh->setObjectName("refreshTopBar");

btnCopyNews->setProperty("class","QuickButton");
btnCopyNews->setToolTip("Copy news.");
btnCopyNews->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
btnCopyNews->setFixedHeight(24);
btnCopyNews->setFixedWidth(24);
btnCopyNews->setIcon(QIcon(":/icons/pac/editcopy"));
btnCopyNews->setObjectName("copyNews");

profileImgLayout->setContentsMargins(0,0,0,0);
profileImgLayout->addWidget(btnImg);
Expand Down
75 changes: 74 additions & 1 deletion src/qt/forms/overviewpage.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,22 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<spacer name="horizontalSpacer_12">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="labelBalanceText">
<property name="sizePolicy">
Expand All @@ -156,8 +172,27 @@
<property name="class" stdset="0">
<string>titleLabel</string>
</property>
<property name="class2" stdset="0">
<string>yellowUnderline</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_13">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
Expand Down Expand Up @@ -793,7 +828,7 @@
</size>
</property>
<property name="styleSheet">
<string notr="true">border-image: url(&quot;:/icons/pac/info&quot;);</string>
<string notr="true"/>
</property>
<property name="text">
<string/>
Expand Down Expand Up @@ -859,6 +894,22 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<spacer name="horizontalSpacer_11">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_4">
<property name="font">
Expand All @@ -868,6 +919,9 @@
<bold>false</bold>
</font>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>RECENT TRANSACTIONS</string>
</property>
Expand All @@ -877,8 +931,27 @@
<property name="class" stdset="0">
<string>titleLabel</string>
</property>
<property name="class2" stdset="0">
<string>yellowUnderline</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_10">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
Expand Down
74 changes: 58 additions & 16 deletions src/qt/forms/privatepage.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<property name="class" stdset="0">
<string>container</string>
</property>
<layout class="QVBoxLayout" name="VerticalLayout_PS1">
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
Expand Down Expand Up @@ -174,7 +177,7 @@
<string>Information about PrivateSend and Mixing</string>
</property>
<property name="styleSheet">
<string notr="true">border-image: url(&quot;:/icons/pac/info&quot;);</string>
<string notr="true"/>
</property>
<property name="text">
<string/>
Expand All @@ -187,21 +190,60 @@
</layout>
</item>
<item>
<widget class="QLabel" name="labelPrivateSendHeader">
<property name="font">
<font>
<pointsize>18</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>PRIVATE</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<spacer name="horizontalSpacer_7">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="labelPrivateSendHeader">
<property name="font">
<font>
<pointsize>18</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>PRIVATE</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="class2" stdset="0">
<string>yellowUnderline</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_8">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</item>
Expand Down
Loading

0 comments on commit 2e2c5de

Please sign in to comment.