Skip to content

Commit

Permalink
New skin (#1)
Browse files Browse the repository at this point in the history
  • Loading branch information
devfsc authored and alejandromgk committed Jan 20, 2018
1 parent 202a6b9 commit 636ebb3
Show file tree
Hide file tree
Showing 145 changed files with 68 additions and 89 deletions.
10 changes: 9 additions & 1 deletion src/qt/bitcoingui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -554,8 +554,16 @@ void BitcoinGUI::createToolBars()
#ifdef ENABLE_WALLET
if(walletFrame)
{
QLabel* mainIcon = new QLabel();
mainIcon->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
mainIcon->setPixmap(QPixmap(":icons/bitcoin"));
mainIcon->setAlignment(Qt::AlignCenter);

QToolBar *toolbar = new QToolBar(tr("Tabs toolbar"));
toolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
addToolBar(Qt::LeftToolBarArea, toolbar);
toolbar->addWidget(mainIcon);
toolbar->setOrientation(Qt::Vertical);
toolbar->addAction(overviewAction);
toolbar->addAction(sendCoinsAction);
toolbar->addAction(receiveCoinsAction);
Expand All @@ -571,7 +579,7 @@ void BitcoinGUI::createToolBars()
/** Create additional container for toolbar and walletFrame and make it the central widget.
This is a workaround mostly for toolbar styling on Mac OS but should work fine for every other OSes too.
*/
QVBoxLayout *layout = new QVBoxLayout;
QHBoxLayout *layout = new QHBoxLayout;
layout->addWidget(toolbar);
layout->addWidget(walletFrame);
layout->setSpacing(0);
Expand Down
25 changes: 3 additions & 22 deletions src/qt/forms/masternodelist.ui
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>723</width>
<height>457</height>
<width>968</width>
<height>433</height>
</rect>
</property>
<property name="windowTitle">
Expand Down Expand Up @@ -67,7 +67,7 @@
<item>
<widget class="QLabel" name="updateNote">
<property name="text">
<string>Note: Status of your masternodes in local wallet can potentially be slightly incorrect.&lt;br /&gt;Always wait for wallet to sync additional data and then double check from another node&lt;br /&gt;if your masternode should be running but you still do not see "ENABLED" in "Status" field.</string>
<string>Note: Status of your masternodes in local wallet can potentially be slightly incorrect.&lt;br /&gt;Always wait for wallet to sync additional data and then double check from another node&lt;br /&gt;if your masternode should be running but you still do not see &quot;ENABLED&quot; in &quot;Status&quot; field.</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -99,9 +99,6 @@
<attribute name="horizontalHeaderStretchLastSection">
<bool>true</bool>
</attribute>
<attribute name="ResizeMode">
<enum>QHeaderView::Interactive</enum>
</attribute>
<column>
<property name="text">
<string>Alias</string>
Expand Down Expand Up @@ -186,19 +183,6 @@
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_5">
<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>
</layout>
Expand Down Expand Up @@ -227,9 +211,6 @@
<attribute name="horizontalHeaderStretchLastSection">
<bool>true</bool>
</attribute>
<attribute name="ResizeMode">
<enum>QHeaderView::Interactive</enum>
</attribute>
<column>
<property name="text">
<string>Address</string>
Expand Down
4 changes: 2 additions & 2 deletions src/qt/forms/optionsdialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>576</width>
<height>402</height>
<height>457</height>
</rect>
</property>
<property name="windowTitle">
Expand All @@ -20,7 +20,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
<number>4</number>
</property>
<widget class="QWidget" name="tabMain">
<attribute name="title">
Expand Down
22 changes: 5 additions & 17 deletions src/qt/forms/overviewpage.ui
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,13 @@
<widget class="QLabel" name="label_5">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
<pointsize>16</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>Balances</string>
<string>BALANCES</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -676,7 +677,7 @@
</font>
</property>
<property name="text">
<string>Recent transactions</string>
<string>RECENT TRANSACTIONS</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -733,19 +734,6 @@
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
Expand Down
3 changes: 2 additions & 1 deletion src/qt/forms/sendcoinsentry.ui
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>729</width>
<height>150</height>
<height>126</height>
</rect>
</property>
<property name="focusPolicy">
Expand Down Expand Up @@ -1234,6 +1234,7 @@
<class>BitcoinAmountField</class>
<extends>QLineEdit</extends>
<header>bitcoinamountfield.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<tabstops>
Expand Down
6 changes: 3 additions & 3 deletions src/qt/res/css/crownium.css
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,7 @@ QDialog#HelpMessageDialog QScrollBar:vertical, QDialog#HelpMessageDialog QScroll
border:0;
}

/* About Dash Dialog */
/* About Paccoin Dialog */
QDialog#AboutDialog {
background-color:#F8F6F6;
}
Expand All @@ -771,7 +771,7 @@ QDialog#AboutDialog QLabel#label, QDialog#AboutDialog QLabel#copyrightLabel, QDi
margin-left:10px;
}

QDialog#AboutDialog QLabel#label_2 { /* Margin for About Dash text */
QDialog#AboutDialog QLabel#label_2 { /* Margin for About Paccoin text */
margin-right:10px;
}

Expand Down Expand Up @@ -1126,7 +1126,7 @@ min-width:410px;
margin-right:20px;
margin-left:0;
margin-top:0;
background-image: url(':/images/crownium/dash_logo_horizontal');
background-image: url(':/images/crownium/paccoin_logo_horizontal');
background-repeat:none;
}

Expand Down
6 changes: 3 additions & 3 deletions src/qt/res/css/drkblue.css
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ QDialog#HelpMessageDialog QScrollBar:vertical, QDialog#HelpMessageDialog QScroll
border:0;
}

/* About Dash Dialog */
/* About Paccoin Dialog */
QDialog#AboutDialog {
background-color:#F8F6F6;
}
Expand All @@ -749,7 +749,7 @@ QDialog#AboutDialog QLabel#label, QDialog#AboutDialog QLabel#copyrightLabel, QDi
margin-left:10px;
}

QDialog#AboutDialog QLabel#label_2 { /* Margin for About Dash text */
QDialog#AboutDialog QLabel#label_2 { /* Margin for About Paccoin text */
margin-right:10px;
}

Expand Down Expand Up @@ -1103,7 +1103,7 @@ min-width:410px;
margin-right:20px;
margin-left:0;
margin-top:0;
background-image: url(':/images/drkblue/dash_logo_horizontal');
background-image: url(':/images/drkblue/paccoin_logo_horizontal');
background-repeat:none;
}

Expand Down
6 changes: 3 additions & 3 deletions src/qt/res/css/light-hires.css
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ QDialog#HelpMessageDialog QScrollBar:vertical, QDialog#HelpMessageDialog QScroll
border:0;
}

/* About Dash Dialog */
/* About Paccoin Dialog */
QDialog#AboutDialog {
background-color:#F8F6F6;
}
Expand All @@ -752,7 +752,7 @@ QDialog#AboutDialog QLabel#label, QDialog#AboutDialog QLabel#copyrightLabel, QDi
margin-left:10px;
}

QDialog#AboutDialog QLabel#label_2 { /* Margin for About Dash text */
QDialog#AboutDialog QLabel#label_2 { /* Margin for About Paccoin text */
margin-right:10px;
}

Expand Down Expand Up @@ -1109,7 +1109,7 @@ min-width:410px;
margin-right:20px;
margin-left:0;
margin-top:15px;
background-image: url(':/images/light/dash_logo_horizontal');
background-image: url(':/images/light/paccoin_logo_horizontal');
background-repeat:none;
}

Expand Down
Loading

0 comments on commit 636ebb3

Please sign in to comment.