Skip to content

Commit

Permalink
3.5.5.9-leisure
Browse files Browse the repository at this point in the history
Merge in Marix's upgrader change, and re-do upnpc changes (somehow, they
got reverted yet again).
  • Loading branch information
gridcoin committed Mar 18, 2016
1 parent 88c69f4 commit 7805302
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Makefile.Debug
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: gridcoinresearch
# Generated by qmake (2.01a) (Qt 4.8.4) on: Thu Mar 17 19:31:15 2016
# Generated by qmake (2.01a) (Qt 4.8.4) on: Thu Mar 17 19:42:45 2016
# Project: gridcoinresearch.pro
# Template: app
#############################################################################
Expand Down
2 changes: 1 addition & 1 deletion Makefile.Release
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: gridcoinresearch
# Generated by qmake (2.01a) (Qt 4.8.4) on: Thu Mar 17 19:31:16 2016
# Generated by qmake (2.01a) (Qt 4.8.4) on: Thu Mar 17 19:42:45 2016
# Project: gridcoinresearch.pro
# Template: app
#############################################################################
Expand Down
6 changes: 3 additions & 3 deletions src/net.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
#include <boost/algorithm/string/case_conv.hpp> // for to_lower()

#ifdef WIN32
#include <string.h>
#endif

#include <string.h>
#endif
#ifdef USE_UPNP
#include <miniwget.h>
#include <miniupnpc.h>
Expand Down
4 changes: 0 additions & 4 deletions src/qt/bitcoingui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ QString ToQstring(std::string s)




BitcoinGUI::BitcoinGUI(QWidget *parent):
QMainWindow(parent),
clientModel(0),
Expand All @@ -209,7 +208,6 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
std::string sFontSize12 = RoundToString(dFontSize+2,0);
std::string sMainWindowHTML = "QMainWindow { background-image:url(:images/bkg);border:none;font-family:'Open Sans,sans-serif'; } #frame { } QToolBar QLabel { padding-top:15px;padding-bottom:10px;margin:0px; } #spacer { background:rgb(69,65,63);border:none; } #toolbar3 { border:none;width:1px; background-color: rgb(169,192,7); } #toolbar2 { border:none;width:10px; background-color:qlineargradient(x1: 0, y1: 0, x2: 0.5, y2: 0.5,stop: 0 rgb(210,220,7), stop: 1 rgb(98,116,3)); } #toolbar { border:none;height:100%;padding-top:20px; background: rgb(69,65,63); text-align: left; color: rgb(169,192,7); min-width:160px; max-width:160px;} QToolBar QToolButton:hover {background-color:qlineargradient(x1: 0, y1: 0, x2: 2, y2: 2,stop: 0 rgb(69,65,63), stop: 1 rgb(216,252,251),stop: 2 rgb(59,62,65));} QToolBar QToolButton { font-family:Century Gothic;padding-left:20px;padding-right:200px;padding-top:7px;padding-bottom:7px; width:100%; color: rgb(169,192,7); text-align: left; background-color: rgb(69,65,63) } #labelMiningIcon { padding-left:5px;font-family:Century Gothic;width:100%;font-size:" + sFontSize10 + "px;text-align:center;color: rgb(169,192,7); } QMenu { background: rgb(69,65,63); color: rgb(169,192,7); padding-bottom:10px; } QMenu::item { color: rgb(169,192,7); background-color: transparent; } QMenu::item:selected { background-color:qlineargradient(x1: 0, y1: 0, x2: 0.5, y2: 0.5,stop: 0 rgb(69,65,63), stop: 1 rgb(98,116,3)); } QMenuBar { background: rgb(69,65,63); color: rgb(169,192,7); } QMenuBar::item { font-size:" + sFontSize12 + "px;padding-bottom:8px;padding-top:8px;padding-left:15px;padding-right:15px;color: rgb(169,192,7); background-color: transparent; } QMenuBar::item:selected { background-color:qlineargradient(x1: 0, y1: 0, x2: 0.5, y2: 0.5,stop: 0 rgb(69,65,63), stop: 1 rgb(98,116,3)); }";


qApp->setStyleSheet(ToQstring(sMainWindowHTML));

#ifndef Q_OS_MAC
Expand Down Expand Up @@ -788,8 +786,6 @@ QString IntToQstring(int o)
}




int AddressUser()
{
int result = 0;
Expand Down

0 comments on commit 7805302

Please sign in to comment.