Skip to content

Commit

Permalink
TopBar was added and some minor fixes were made.
Browse files Browse the repository at this point in the history
  • Loading branch information
@hardwarewise
hardwarewise committed May 20, 2020
1 parent 7e7b84d commit 459cc3e
Show file tree
Hide file tree
Showing 12 changed files with 96 additions and 27 deletions.
7 changes: 5 additions & 2 deletions src/qt/forms/depositcoinsdialog.ui
View file
Expand Up @@ -28,10 +28,13 @@
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>SINANCE</string>
<string>LOCK YOUR SIN COINS TO EARN PASSIVE INCOME</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="indent">
<number>5</number>
<number>-1</number>
</property>
</widget>
</item>
Expand Down
4 changes: 2 additions & 2 deletions src/qt/forms/receivecoinsdialog.ui
View file
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>776</width>
<height>396</height>
<height>410</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,1">
Expand Down Expand Up @@ -95,7 +95,7 @@
<item row="0" column="0" colspan="3">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Receive</string>
<string>Receive SIN Coins</string>
</property>
<property name="indent">
<number>20</number>
Expand Down
12 changes: 11 additions & 1 deletion src/qt/forms/sendcoinsdialog.ui
View file
Expand Up @@ -25,6 +25,16 @@
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Send SIN Coins</string>
</property>
<property name="indent">
<number>20</number>
</property>
</widget>
</item>
<item>
<widget class="QScrollArea" name="scrollArea">
<property name="sizePolicy">
Expand All @@ -48,7 +58,7 @@
<x>0</x>
<y>0</y>
<width>498</width>
<height>460</height>
<height>440</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2" stretch="0">
Expand Down
4 changes: 2 additions & 2 deletions src/qt/forms/statspage.ui
View file
Expand Up @@ -75,13 +75,13 @@
<property name="minimumSize">
<size>
<width>976</width>
<height>132</height>
<height>90</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>976</width>
<height>132</height>
<height>90</height>
</size>
</property>
<property name="styleSheet">
Expand Down
4 changes: 3 additions & 1 deletion src/qt/res/css/default.css
View file
Expand Up @@ -1229,8 +1229,10 @@ color:#000000;
/* DEPOSIT COINS (EARN) PAGE */

QDialog#DepositCoinsDialog .QLabel#label_3 { /* Deposit Title Label */
color:#2E3191;
background-color:#00B4B8;
color: #ffffff;
font-size:18px;
border-radius: 5px;
}


Expand Down
1 change: 1 addition & 0 deletions src/qt/res/icons/address-book.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/qt/res/icons/configure.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/qt/res/icons/debugwindow.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/qt/res/icons/faq.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 2 additions & 12 deletions src/qt/res/images/stats-top-header.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 9 additions & 7 deletions src/qt/sin.qrc
View file
Expand Up @@ -2,7 +2,7 @@
<qresource prefix="/icons">
<file alias="sin">res/icons/sin.png</file>
<file alias="masternodes">res/icons/masternodes.png</file>
<file alias="address-book">res/icons/address-book.png</file>
<file alias="address-book">res/icons/address-book.svg</file>
<file alias="quit">res/icons/quit.png</file>
<file alias="send">res/icons/send.png</file>
<file alias="send1">res/icons/send1.png</file>
Expand All @@ -24,7 +24,7 @@
<file alias="eye">res/icons/eye.png</file>
<file alias="eye_minus">res/icons/eye_minus.png</file>
<file alias="eye_plus">res/icons/eye_plus.png</file>
<file alias="options">res/icons/configure.png</file>
<file alias="options">res/icons/configure.svg</file>
<file alias="receiving_addresses">res/icons/receive.png</file>
<file alias="receiving_addresses1">res/icons/receive1.png</file>
<file alias="editpaste">res/icons/editpaste.png</file>
Expand All @@ -51,7 +51,7 @@
<file alias="lock_open1">res/icons/lock_open1.png</file>
<file alias="key">res/icons/key.png</file>
<file alias="filesave">res/icons/filesave.png</file>
<file alias="debugwindow">res/icons/debugwindow.png</file>
<file alias="debugwindow">res/icons/debugwindow.svg</file>
<file alias="open">res/icons/open.png</file>
<file alias="info">res/icons/info.png</file>
<file alias="about_qt">res/icons/about_qt.png</file>
Expand Down Expand Up @@ -100,6 +100,7 @@
<file alias="instaswap">res/icons/instaswap.png</file>
<file alias="instaswap1">res/icons/instaswap1.png</file>
<file alias="stats">res/icons/stats.png</file>
<file alias="faq">res/icons/faq.svg</file>

</qresource>
<qresource prefix="/movies">
Expand Down Expand Up @@ -162,10 +163,11 @@
<file alias="nav-logo-sin">res/images/nav-logo-sin.png</file>
<file alias="indeterminate">res/images/indeterminate.png</file>
<file alias="close">res/images/close.png</file>
<file alias="stats-nodes-header">res/images/stats-nodes-header.png</file>
<file alias="stats-burncoins-header">res/images/stats-burncoins-header.png</file>
<file alias="stats-address-header">res/images/stats-address-header.png</file>
<file alias="stats-network-header">res/images/stats-network-header.png</file>
<file alias="stats-nodes-header">res/images/stats-nodes-header.svg</file>
<file alias="stats-burncoins-header">res/images/stats-burncoins-header.svg</file>
<file alias="stats-address-header">res/images/stats-address-header.svg</file>
<file alias="stats-network-header">res/images/stats-network-header.svg</file>
<file alias="stats-top-header">res/images/stats-top-header.svg</file>

</qresource>

Expand Down
58 changes: 58 additions & 0 deletions src/qt/singui.cpp
View file
Expand Up @@ -72,6 +72,8 @@
#include <QToolBar>
#include <QVBoxLayout>
#include <QFontDatabase>
#include <QPushButton>
#include <QToolTip>


#if QT_VERSION < 0x050000
Expand Down Expand Up @@ -169,6 +171,62 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformSty
// Create status bar
statusBar();


//// Set widget topBar on the top right corner ////

QWidget *topBar = new QWidget;
QPushButton *topConsoleButton = new QPushButton();
QPushButton *topOptionButton = new QPushButton();
QPushButton *topAddressButton = new QPushButton();
QPushButton *topFaqButton = new QPushButton();


QHBoxLayout *topBarLayout = new QHBoxLayout;

topBarLayout->addWidget(topConsoleButton);
topBarLayout->addWidget(topOptionButton);
topBarLayout->addWidget(topAddressButton);
topBarLayout->addWidget(topFaqButton);


topConsoleButton->setIcon(QIcon(":/icons/debugwindow"));
topConsoleButton->setIconSize(QSize(20, 20));
topConsoleButton->setToolTip( "Open Console" );
topConsoleButton->setStyleSheet("QToolTip { color: #000000; background-color: #ffffff; border: 0px; } QPushButton {background-color: transparent}");



topOptionButton->setIcon(QIcon(":/icons/options"));
topOptionButton->setIconSize(QSize(20, 20));
topOptionButton->setToolTip( "Open Options Window" );
topOptionButton->setStyleSheet("QToolTip { color: #000000; background-color: #ffffff; border: 0px; } QPushButton {background-color: transparent}");

topAddressButton->setIcon(QIcon(":/icons/address-book"));
topAddressButton->setIconSize(QSize(20, 20));
topAddressButton->setToolTip( "Open Address Book" );
topAddressButton->setStyleSheet("QToolTip { color: #000000; background-color: #ffffff; border: 0px; } QPushButton {background-color: transparent}");

topFaqButton->setIcon(QIcon(":/icons/faq"));
topFaqButton->setIconSize(QSize(20, 20));
topFaqButton->setToolTip( "Open FAQ Window" );
topFaqButton->setStyleSheet("QToolTip { color: #000000; background-color: #ffffff; border: 0px; } QPushButton {background-color: transparent}");

topBar->setLayout(topBarLayout);
appMenuBar->setCornerWidget(topBar, Qt::TopRightCorner);


connect(topConsoleButton, SIGNAL (released()), this, SLOT (showDebugWindowActivateConsole()));
connect(topOptionButton, SIGNAL(released()), this, SLOT(optionsClicked()));
connect(topAddressButton, SIGNAL(released()), walletFrame, SLOT(usedSendingAddresses()));


//// topBar end ////






// Social Media icons
QFrame* frameSocial = new QFrame();
frameSocial->setContentsMargins(0, 0, 0, 0);
Expand Down

0 comments on commit 459cc3e

Please sign in to comment.