diff --git a/gostcoin-qt.pro b/gostcoin-qt.pro index fea67e1..36fab1a 100644 --- a/gostcoin-qt.pro +++ b/gostcoin-qt.pro @@ -319,7 +319,7 @@ SOURCES += src/qt/test/test_main.cpp \ HEADERS += src/qt/test/uritests.h DEPENDPATH += src/qt/test QT += testlib -TARGET = anoncoin-qt_test +TARGET = gostcoin-qt_test DEFINES += BITCOIN_QT_TEST macx: CONFIG -= app_bundle } @@ -423,7 +423,7 @@ macx:HEADERS += src/qt/macdockiconhandler.h src/qt/macnotificationhandler.h macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm src/qt/macnotificationhandler.mm macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit -framework CoreServices macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0 -macx:ICON = src/qt/res/icons/anoncoin.icns +macx:ICON = src/qt/res/icons/gostcoin.icns macx:QMAKE_CFLAGS_THREAD += -pthread macx:QMAKE_LFLAGS_THREAD += -pthread macx:QMAKE_CXXFLAGS_THREAD += -pthread diff --git a/share/qt/Info.plist b/share/qt/Info.plist index b6a03fa..de743b8 100644 --- a/share/qt/Info.plist +++ b/share/qt/Info.plist @@ -3,11 +3,11 @@ CFBundleIconFile - anoncoin.icns + gostcoin.icns CFBundlePackageType APPL CFBundleGetInfoString - $VERSION, Copyright © 2009-$YEAR The Bitcoin developers + $VERSION, Copyright © 2009-$YEAR The Bitcoin developers, 2011-$YEAR The Litecoin developers, 2013-$YEAR The Anoncoin developers, 2017-$YEAR The Gostcoin developers CFBundleShortVersionString $VERSION CFBundleVersion @@ -15,19 +15,19 @@ CFBundleSignature ???? CFBundleExecutable - Anoncoin-Qt + Gostcoin-Qt CFBundleIdentifier - net.anoncoin.Anoncoin-Qt + org.purplei2p.Gostcoin-Qt CFBundleURLTypes CFBundleTypeRole Editor CFBundleURLName - net.anoncoin.AnoncoinPayment + org.purplei2p.GostcoinPayment CFBundleURLSchemes - anoncoin + gostcoin diff --git a/src/makefile.mingw b/src/makefile.mingw index 90044b9..46765ce 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -17,7 +17,7 @@ CXX ?= g++ -USE_IPV6:=1 +USE_IPV6:=0 USE_DEBUG:=0 DEPSDIR?=/usr/local diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 2a6fca3..0467387 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -315,10 +315,10 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel) { setWindowTitle(windowTitle() + QString(" ") + tr("[testnet]")); #ifndef Q_OS_MAC - QApplication::setWindowIcon(QIcon(":icons/bitcoin_testnet")); - setWindowIcon(QIcon(":icons/bitcoin_testnet")); + QApplication::setWindowIcon(QIcon(":icons/gostcoin_testnet")); + setWindowIcon(QIcon(":icons/gostcoin_testnet")); #else - MacDockIconHandler::instance()->setIcon(QIcon(":icons/bitcoin_testnet")); + MacDockIconHandler::instance()->setIcon(QIcon(":icons/gostcoin_testnet")); #endif if(trayIcon) { diff --git a/src/qt/gostcoin.cpp b/src/qt/gostcoin.cpp index da9d891..cca891e 100644 --- a/src/qt/gostcoin.cpp +++ b/src/qt/gostcoin.cpp @@ -272,7 +272,7 @@ int main(int argc, char *argv[]) #ifdef Q_OS_MAC // on mac, also change the icon now because it would look strange to have a testnet splash (green) and a std app icon (orange) if(GetBoolArg("-testnet")) { - MacDockIconHandler::instance()->setIcon(QIcon(":icons/bitcoin_testnet")); + MacDockIconHandler::instance()->setIcon(QIcon(":icons/gostcoin_testnet")); } #endif diff --git a/src/qt/gostcoin.qrc b/src/qt/gostcoin.qrc index 5e9ac78..b0aea2b 100644 --- a/src/qt/gostcoin.qrc +++ b/src/qt/gostcoin.qrc @@ -22,7 +22,7 @@ res/icons/editpaste.png res/icons/editcopy.png res/icons/add.png - res/icons/bitcoin_testnet.png + res/icons/gostcoin_testnet.png res/icons/toolbar_testnet.png res/icons/edit.png res/icons/history.png @@ -42,7 +42,6 @@ res/icons/debugwindow.png - res/images/about.png res/images/splash.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 6cfa6fe..c79cfa7 100644 --- a/src/qt/res/gostcoin-qt.rc +++ b/src/qt/res/gostcoin-qt.rc @@ -8,7 +8,7 @@ IDI_ICON2 ICON DISCARDABLE "icons/gostcoin_testnet.ico" #define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD) #define VER_FILEVERSION VER_PRODUCTVERSION #define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR -#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin developers 2011-" STRINGIZE(COPYRIGHT_YEAR) " The Litecoin developers 2013-" STRINGIZE(COPYRIGHT_YEAR) " The Anoncoin developers 2013-" STRINGIZE(COPYRIGHT_YEAR) " The i2pd developers " STRINGIZE(COPYRIGHT_YEAR) " The Gostcoin developers" +#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin developers, 2011-" STRINGIZE(COPYRIGHT_YEAR) " The Litecoin developers, 2013-" STRINGIZE(COPYRIGHT_YEAR) " The Anoncoin developers, 2013-" STRINGIZE(COPYRIGHT_YEAR) " The i2pd developers, " STRINGIZE(COPYRIGHT_YEAR) " The Gostcoin developers" VS_VERSION_INFO VERSIONINFO FILEVERSION VER_FILEVERSION diff --git a/src/qt/res/icons/anoncoin.icns b/src/qt/res/icons/anoncoin.icns deleted file mode 100644 index 4e0ac36..0000000 Binary files a/src/qt/res/icons/anoncoin.icns and /dev/null differ diff --git a/src/qt/res/icons/bitcoin_testnet.png b/src/qt/res/icons/bitcoin_testnet.png deleted file mode 100644 index f8fe759..0000000 Binary files a/src/qt/res/icons/bitcoin_testnet.png and /dev/null differ diff --git a/src/qt/res/icons/gostcoin.icns b/src/qt/res/icons/gostcoin.icns new file mode 100644 index 0000000..fcf36e8 Binary files /dev/null and b/src/qt/res/icons/gostcoin.icns differ diff --git a/src/qt/res/icons/gostcoin_testnet.ico b/src/qt/res/icons/gostcoin_testnet.ico index d72d2b6..cca73ad 100644 Binary files a/src/qt/res/icons/gostcoin_testnet.ico and b/src/qt/res/icons/gostcoin_testnet.ico differ diff --git a/src/qt/res/icons/gostcoin_testnet.png b/src/qt/res/icons/gostcoin_testnet.png new file mode 100644 index 0000000..167de10 Binary files /dev/null and b/src/qt/res/icons/gostcoin_testnet.png differ diff --git a/src/qt/res/icons/i2plogo_wbw_0_16.png b/src/qt/res/icons/i2plogo_wbw_0_16.png deleted file mode 100644 index 912d4ac..0000000 Binary files a/src/qt/res/icons/i2plogo_wbw_0_16.png and /dev/null differ diff --git a/src/qt/res/icons/i2plogo_wbw_1_16.png b/src/qt/res/icons/i2plogo_wbw_1_16.png deleted file mode 100644 index e5219d6..0000000 Binary files a/src/qt/res/icons/i2plogo_wbw_1_16.png and /dev/null differ diff --git a/src/qt/res/icons/i2plogo_wbw_2_16.png b/src/qt/res/icons/i2plogo_wbw_2_16.png deleted file mode 100644 index ab9254b..0000000 Binary files a/src/qt/res/icons/i2plogo_wbw_2_16.png and /dev/null differ diff --git a/src/qt/res/icons/i2plogo_wbw_3_16.png b/src/qt/res/icons/i2plogo_wbw_3_16.png deleted file mode 100644 index 9a280a2..0000000 Binary files a/src/qt/res/icons/i2plogo_wbw_3_16.png and /dev/null differ diff --git a/src/qt/res/icons/i2plogo_wbw_4_16.png b/src/qt/res/icons/i2plogo_wbw_4_16.png deleted file mode 100644 index 4aa81cd..0000000 Binary files a/src/qt/res/icons/i2plogo_wbw_4_16.png and /dev/null differ diff --git a/src/qt/res/icons/litecoin.icns b/src/qt/res/icons/litecoin.icns deleted file mode 100644 index 1bd8b13..0000000 Binary files a/src/qt/res/icons/litecoin.icns and /dev/null differ diff --git a/src/qt/res/icons/toolbar_testnet.png b/src/qt/res/icons/toolbar_testnet.png index ca12fb9..2a5a5d2 100644 Binary files a/src/qt/res/icons/toolbar_testnet.png and b/src/qt/res/icons/toolbar_testnet.png differ diff --git a/src/qt/res/images/about.png b/src/qt/res/images/about.png deleted file mode 100644 index c9ab951..0000000 Binary files a/src/qt/res/images/about.png and /dev/null differ diff --git a/src/qt/res/images/splash_testnet.png b/src/qt/res/images/splash_testnet.png index 0e64b41..167de10 100644 Binary files a/src/qt/res/images/splash_testnet.png and b/src/qt/res/images/splash_testnet.png differ diff --git a/src/resources.rc b/src/resources.rc index 18bc8f5..6e9400d 100644 --- a/src/resources.rc +++ b/src/resources.rc @@ -8,7 +8,7 @@ IDI_ICON2 ICON DISCARDABLE "qt/res/icons/gostcoin_testnet.ico" #define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD) #define VER_FILEVERSION VER_PRODUCTVERSION #define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR -#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin developers 2011-" STRINGIZE(COPYRIGHT_YEAR) " The Litecoin developers 2013-" STRINGIZE(COPYRIGHT_YEAR) " The Anoncoin developers 2013-" STRINGIZE(COPYRIGHT_YEAR) " The i2pd developers " STRINGIZE(COPYRIGHT_YEAR) " The Gostcoin developers" +#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin developers, 2011-" STRINGIZE(COPYRIGHT_YEAR) " The Litecoin developers, 2013-" STRINGIZE(COPYRIGHT_YEAR) " The Anoncoin developers, 2013-" STRINGIZE(COPYRIGHT_YEAR) " The i2pd developers, " STRINGIZE(COPYRIGHT_YEAR) " The Gostcoin developers" VS_VERSION_INFO VERSIONINFO FILEVERSION VER_FILEVERSION