diff --git a/.gitignore b/.gitignore index 11676fc..4ce8538 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ Makefile* qrc_bitcoin.cpp gostcoin-qt gostcoind +gostcoind.exe *.pro.user .qmake.stash gostcoin-qt_plugin_import.cpp diff --git a/android/gostcoin-qt-android.pro b/android/gostcoin-qt-android.pro index 34e4ee3..74f993e 100644 --- a/android/gostcoin-qt-android.pro +++ b/android/gostcoin-qt-android.pro @@ -366,7 +366,7 @@ SOURCES += ../src/qt/gostcoin.cpp \ ../i2psam/i2psam.cpp \ ../src/qt/setupdarknet.cpp -RESOURCES += ../src/qt/bitcoin.qrc +RESOURCES += ../src/qt/gostcoin.qrc FORMS += ../src/qt/forms/sendcoinsdialog.ui \ ../src/qt/forms/coincontroldialog.ui \ @@ -415,7 +415,7 @@ greaterThan(QT_MAJOR_VERSION, 4): { } # for lrelease/lupdate -# also add new translations to ../src/qt/bitcoin.qrc under translations/ +# also add new translations to ../src/qt/gostcoin.qrc under translations/ TRANSLATIONS = $$files(../src/qt/locale/bitcoin_*.ts) isEmpty(QMAKE_LRELEASE) { diff --git a/gostcoin-qt.pro b/gostcoin-qt.pro index 4ae8faa..fea67e1 100644 --- a/gostcoin-qt.pro +++ b/gostcoin-qt.pro @@ -290,7 +290,7 @@ SOURCES += src/qt/gostcoin.cpp \ src/qt/setupdarknet.cpp \ i2psam/i2psam.cpp -RESOURCES += src/qt/bitcoin.qrc +RESOURCES += src/qt/gostcoin.qrc FORMS += src/qt/forms/sendcoinsdialog.ui \ src/qt/forms/coincontroldialog.ui \ @@ -337,7 +337,7 @@ QMAKE_EXTRA_COMPILERS += gccsse2 CODECFORTR = UTF-8 # for lrelease/lupdate -# also add new translations to src/qt/bitcoin.qrc under translations/ +# also add new translations to src/qt/gostcoin.qrc under translations/ TRANSLATIONS = $$files(src/qt/locale/bitcoin_*.ts) isEmpty(QMAKE_LRELEASE) { diff --git a/src/qt/forms/aboutdialog.ui b/src/qt/forms/aboutdialog.ui index 6035652..cb7ba57 100644 --- a/src/qt/forms/aboutdialog.ui +++ b/src/qt/forms/aboutdialog.ui @@ -23,7 +23,7 @@ - :/images/i2pguy + :/images/mask @@ -150,7 +150,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + diff --git a/src/qt/forms/addressbookpage.ui b/src/qt/forms/addressbookpage.ui index 0029769..5454fcf 100644 --- a/src/qt/forms/addressbookpage.ui +++ b/src/qt/forms/addressbookpage.ui @@ -63,7 +63,7 @@ &New Address - + :/icons/add:/icons/add @@ -77,7 +77,7 @@ &Copy Address - + :/icons/editcopy:/icons/editcopy @@ -88,7 +88,7 @@ Show &QR Code - + :/icons/qrcode:/icons/qrcode @@ -102,7 +102,7 @@ Sign &Message - + :/icons/edit:/icons/edit @@ -116,7 +116,7 @@ &Verify Message - + :/icons/transaction_0:/icons/transaction_0 @@ -130,7 +130,7 @@ &Delete - + :/icons/remove:/icons/remove @@ -157,7 +157,7 @@ &Export - + :/icons/export:/icons/export @@ -180,7 +180,7 @@ - + diff --git a/src/qt/forms/rpcconsole.ui b/src/qt/forms/rpcconsole.ui index b9c03e1..32770ef 100644 --- a/src/qt/forms/rpcconsole.ui +++ b/src/qt/forms/rpcconsole.ui @@ -430,7 +430,7 @@ - + :/icons/remove:/icons/remove @@ -450,7 +450,7 @@ - + diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui index c95efc3..ee0e7aa 100644 --- a/src/qt/forms/sendcoinsdialog.ui +++ b/src/qt/forms/sendcoinsdialog.ui @@ -668,7 +668,7 @@ Add &Recipient - + :/icons/add:/icons/add @@ -691,7 +691,7 @@ Clear &All - + :/icons/remove:/icons/remove @@ -757,7 +757,7 @@ S&end - + :/icons/send:/icons/send @@ -770,7 +770,7 @@ - + diff --git a/src/qt/forms/sendcoinsentry.ui b/src/qt/forms/sendcoinsentry.ui index 28553c5..6cd2ac0 100644 --- a/src/qt/forms/sendcoinsentry.ui +++ b/src/qt/forms/sendcoinsentry.ui @@ -89,7 +89,7 @@ - + :/icons/address-book:/icons/address-book @@ -106,7 +106,7 @@ - + :/icons/editpaste:/icons/editpaste @@ -123,7 +123,7 @@ - + :/icons/remove:/icons/remove @@ -153,7 +153,7 @@ - + diff --git a/src/qt/forms/signverifymessagedialog.ui b/src/qt/forms/signverifymessagedialog.ui index 7d4e249..86e1604 100644 --- a/src/qt/forms/signverifymessagedialog.ui +++ b/src/qt/forms/signverifymessagedialog.ui @@ -64,7 +64,7 @@ - + :/icons/address-book:/icons/address-book @@ -84,7 +84,7 @@ - + :/icons/editpaste:/icons/editpaste @@ -140,7 +140,7 @@ - + :/icons/editcopy:/icons/editcopy @@ -161,7 +161,7 @@ Sign &Message - + :/icons/edit:/icons/edit @@ -178,7 +178,7 @@ Clear &All - + :/icons/remove:/icons/remove @@ -277,7 +277,7 @@ - + :/icons/address-book:/icons/address-book @@ -307,7 +307,7 @@ Verify &Message - + :/icons/transaction_0:/icons/transaction_0 @@ -324,7 +324,7 @@ Clear &All - + :/icons/remove:/icons/remove @@ -390,7 +390,7 @@ - + diff --git a/src/qt/gostcoin.cpp b/src/qt/gostcoin.cpp index 2cf4c1d..da9d891 100644 --- a/src/qt/gostcoin.cpp +++ b/src/qt/gostcoin.cpp @@ -176,7 +176,7 @@ int main(int argc, char *argv[]) QTextCodec::setCodecForCStrings(QTextCodec::codecForTr()); #endif - Q_INIT_RESOURCE(bitcoin); + Q_INIT_RESOURCE(gostcoin); QApplication app(argc, argv); #ifdef ANDROID @@ -245,11 +245,11 @@ int main(int argc, char *argv[]) if (qtTranslator.load("qt_" + lang_territory, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) app.installTranslator(&qtTranslator); - // Load e.g. bitcoin_de.qm (shortcut "de" needs to be defined in bitcoin.qrc) + // Load e.g. bitcoin_de.qm (shortcut "de" needs to be defined in gostcoin.qrc) if (translatorBase.load(lang, ":/translations/")) app.installTranslator(&translatorBase); - // Load e.g. bitcoin_de_DE.qm (shortcut "de_DE" needs to be defined in bitcoin.qrc) + // Load e.g. bitcoin_de_DE.qm (shortcut "de_DE" needs to be defined in gostcoin.qrc) if (translator.load(lang_territory, ":/translations/")) app.installTranslator(&translator); diff --git a/src/qt/bitcoin.qrc b/src/qt/gostcoin.qrc similarity index 98% rename from src/qt/bitcoin.qrc rename to src/qt/gostcoin.qrc index 9e617bf..5e9ac78 100644 --- a/src/qt/bitcoin.qrc +++ b/src/qt/gostcoin.qrc @@ -44,7 +44,7 @@ res/images/about.png res/images/splash.png - res/images/i2pguy.png + res/images/mask.png res/images/splash_testnet.png diff --git a/src/qt/res/gostcoin-qt.rc b/src/qt/res/gostcoin-qt.rc index 810ce39..6cfa6fe 100644 --- a/src/qt/res/gostcoin-qt.rc +++ b/src/qt/res/gostcoin-qt.rc @@ -1,5 +1,5 @@ IDI_ICON1 ICON DISCARDABLE "icons/gostcoin.ico" -IDI_ICON2 ICON DISCARDABLE "icons/bitcoin_testnet.ico" +IDI_ICON2 ICON DISCARDABLE "icons/gostcoin_testnet.ico" #include // needed for VERSIONINFO #include "../../clientversion.h" // holds the needed client version information diff --git a/src/qt/res/icons/bitcoin_testnet.ico b/src/qt/res/icons/bitcoin_testnet.ico deleted file mode 100644 index 16de0cd..0000000 Binary files a/src/qt/res/icons/bitcoin_testnet.ico and /dev/null differ diff --git a/src/qt/res/icons/gostcoin_testnet.ico b/src/qt/res/icons/gostcoin_testnet.ico new file mode 100644 index 0000000..d72d2b6 Binary files /dev/null and b/src/qt/res/icons/gostcoin_testnet.ico differ diff --git a/src/qt/res/images/i2pguy.png b/src/qt/res/images/i2pguy.png deleted file mode 100644 index 2c19b0f..0000000 Binary files a/src/qt/res/images/i2pguy.png and /dev/null differ diff --git a/src/qt/res/images/mask.png b/src/qt/res/images/mask.png new file mode 100644 index 0000000..450d5ee Binary files /dev/null and b/src/qt/res/images/mask.png differ diff --git a/src/resources.rc b/src/resources.rc index 19fe52c..18bc8f5 100644 --- a/src/resources.rc +++ b/src/resources.rc @@ -1,5 +1,5 @@ IDI_ICON1 ICON DISCARDABLE "qt/res/icons/gostcoin.ico" -IDI_ICON2 ICON DISCARDABLE "qt/res/icons/bitcoin_testnet.ico" +IDI_ICON2 ICON DISCARDABLE "qt/res/icons/gostcoin_testnet.ico" #include // needed for VERSIONINFO #include "clientversion.h" // holds the needed client version information