Skip to content

Commit

Permalink
Add splashscreens, fixed ioncoincore#10
Browse files Browse the repository at this point in the history
  • Loading branch information
cevap committed Feb 6, 2021
1 parent 1a22867 commit 3fba5b1
Show file tree
Hide file tree
Showing 9 changed files with 2,725 additions and 68 deletions.
67 changes: 0 additions & 67 deletions share/pixmaps/ion48.xpm
View file
Original file line number Diff line number Diff line change
@@ -1,71 +1,5 @@
/* XPM */
static char * ion48_xpm[] = {
<<<<<<< HEAD
"48 48 15 1",
" c None",
". c #000000",
"+ c #26A9E0",
"@ c #26AAE0",
"# c #25A9E1",
"$ c #26AADF",
"% c #25AAE0",
"& c #26A9DF",
"* c #26A8DF",
"= c #26A9E1",
"- c #26A8E0",
"; c #27A8E0",
"> c #25A9DF",
", c #27AAE1",
"' c #27A9E1",
" ",
" ",
" .. ",
" ........... ...... ",
" ...................... ",
" ......................... ",
" ........ .......... ",
" ...... ......... ",
" ..... ......... ",
" ..... .......... ",
" ..... .......... ",
" .... . .... ",
" .... .... ",
" .... .... ",
" .... .... ",
" .... ... ",
" ... ... ",
" .... .... ",
" ... ++@# ... ",
" ... $%%%%%%+ ... ",
" .... +%%%%%%%%& ... ",
" ...... *%%%%%%%%%% .... ",
" ........ =%%%%%%%%%%* ... ",
" ......... %%%%%%%%%%%- ... ",
" ......... %%%%%%%%%%%; ... ",
" ......... &%%%%%%%%%%& ... ",
" ......... @%%%%%%%%%% ... ",
" ........ +%%%%%%%%> ... ",
" ...... ,%%%%%%* ... ",
" ... *'%%- ... ",
" .... ... ",
" ... ... ",
" ... ... ",
" .... .... ",
" .... .... ",
" ... ... ",
" .... .... ",
" .... .......... ",
" ..... .......... ",
" ..... ......... ",
" ...... ......... ",
" ....... .......... ",
" ......................... ",
" ...................... ",
" ................... ",
" .... ",
" ",
" "};
=======
"48 48 283 2",
" c None",
". c #0C1228",
Expand Down Expand Up @@ -398,4 +332,3 @@ static char * ion48_xpm[] = {
". + + + + + + + + + + + + + @ $ % & * * = - - - - - - = * * & % $ @ + + + + + + + + + + + + + . ",
" + + + + + + + + + + + + + + + # @ $ % % & & & & & & % % $ @ # + + + + + + + + + + + + + + + ",
" . + + + + + + + + + + + + + + + + + # @ @ @ @ @ @ # + + + + + + + + + + + + + + + + + . "};
>>>>>>> Add new icon and its source for main network
20 changes: 20 additions & 0 deletions src/qt/ion.qrc
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="/icons">
<<<<<<< HEAD
<file alias="bitcoin">res/icons/ion.png</file>
<file alias="bitcoin_testnet">res/icons/ion_testnet.png</file>
<file alias="bitcoin_regtest">res/icons/ion_regtest.png</file>
<file alias="prompticon">res/icons/chevron.png</file>
<file alias="warning">res/icons/warning.png</file>
</qresource>
<qresource prefix="/icons">
=======
<file alias="ion">res/icons/ion.png</file>
>>>>>>> Add splashscreens, fixed #10
<file alias="address-book">res/icons/address-book.png</file>
<file alias="connect_1">res/icons/connect1_16.png</file>
<file alias="connect_2">res/icons/connect2_16.png</file>
Expand All @@ -23,6 +27,18 @@
<file alias="eye_plus">res/icons/eye_plus.png</file>
<file alias="editpaste">res/icons/editpaste.png</file>
<file alias="editcopy">res/icons/editcopy.png</file>
<<<<<<< HEAD
=======
<file alias="add">res/icons/add.png</file>
<file alias="ion_testnet">res/icons/ion_testnet.png</file>
<file alias="ion_regtest">res/icons/ion_regtest.png</file>
<file alias="ion_unittest">res/icons/ion_unittest.png</file>
<file alias="edit">res/icons/edit.png</file>
<file alias="history">res/icons/history.png</file>
<file alias="overview">res/icons/overview.png</file>
<file alias="masternodes">res/icons/masternodes.png</file>
<file alias="export">res/icons/export.png</file>
>>>>>>> Add splashscreens, fixed #10
<file alias="synced">res/icons/synced.png</file>
<file alias="remove">res/icons/remove.png</file>
<file alias="lock_closed">res/icons/lock_closed.png</file>
Expand Down Expand Up @@ -72,8 +88,12 @@
<file alias="splash">res/images/splash.png</file>
<file alias="splash_testnet">res/images/splash_testnet.png</file>
<file alias="splash_regtest">res/images/splash_regtest.png</file>
<<<<<<< HEAD
<file alias="unchecked">res/images/unchecked.png</file>
<file alias="walletframe_background">res/images/walletframe_background.png</file>
=======
<file alias="splash_unittest">res/images/splash_unittest.png</file>
>>>>>>> Add splashscreens, fixed #10
</qresource>
<qresource prefix="/movies">
<file alias="spinner-000">res/movies/spinner-000.png</file>
Expand Down
8 changes: 8 additions & 0 deletions src/qt/networkstyle.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ static const struct {
const int iconColorSaturationReduction;
const std::string titleAddText;
} network_styles[] = {
<<<<<<< HEAD
{"main", QAPP_APP_NAME_DEFAULT, 0, 0, ""},
{"test", QAPP_APP_NAME_TESTNET, 190, 20, QT_TRANSLATE_NOOP("SplashScreen", "[testnet]")},
{"devnet", QAPP_APP_NAME_DEVNET, 190, 20, "[devnet: %s]"},
Expand Down Expand Up @@ -60,6 +61,13 @@ void NetworkStyle::rotateColors(QImage& img, const int iconColorHueShift, const
}
}
}
=======
{"main", QAPP_APP_NAME_DEFAULT, ":/icons/bitcoin", "", ":/images/splash"},
{"test", QAPP_APP_NAME_TESTNET, ":/icons/ion_testnet", QT_TRANSLATE_NOOP("SplashScreen", "[testnet]"), ":/images/splash_testnet"},
{"regtest", QAPP_APP_NAME_TESTNET, ":/icons/ion_regtest", "[regtest]", ":/images/splash_regtest"},
{"unittest", QAPP_APP_NAME_TESTNET, ":/icons/ion_unittest", "[unittest]", ":/images/splash_unittest"}};
static const unsigned network_styles_count = sizeof(network_styles) / sizeof(*network_styles);
>>>>>>> Add splashscreens, fixed #10

// titleAddText needs to be const char* for tr()
NetworkStyle::NetworkStyle(const QString &_appName, const int iconColorHueShift, const int iconColorSaturationReduction, const char *_titleAddText):
Expand Down
Loading

0 comments on commit 3fba5b1

Please sign in to comment.