Browse Source

update qt resources, replace old i2p mascot to new logo

pull/26/head
R4SAS 7 years ago
parent
commit
161bd34e63
  1. 1
      .gitignore
  2. 4
      android/gostcoin-qt-android.pro
  3. 4
      gostcoin-qt.pro
  4. 4
      src/qt/forms/aboutdialog.ui
  5. 16
      src/qt/forms/addressbookpage.ui
  6. 4
      src/qt/forms/rpcconsole.ui
  7. 8
      src/qt/forms/sendcoinsdialog.ui
  8. 8
      src/qt/forms/sendcoinsentry.ui
  9. 18
      src/qt/forms/signverifymessagedialog.ui
  10. 6
      src/qt/gostcoin.cpp
  11. 2
      src/qt/gostcoin.qrc
  12. 2
      src/qt/res/gostcoin-qt.rc
  13. BIN
      src/qt/res/icons/bitcoin_testnet.ico
  14. BIN
      src/qt/res/icons/gostcoin_testnet.ico
  15. BIN
      src/qt/res/images/i2pguy.png
  16. BIN
      src/qt/res/images/mask.png
  17. 2
      src/resources.rc

1
.gitignore vendored

@ -8,6 +8,7 @@ Makefile*
qrc_bitcoin.cpp qrc_bitcoin.cpp
gostcoin-qt gostcoin-qt
gostcoind gostcoind
gostcoind.exe
*.pro.user *.pro.user
.qmake.stash .qmake.stash
gostcoin-qt_plugin_import.cpp gostcoin-qt_plugin_import.cpp

4
android/gostcoin-qt-android.pro

@ -366,7 +366,7 @@ SOURCES += ../src/qt/gostcoin.cpp \
../i2psam/i2psam.cpp \ ../i2psam/i2psam.cpp \
../src/qt/setupdarknet.cpp ../src/qt/setupdarknet.cpp
RESOURCES += ../src/qt/bitcoin.qrc RESOURCES += ../src/qt/gostcoin.qrc
FORMS += ../src/qt/forms/sendcoinsdialog.ui \ FORMS += ../src/qt/forms/sendcoinsdialog.ui \
../src/qt/forms/coincontroldialog.ui \ ../src/qt/forms/coincontroldialog.ui \
@ -415,7 +415,7 @@ greaterThan(QT_MAJOR_VERSION, 4): {
} }
# for lrelease/lupdate # 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) TRANSLATIONS = $$files(../src/qt/locale/bitcoin_*.ts)
isEmpty(QMAKE_LRELEASE) { isEmpty(QMAKE_LRELEASE) {

4
gostcoin-qt.pro

@ -290,7 +290,7 @@ SOURCES += src/qt/gostcoin.cpp \
src/qt/setupdarknet.cpp \ src/qt/setupdarknet.cpp \
i2psam/i2psam.cpp i2psam/i2psam.cpp
RESOURCES += src/qt/bitcoin.qrc RESOURCES += src/qt/gostcoin.qrc
FORMS += src/qt/forms/sendcoinsdialog.ui \ FORMS += src/qt/forms/sendcoinsdialog.ui \
src/qt/forms/coincontroldialog.ui \ src/qt/forms/coincontroldialog.ui \
@ -337,7 +337,7 @@ QMAKE_EXTRA_COMPILERS += gccsse2
CODECFORTR = UTF-8 CODECFORTR = UTF-8
# for lrelease/lupdate # 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) TRANSLATIONS = $$files(src/qt/locale/bitcoin_*.ts)
isEmpty(QMAKE_LRELEASE) { isEmpty(QMAKE_LRELEASE) {

4
src/qt/forms/aboutdialog.ui

@ -23,7 +23,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="../bitcoin.qrc">:/images/i2pguy</pixmap> <pixmap resource="../gostcoin.qrc">:/images/mask</pixmap>
</property> </property>
</widget> </widget>
</item> </item>
@ -150,7 +150,7 @@ This product includes software developed by the OpenSSL Project for use in the O
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="../bitcoin.qrc"/> <include location="../gostcoin.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>

16
src/qt/forms/addressbookpage.ui

@ -63,7 +63,7 @@
<string>&amp;New Address</string> <string>&amp;New Address</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../gostcoin.qrc">
<normaloff>:/icons/add</normaloff>:/icons/add</iconset> <normaloff>:/icons/add</normaloff>:/icons/add</iconset>
</property> </property>
</widget> </widget>
@ -77,7 +77,7 @@
<string>&amp;Copy Address</string> <string>&amp;Copy Address</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../gostcoin.qrc">
<normaloff>:/icons/editcopy</normaloff>:/icons/editcopy</iconset> <normaloff>:/icons/editcopy</normaloff>:/icons/editcopy</iconset>
</property> </property>
</widget> </widget>
@ -88,7 +88,7 @@
<string>Show &amp;QR Code</string> <string>Show &amp;QR Code</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../gostcoin.qrc">
<normaloff>:/icons/qrcode</normaloff>:/icons/qrcode</iconset> <normaloff>:/icons/qrcode</normaloff>:/icons/qrcode</iconset>
</property> </property>
</widget> </widget>
@ -102,7 +102,7 @@
<string>Sign &amp;Message</string> <string>Sign &amp;Message</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../gostcoin.qrc">
<normaloff>:/icons/edit</normaloff>:/icons/edit</iconset> <normaloff>:/icons/edit</normaloff>:/icons/edit</iconset>
</property> </property>
</widget> </widget>
@ -116,7 +116,7 @@
<string>&amp;Verify Message</string> <string>&amp;Verify Message</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../gostcoin.qrc">
<normaloff>:/icons/transaction_0</normaloff>:/icons/transaction_0</iconset> <normaloff>:/icons/transaction_0</normaloff>:/icons/transaction_0</iconset>
</property> </property>
</widget> </widget>
@ -130,7 +130,7 @@
<string>&amp;Delete</string> <string>&amp;Delete</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../gostcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset> <normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property> </property>
</widget> </widget>
@ -157,7 +157,7 @@
<string>&amp;Export</string> <string>&amp;Export</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../gostcoin.qrc">
<normaloff>:/icons/export</normaloff>:/icons/export</iconset> <normaloff>:/icons/export</normaloff>:/icons/export</iconset>
</property> </property>
</widget> </widget>
@ -180,7 +180,7 @@
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="../bitcoin.qrc"/> <include location="../gostcoin.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

4
src/qt/forms/rpcconsole.ui

@ -430,7 +430,7 @@
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../gostcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset> <normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property> </property>
<property name="shortcut"> <property name="shortcut">
@ -450,7 +450,7 @@
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="../bitcoin.qrc"/> <include location="../gostcoin.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

8
src/qt/forms/sendcoinsdialog.ui

@ -668,7 +668,7 @@
<string>Add &amp;Recipient</string> <string>Add &amp;Recipient</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../gostcoin.qrc">
<normaloff>:/icons/add</normaloff>:/icons/add</iconset> <normaloff>:/icons/add</normaloff>:/icons/add</iconset>
</property> </property>
<property name="autoDefault"> <property name="autoDefault">
@ -691,7 +691,7 @@
<string>Clear &amp;All</string> <string>Clear &amp;All</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../gostcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset> <normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property> </property>
<property name="autoRepeatDelay"> <property name="autoRepeatDelay">
@ -757,7 +757,7 @@
<string>S&amp;end</string> <string>S&amp;end</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../gostcoin.qrc">
<normaloff>:/icons/send</normaloff>:/icons/send</iconset> <normaloff>:/icons/send</normaloff>:/icons/send</iconset>
</property> </property>
<property name="default"> <property name="default">
@ -770,7 +770,7 @@
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="../bitcoin.qrc"/> <include location="../gostcoin.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

8
src/qt/forms/sendcoinsentry.ui

@ -89,7 +89,7 @@
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../gostcoin.qrc">
<normaloff>:/icons/address-book</normaloff>:/icons/address-book</iconset> <normaloff>:/icons/address-book</normaloff>:/icons/address-book</iconset>
</property> </property>
<property name="shortcut"> <property name="shortcut">
@ -106,7 +106,7 @@
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../gostcoin.qrc">
<normaloff>:/icons/editpaste</normaloff>:/icons/editpaste</iconset> <normaloff>:/icons/editpaste</normaloff>:/icons/editpaste</iconset>
</property> </property>
<property name="shortcut"> <property name="shortcut">
@ -123,7 +123,7 @@
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../gostcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset> <normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property> </property>
</widget> </widget>
@ -153,7 +153,7 @@
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../bitcoin.qrc"/> <include location="../gostcoin.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

18
src/qt/forms/signverifymessagedialog.ui

@ -64,7 +64,7 @@
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../gostcoin.qrc">
<normaloff>:/icons/address-book</normaloff>:/icons/address-book</iconset> <normaloff>:/icons/address-book</normaloff>:/icons/address-book</iconset>
</property> </property>
<property name="shortcut"> <property name="shortcut">
@ -84,7 +84,7 @@
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../gostcoin.qrc">
<normaloff>:/icons/editpaste</normaloff>:/icons/editpaste</iconset> <normaloff>:/icons/editpaste</normaloff>:/icons/editpaste</iconset>
</property> </property>
<property name="shortcut"> <property name="shortcut">
@ -140,7 +140,7 @@
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../gostcoin.qrc">
<normaloff>:/icons/editcopy</normaloff>:/icons/editcopy</iconset> <normaloff>:/icons/editcopy</normaloff>:/icons/editcopy</iconset>
</property> </property>
<property name="autoDefault"> <property name="autoDefault">
@ -161,7 +161,7 @@
<string>Sign &amp;Message</string> <string>Sign &amp;Message</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../gostcoin.qrc">
<normaloff>:/icons/edit</normaloff>:/icons/edit</iconset> <normaloff>:/icons/edit</normaloff>:/icons/edit</iconset>
</property> </property>
<property name="autoDefault"> <property name="autoDefault">
@ -178,7 +178,7 @@
<string>Clear &amp;All</string> <string>Clear &amp;All</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../gostcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset> <normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property> </property>
<property name="autoDefault"> <property name="autoDefault">
@ -277,7 +277,7 @@
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../gostcoin.qrc">
<normaloff>:/icons/address-book</normaloff>:/icons/address-book</iconset> <normaloff>:/icons/address-book</normaloff>:/icons/address-book</iconset>
</property> </property>
<property name="shortcut"> <property name="shortcut">
@ -307,7 +307,7 @@
<string>Verify &amp;Message</string> <string>Verify &amp;Message</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../gostcoin.qrc">
<normaloff>:/icons/transaction_0</normaloff>:/icons/transaction_0</iconset> <normaloff>:/icons/transaction_0</normaloff>:/icons/transaction_0</iconset>
</property> </property>
<property name="autoDefault"> <property name="autoDefault">
@ -324,7 +324,7 @@
<string>Clear &amp;All</string> <string>Clear &amp;All</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../gostcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset> <normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property> </property>
<property name="autoDefault"> <property name="autoDefault">
@ -390,7 +390,7 @@
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../bitcoin.qrc"/> <include location="../gostcoin.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

6
src/qt/gostcoin.cpp

@ -176,7 +176,7 @@ int main(int argc, char *argv[])
QTextCodec::setCodecForCStrings(QTextCodec::codecForTr()); QTextCodec::setCodecForCStrings(QTextCodec::codecForTr());
#endif #endif
Q_INIT_RESOURCE(bitcoin); Q_INIT_RESOURCE(gostcoin);
QApplication app(argc, argv); QApplication app(argc, argv);
#ifdef ANDROID #ifdef ANDROID
@ -245,11 +245,11 @@ int main(int argc, char *argv[])
if (qtTranslator.load("qt_" + lang_territory, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) if (qtTranslator.load("qt_" + lang_territory, QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
app.installTranslator(&qtTranslator); 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/")) if (translatorBase.load(lang, ":/translations/"))
app.installTranslator(&translatorBase); 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/")) if (translator.load(lang_territory, ":/translations/"))
app.installTranslator(&translator); app.installTranslator(&translator);

2
src/qt/bitcoin.qrc → src/qt/gostcoin.qrc

@ -44,7 +44,7 @@
<qresource prefix="/images"> <qresource prefix="/images">
<file alias="about">res/images/about.png</file> <file alias="about">res/images/about.png</file>
<file alias="splash">res/images/splash.png</file> <file alias="splash">res/images/splash.png</file>
<file alias="i2pguy">res/images/i2pguy.png</file> <file alias="mask">res/images/mask.png</file>
<file alias="splash_testnet">res/images/splash_testnet.png</file> <file alias="splash_testnet">res/images/splash_testnet.png</file>
</qresource> </qresource>
<qresource prefix="/movies"> <qresource prefix="/movies">

2
src/qt/res/gostcoin-qt.rc

@ -1,5 +1,5 @@
IDI_ICON1 ICON DISCARDABLE "icons/gostcoin.ico" IDI_ICON1 ICON DISCARDABLE "icons/gostcoin.ico"
IDI_ICON2 ICON DISCARDABLE "icons/bitcoin_testnet.ico" IDI_ICON2 ICON DISCARDABLE "icons/gostcoin_testnet.ico"
#include <windows.h> // needed for VERSIONINFO #include <windows.h> // needed for VERSIONINFO
#include "../../clientversion.h" // holds the needed client version information #include "../../clientversion.h" // holds the needed client version information

BIN
src/qt/res/icons/bitcoin_testnet.ico

Binary file not shown.

Before

Width:  |  Height:  |  Size: 74 KiB

BIN
src/qt/res/icons/gostcoin_testnet.ico

Binary file not shown.

After

Width:  |  Height:  |  Size: 216 KiB

BIN
src/qt/res/images/i2pguy.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

BIN
src/qt/res/images/mask.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

2
src/resources.rc

@ -1,5 +1,5 @@
IDI_ICON1 ICON DISCARDABLE "qt/res/icons/gostcoin.ico" 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 <windows.h> // needed for VERSIONINFO #include <windows.h> // needed for VERSIONINFO
#include "clientversion.h" // holds the needed client version information #include "clientversion.h" // holds the needed client version information

Loading…
Cancel
Save