Skip to content

Commit

Permalink
GUI Improvements
Browse files Browse the repository at this point in the history 
- More scalable
  • Loading branch information
Oliver Ziegler authored and Oliver Ziegler committed Jan 3, 2020
1 parent 9a729cf commit 13fdfec
Show file tree
Hide file tree
Showing 7 changed files with 94 additions and 54 deletions.
14 changes: 7 additions & 7 deletions src/qt/forms/easysplitdialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>921</width>
<width>882</width>
<height>536</height>
</rect>
</property>
Expand Down Expand Up @@ -650,7 +650,7 @@ color:#616b7b;</string>
<rect>
<x>0</x>
<y>0</y>
<width>899</width>
<width>860</width>
<height>69</height>
</rect>
</property>
Expand Down Expand Up @@ -1343,15 +1343,15 @@ margin:5px
</widget>
<customwidgets>
<customwidget>
<class>BitcoinAmountField</class>
<class>QValidatedLineEdit</class>
<extends>QLineEdit</extends>
<header>bitcoinamountfield.h</header>
<container>1</container>
<header>qvalidatedlineedit.h</header>
</customwidget>
<customwidget>
<class>QValidatedLineEdit</class>
<class>BitcoinAmountField</class>
<extends>QLineEdit</extends>
<header>qvalidatedlineedit.h</header>
<header>bitcoinamountfield.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources>
Expand Down
7 changes: 5 additions & 2 deletions src/qt/forms/optionsdialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>958</width>
<height>662</height>
<width>541</width>
<height>587</height>
</rect>
</property>
<property name="windowTitle">
Expand Down Expand Up @@ -41,6 +41,9 @@ border-top-left-radius:0px;</string>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>20</number>
</property>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
Expand Down
50 changes: 42 additions & 8 deletions src/qt/forms/overviewpage.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>1022</width>
<width>830</width>
<height>493</height>
</rect>
</property>
Expand Down Expand Up @@ -63,6 +63,9 @@
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
Expand All @@ -81,7 +84,7 @@
</property>
<property name="sizeHint" stdset="0">
<size>
<width>30</width>
<width>55</width>
<height>20</height>
</size>
</property>
Expand Down Expand Up @@ -115,7 +118,7 @@ font-size: 20px;
</string>
</property>
<property name="text">
<string>WALLET OVERVIEW</string>
<string>Wallet Overview</string>
</property>
<property name="alignment">
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
Expand Down Expand Up @@ -154,6 +157,9 @@ font-size: 20px;
<property name="spacing">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
Expand All @@ -168,6 +174,9 @@ font-size: 20px;
<property name="rightMargin">
<number>30</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_2">
<property name="minimumSize">
Expand Down Expand Up @@ -206,8 +215,7 @@ font-size: 20px;
<property name="styleSheet">
<string notr="true">background:#232c41;
padding:2px;
border-radius:10px;
</string>
border-radius:10px;</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<property name="leftMargin">
Expand Down Expand Up @@ -444,7 +452,7 @@ font-size:16px;</string>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_7" stretch="0">
<layout class="QHBoxLayout" name="horizontalLayout_7" stretch="0,0">
<property name="spacing">
<number>6</number>
</property>
Expand Down Expand Up @@ -477,6 +485,19 @@ font-size:16px;
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_15">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_18">
<property name="styleSheet">
Expand All @@ -490,6 +511,19 @@ font-size:16px;</string>
</item>
</layout>
</item>
<item>
<spacer name="horizontalSpacer_14">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
Expand Down Expand Up @@ -582,7 +616,7 @@ font-size: 16px;</string>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
Expand All @@ -601,7 +635,7 @@ font-size: 16px;</string>
</property>
<property name="styleSheet">
<string notr="true">color:#a5b1ba;
font-size:24px;</string>
font-size:15px;</string>
</property>
<property name="text">
<string>TgoucTzGcbzPx7y5u9ai56NEs5WnNZmtvg</string>
Expand Down
31 changes: 24 additions & 7 deletions src/qt/forms/receivecoinsdialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>833</width>
<height>690</height>
<width>628</width>
<height>655</height>
</rect>
</property>
<property name="WindowText" stdset="0">
Expand Down Expand Up @@ -87,7 +87,7 @@ border-color:white;</string>
<property name="styleSheet">
<string notr="true">color:#b9dbe8;
background-color:#1b2234;
padding-top:25px;
padding-top:22px;
font-size:20px;

</string>
Expand Down Expand Up @@ -115,7 +115,7 @@ font-size:20px;
<property name="styleSheet">
<string notr="true">color:#566070;
background-color:#1b2234;
padding-top:25px;
padding-top:32px;
font-size:20px;</string>
</property>
<property name="text">
Expand All @@ -131,7 +131,7 @@ color:#a5c3d1;
backcolor:black;
color:#acbecd;
background-color:#1b2234;
padding-top:25px;
padding-top:32px;

</string>
</property>
Expand Down Expand Up @@ -165,7 +165,7 @@ padding-top:25px;
<property name="spacing">
<number>0</number>
</property>
<item row="0" column="0">
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2" stretch="10,1">
<property name="spacing">
<number>10</number>
Expand Down Expand Up @@ -224,7 +224,8 @@ border-top: 1px solid #2b3651;</string>
<widget class="QLabel" name="label_17">
<property name="styleSheet">
<string notr="true">color:#566070;
font-size:16px;</string>
font-size:16px;
</string>
</property>
<property name="text">
<string>YOUR WALLET ADDRESS</string>
Expand Down Expand Up @@ -366,6 +367,22 @@ title:none;
</item>
</layout>
</item>
<item row="0" column="0">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
Expand Down
4 changes: 2 additions & 2 deletions src/qt/forms/receiverequestdialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>487</width>
<height>597</height>
<width>375</width>
<height>441</height>
</rect>
</property>
<property name="styleSheet">
Expand Down
8 changes: 5 additions & 3 deletions src/qt/forms/sendcoinsdialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>957</width>
<height>770</height>
<width>749</width>
<height>666</height>
</rect>
</property>
<property name="windowTitle">
Expand Down Expand Up @@ -332,7 +332,7 @@ color:#39df7b;</string>
<widget class="QPushButton" name="pushButtonCoinControl">
<property name="styleSheet">
<string notr="true">QPushButton::pressed{
background:#232c41;
background:#29334b;
border: none;
padding:2px;
border-radius: 5px;
Expand All @@ -350,6 +350,8 @@ border-radius: 5px;
height:35px;
padding-left:15px;
padding-right:15px;
box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.1) inset,
0px 1px 4px 0px rgba(0, 0, 0, 0.1) inset !important;
}

</string>
Expand Down
Loading

0 comments on commit 13fdfec

Please sign in to comment.