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 authored and ckti committed Mar 29, 2021
1 parent 7ae6858 commit fc9c338
Show file tree
Hide file tree
Showing 12 changed files with 962 additions and 2,499 deletions.
6 changes: 5 additions & 1 deletion src/qt/ion.qrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="/icons">
<file alias="bitcoin">res/icons/ion.png</file>
<file alias="ion">res/icons/ion.png</file>
<file alias="address-book">res/icons/address-book.png</file>
<file alias="quit">res/icons/quit.png</file>
<file alias="send">res/icons/send.png</file>
Expand Down Expand Up @@ -29,6 +29,8 @@
<file alias="editcopy">res/icons/editcopy.png</file>
<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>
Expand Down Expand Up @@ -76,6 +78,8 @@
<file alias="walletFrame">res/images/walletFrame.png</file>
<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>
<file alias="splash_unittest">res/images/splash_unittest.png</file>
</qresource>
<qresource prefix="/movies">
<file alias="spinner-000">res/movies/spinner-000.png</file>
Expand Down
3 changes: 2 additions & 1 deletion src/qt/networkstyle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ static const struct {
} network_styles[] = {
{"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_testnet", "[regtest]", ":/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);

// titleAddText needs to be const char* for tr()
Expand Down
12 changes: 6 additions & 6 deletions src/qt/res/css/default.css
Original file line number Diff line number Diff line change
Expand Up @@ -881,12 +881,12 @@ QDialog#HelpMessageDialog QScrollBar:vertical, QDialog#HelpMessageDialog QScroll
border:0;
}

/* About ION Dialog */
QDialog#AboutDialog QLabel#label, QDialog#AboutDialog QLabel#copyrightLabel, QDialog#AboutDialog QLabel#label_2 { /* About ION Contents */
/* About Ion Dialog */
QDialog#AboutDialog QLabel#label, QDialog#AboutDialog QLabel#copyrightLabel, QDialog#AboutDialog QLabel#label_2 { /* About Ion Contents */
margin-left:10px;
}

QDialog#AboutDialog QLabel#label_2 { /* Margin for About ION text */
QDialog#AboutDialog QLabel#label_2 { /* Margin for About Ion text */
margin-right:10px;
}

Expand Down Expand Up @@ -965,7 +965,7 @@ font-weight:normal;
/* min-height:30px; */
}

QWidget .QFrame#frame_Balances .QLabel#label_5 { /* ION Balances Label */
QWidget .QFrame#frame_Balances .QLabel#label_5 { /* Ion Balances Label */
qproperty-alignment: 'AlignVCenter | AlignLeft';
min-width:160px;
background-color:transparent;
Expand Down Expand Up @@ -1209,7 +1209,7 @@ margin-right:5px;
padding-right:5px;
}

QWidget .QFrame#frame_CombinedBalances .QLabel#labelBalanceTextz { /* Available ION Label */
QWidget .QFrame#frame_CombinedBalances .QLabel#labelBalanceTextz { /* Available Ion Label */
qproperty-alignment: 'AlignVCenter | AlignLeft';
min-width:160px;
color:#3a235e;
Expand All @@ -1219,7 +1219,7 @@ font-weight:bold;
font-size:12px;
}

QWidget .QFrame#frame_CombinedBalances .QLabel#labelBalancez { /* Available ION Balance */
QWidget .QFrame#frame_CombinedBalances .QLabel#labelBalancez { /* Available Ion Balance */
qproperty-alignment: 'AlignVCenter | AlignLeft';
font-size:26px;
font-weight:normal;
Expand Down
Binary file modified src/qt/res/images/splash.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/splash_regtest.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/splash_testnet.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 added src/qt/res/images/splash_unittest.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
106 changes: 0 additions & 106 deletions src/qt/res/src/ion_testnet_old.svg

This file was deleted.

245 changes: 234 additions & 11 deletions src/qt/res/src/splash.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit fc9c338

Please sign in to comment.