dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fixed the inclusion of the logo file into the binary using QT resources

Browse source
This commit is contained in:
James Coxon 2017-04-18 20:55:41 +01:00 • committed by clemahieu
commit 7a1ae43462
3 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
logo.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 34 KiB

Before After
Before After

11
rai/rai_wallet/entry.cpp
View file

@ -192,11 +192,14 @@ bool update_config (qt_wallet_config & config_a, boost::filesystem::path const &
int run_wallet (QApplication & application, int argc, char * const * argv) int run_wallet (QApplication & application, int argc, char * const * argv)
{ {
rai_qt::eventloop_processor processor; rai_qt::eventloop_processor processor;
QPixmap pixmap("logo.png");
QSplashScreen splash(pixmap);
splash.show();
auto working (rai::working_path ()); auto working (rai::working_path ());
boost::filesystem::create_directories (working); boost::filesystem::create_directories (working);
QPixmap pixmap(":/logo.png");
QSplashScreen *splash = new QSplashScreen(pixmap);
splash->show();
application.processEvents();
splash->showMessage(QSplashScreen::tr("Remember - Backup Your Wallet Seed"), Qt::AlignBottom | Qt::AlignHCenter, Qt::black);
application.processEvents();
qt_wallet_config config (working); qt_wallet_config config (working);
auto config_path ((working / "config.json")); auto config_path ((working / "config.json"));
int result (0); int result (0);
@ -249,7 +252,7 @@ int run_wallet (QApplication & application, int argc, char * const * argv)
{ {
rpc.start (); rpc.start ();
} }
auto gui (std::make_shared <rai_qt::wallet> (application, processor, *node, wallet, config.account)); auto gui (std::make_shared <rai_qt::wallet> (application, *node, wallet, config.account));
splash.close(); splash.close();
gui->start (); gui->start ();
gui->client_window->show (); gui->client_window->show ();

6
resources.qrc Normal file
View file

@ -0,0 +1,6 @@
<!DOCTYPE RCC>
<RCC version="1.0">
<qresource>
<file>logo.png</file>
</qresource>
</RCC>