Skip to content

Commit

Permalink
Wallet GUI update
Browse files Browse the repository at this point in the history
Small changes


More changes


New Icons


Style changes


Mas


Readding font


More changes I guess


Changes


Fix font?


Sadboi hours


Fixes


New fixes?


mas


More changes


mas


Mas


xd


k


gsdfgsd


More small changes


new day new you


more


fixes


Perhaps the last


Last tab change


maybe


k


aight


so close


kkona


skrt


last ever no @@@@


Revert Background change


Update bitcoin.qrc
Update bitcoin.qrc
Update bitcoin.qrc
Update bitcoingui.cpp
Update default.qss
Merge remote-tracking branch 'origin/0.7-testing' into 0.7-testing


Added link to Peercoin website in the About tab


Set tabs and background to green as per 


Background chng
  • Loading branch information
captainbuckkets authored and backpacker69 committed Feb 4, 2019
1 parent 1b84699 commit 138d9f6
Show file tree
Hide file tree
Showing 43 changed files with 1,455 additions and 1,293 deletions.
4 changes: 2 additions & 2 deletions src/qt/bitcoingui.cpp
Expand Up @@ -74,7 +74,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent) :
{
restoreWindowGeometry();
setWindowTitle(tr("Peercoin") + " - " + tr("Wallet"));

QFontDatabase::addApplicationFont(":/fonts/notosans-regular");
QFile styleFile(":/themes/default");
styleFile.open(QFile::ReadOnly);
Expand Down Expand Up @@ -140,7 +140,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent) :
// Override style sheet for progress bar for styles that have a segmented progress bar,
// as they make the text unreadable (workaround for issue #1071)
// See https://qt-project.org/doc/qt-4.8/gallery.html
progressBar->setStyleSheet("QProgressBar { background-color: #333333; text-align: center; color: white; border: 1px solid #4b4b4b; } QProgressBar::chunk { background: #3cb054; margin: 0px; }");
progressBar->setStyleSheet("QProgressBar { background-color: #8C8C8C; text-align: center; color: white; border: 1px solid #4b4b4b; } QProgressBar::chunk { background: #3cb054; margin: 0px; }");

statusBar()->addWidget(progressBarLabel);
statusBar()->addWidget(progressBar);
Expand Down
2 changes: 2 additions & 0 deletions src/qt/forms/aboutdialog.ui
Expand Up @@ -129,6 +129,8 @@ This is experimental software.
Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php.

This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</string>

More information can be found on the Peercoin official website: https://peercoin.net/.
</property>
<property name="wordWrap">
<bool>true</bool>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/forms/overviewpage.ui
Expand Up @@ -20,7 +20,7 @@
<bool>false</bool>
</property>
<property name="styleSheet">
<string notr="true">background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop:0 #F0D0A0, stop:1 #F8D488); color:#000000;</string>
<string notr="true">background-color: #3cb054; color:#ffffff;</string>
</property>
<property name="wordWrap">
<bool>true</bool>
Expand Down
16 changes: 8 additions & 8 deletions src/qt/guiconstants.h
Expand Up @@ -14,15 +14,15 @@ static const int STATUSBAR_ICONSIZE = 16;
#define STYLE_INVALID "background:#FF8080"

/* Transaction list -- unconfirmed transaction */
#define COLOR_UNCONFIRMED QColor(128, 128, 128)
#define COLOR_UNCONFIRMED QColor(140, 140, 140)
/* Transaction list -- negative amount */
#define COLOR_NEGATIVE QColor(136, 0, 21)
#define COLOR_NEGATIVE QColor(255, 58, 66)
/* Table List -- negative amount */
#define COLOR_NEGATIVE_TABLE QColor(224, 0, 0)
#define COLOR_NEGATIVE_TABLE QColor(255, 58, 66)
/* Transaction list -- positive amount */
#define COLOR_POSITIVE QColor(0x3c, 0xb0, 0x54)
#define COLOR_POSITIVE QColor(60, 176, 84)
/* Transaction list -- bare address (without label) */
#define COLOR_BAREADDRESS QColor(140, 140, 140)
#define COLOR_BAREADDRESS QColor(171, 171, 171)

/* Tooltips longer than this (in characters) are converted into rich text,
so that they can be word-wrapped.
Expand All @@ -36,8 +36,8 @@ static const int MAX_URI_LENGTH = 255;
#define EXPORT_IMAGE_SIZE 256

/* Colors for minting tab for each coin age group */
#define COLOR_MINT_YOUNG QColor(128, 64, 64)
#define COLOR_MINT_MATURE QColor(64, 128, 64)
#define COLOR_MINT_OLD QColor(26, 77, 26)
#define COLOR_MINT_YOUNG QColor(255, 224, 226)
#define COLOR_MINT_MATURE QColor(204, 255, 207)
#define COLOR_MINT_OLD QColor(51, 64, 52)

#endif // GUICONSTANTS_H
Binary file added src/qt/res/fonts/Roboto-Regular.ttf
Binary file not shown.
Binary file modified src/qt/res/icons/add.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/address-book.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/configure.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/connect0_16.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/connect1_16.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/connect2_16.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/connect3_16.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/connect4_16.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/debugwindow.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/editcopy.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/editpaste.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/export.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/key.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/lock_closed.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/lock_open.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/multisig.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/quit.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/receive.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/remove.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/send.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/sign.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/synced.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/transaction0.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/transaction2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/tx_inout.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/tx_input.png
Binary file modified src/qt/res/icons/tx_output.png
Binary file modified src/qt/res/images/about.png
Binary file modified src/qt/res/images/controls/caret-down.png
Binary file modified src/qt/res/images/controls/caret-up.png
Binary file modified src/qt/res/images/logo.png
993 changes: 521 additions & 472 deletions src/qt/res/images/logomask.ai

Large diffs are not rendered by default.

Binary file modified src/qt/res/images/logomask.png
741 changes: 411 additions & 330 deletions src/qt/res/images/splash.ai

Large diffs are not rendered by default.

Binary file modified src/qt/res/images/splash.png
833 changes: 424 additions & 409 deletions src/qt/res/images/splash_testnet.ai

Large diffs are not rendered by default.

Binary file modified src/qt/res/images/splash_testnet.png

0 comments on commit 138d9f6

Please sign in to comment.