sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 12:32:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

[UI] Parts of PR612 re-added

Browse Source
This commit is contained in:
crowning- 2016-04-20 08:04:46 +02:00
parent b61849c697
commit 67214d9971
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile.qt.include
View File

@ -421,6 +421,7 @@ endif
RES_IMAGES = \
qt/res/images/drkblue/about.png \
qt/res/images/drkblue/splash.png \
qt/res/images/drkblue/splash_testnet.png \
qt/res/images/drkblue/dash_logo_horizontal.png \
qt/res/images/drkblue/drkblue_downArrow.png \
qt/res/images/drkblue/drkblue_downArrow_small.png \
@ -432,6 +433,7 @@ RES_IMAGES = \
qt/res/images/drkblue/drkblue_walletFrame.png \
qt/res/images/crownium/about.png \
qt/res/images/crownium/splash.png \
qt/res/images/crownium/splash_testnet.png \
qt/res/images/crownium/dash_logo_horizontal.png \
qt/res/images/crownium/drkblue_downArrow.png \
qt/res/images/crownium/drkblue_downArrow_small.png \
@ -443,6 +445,7 @@ RES_IMAGES = \
qt/res/images/crownium/drkblue_walletFrame.png \
qt/res/images/light/about.png \
qt/res/images/light/splash.png \
qt/res/images/light/splash_testnet.png \
qt/res/images/light/dash_logo_horizontal.png \
qt/res/images/light/drkblue_downArrow.png \
qt/res/images/light/drkblue_downArrow_small.png \
@ -454,6 +457,7 @@ RES_IMAGES = \
qt/res/images/light/drkblue_walletFrame.png \
qt/res/images/trad/about.png \
qt/res/images/trad/splash.png \
qt/res/images/trad/splash_testnet.png \
qt/res/images/trad/dash_logo_horizontal.png \
qt/res/images/trad/drkblue_downArrow.png \
qt/res/images/trad/drkblue_downArrow_small.png \

4
src/qt/dash.qrc
View File

@ -223,6 +223,7 @@
<file alias="drkblue_walletFrame_bg">res/images/drkblue/drkblue_walletFrame_bg.png</file>
<file alias="drkblue_walletFrame">res/images/drkblue/drkblue_walletFrame.png</file>
<file alias="splash">res/images/drkblue/splash.png</file>
<file alias="splash_testnet">res/images/drkblue/splash_testnet.png</file>
</qresource>
<qresource prefix="/images/crownium">
<file alias="about">res/images/crownium/about.png</file>
@ -236,6 +237,7 @@
<file alias="drkblue_walletFrame_bg">res/images/crownium/drkblue_walletFrame_bg.png</file>
<file alias="drkblue_walletFrame">res/images/crownium/drkblue_walletFrame.png</file>
<file alias="splash">res/images/crownium/splash.png</file>
<file alias="splash_testnet">res/images/crownium/splash_testnet.png</file>
</qresource>
<qresource prefix="/images/light">
<file alias="about">res/images/light/about.png</file>
@ -249,6 +251,7 @@
<file alias="drkblue_walletFrame_bg">res/images/light/drkblue_walletFrame_bg.png</file>
<file alias="drkblue_walletFrame">res/images/light/drkblue_walletFrame.png</file>
<file alias="splash">res/images/light/splash.png</file>
<file alias="splash_testnet">res/images/light/splash_testnet.png</file>
</qresource>
<qresource prefix="/images/trad">
<file alias="about">res/images/trad/about.png</file>
@ -262,6 +265,7 @@
<file alias="drkblue_walletFrame_bg">res/images/trad/drkblue_walletFrame_bg.png</file>
<file alias="drkblue_walletFrame">res/images/trad/drkblue_walletFrame.png</file>
<file alias="splash">res/images/trad/splash.png</file>
<file alias="splash_testnet">res/images/trad/splash_testnet.png</file>
</qresource>
<qresource prefix="/movies">
<file alias="spinner-000">res/movies/spinner-000.png</file>

9
src/qt/splashscreen.cpp
View File

@ -47,8 +47,15 @@ SplashScreen::SplashScreen(Qt::WindowFlags f, const NetworkStyle *networkStyle)
QString font = QApplication::font().toString();
// networkstyle.cpp can't (yet) read themes, so we do it here to get the correct Splash-screen
QString splashScreenPath = ":/images/" + GUIUtil::getThemeName() + "/splash";
if(GetBoolArg("-regtest", false))
splashScreenPath = ":/images/" + GUIUtil::getThemeName() + "/splash_testnet";
if(GetBoolArg("-testnet", false))
splashScreenPath = ":/images/" + GUIUtil::getThemeName() + "/splash_testnet";
// load the bitmap for writing some text over it
pixmap = networkStyle->getSplashImage();
pixmap = QPixmap(splashScreenPath);
QPainter pixPaint(&pixmap);
pixPaint.setPen(QColor(100,100,100));