Skip to content

Commit

Permalink
More Gui changes
Browse files Browse the repository at this point in the history
by Hanz L
  • Loading branch information
palmd committed Dec 19, 2014
1 parent e57fd94 commit a8d33c9
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 14 deletions.
4 changes: 2 additions & 2 deletions src/qt/bitcoingui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
QFontDatabase::addApplicationFont(":/fonts/pxbold");
QFontDatabase::addApplicationFont(":/fonts/mohave");
setWindowTitle(tr("Silkcoin") + " " + tr("Wallet"));
qApp->setStyleSheet("QMainWindow { background:rgb(237, 241, 247); font-family:'Proxima Nova Rg'; } #toolbar2 { border:none;width:30px; background:rgb(137,134,161); }");
qApp->setStyleSheet("QMainWindow { background:rgb(237, 241, 247); font-family:'Proxima Nova Rg'; } #toolbar2 { border:none;width:30px; background:rgb(63,9,0); }");
#ifndef Q_OS_MAC
qApp->setWindowIcon(QIcon(":icons/bitcoin"));
setWindowIcon(QIcon(":icons/bitcoin"));
Expand Down Expand Up @@ -1349,4 +1349,4 @@ void BitcoinGUI::openCryptsy() {

void BitcoinGUI::openHipc() {
QDesktopServices::openUrl(QUrl("https://www.hipchat.com/invite/168485/cfd0e56c0e7ca55a03fd3ab2d872467c"));
}
}
14 changes: 7 additions & 7 deletions src/qt/forms/overviewpage.ui
Original file line number Diff line number Diff line change
Expand Up @@ -869,9 +869,9 @@
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
<red>125</red>
<green>53</green>
<blue>24</blue>
</color>
</brush>
</colorrole>
Expand Down Expand Up @@ -907,9 +907,9 @@
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
<red>123</red>
<green>53</green>
<blue>24</blue>
</color>
</brush>
</colorrole>
Expand Down Expand Up @@ -3410,4 +3410,4 @@
</widget>
<resources/>
<connections/>
</ui>
</ui>
7 changes: 4 additions & 3 deletions src/qt/guiconstants.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

#ifndef GUICONSTANTS_H
#define GUICONSTANTS_H

Expand All @@ -14,9 +15,9 @@ static const int STATUSBAR_ICONSIZE = 28;
#define STYLE_INVALID "background:#FF8080"

/* Transaction list -- unconfirmed transaction */
#define COLOR_UNCONFIRMED QColor(0, 0, 0)
#define COLOR_UNCONFIRMED QColor(125, 53, 24)
/* Transaction list -- negative amount */
#define COLOR_NEGATIVE QColor(0, 0, 0)
#define COLOR_NEGATIVE QColor(69, 90, 140)
/* Transaction list -- bare address (without label) */
#define COLOR_BAREADDRESS QColor(255, 255, 255)

Expand All @@ -31,4 +32,4 @@ static const int MAX_URI_LENGTH = 255;
/* QRCodeDialog -- size of exported QR Code image */
#define EXPORT_IMAGE_SIZE 256

#endif // GUICONSTANTS_H
#endif // GUICONSTANTS_H
4 changes: 2 additions & 2 deletions src/qt/overviewpage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,10 @@ void OverviewPage::updateDisplayUnit() {

void OverviewPage::showOutOfSyncWarning(bool fShow) {
if (fShow == true) {
ui->lblDetailsSlot3->setText("<font color=\"black\">Out of sync</font>");
ui->lblDetailsSlot3->setText("<font color=\"blue\">Out of sync</font>");
}

if (fShow == false) { //
ui->lblDetailsSlot3->setText("<span style=\" color:#ffffff;\">Synced</span>");
}
}
}
Binary file modified src/qt/res/icons/balance.png
Loading
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/detail.png
Loading
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/recent.png
Loading
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
Loading
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_output.png
Loading
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/images/background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit a8d33c9

Please sign in to comment.