diff --git a/Makefile.am b/Makefile.am --- a/Makefile.am +++ b/Makefile.am @@ -51,7 +51,7 @@ BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \ $(top_srcdir)/contrib/devtools/security-check.py -WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \ +WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin-abc.ico \ $(top_srcdir)/share/pixmaps/nsis-header.bmp \ $(top_srcdir)/share/pixmaps/nsis-wizard.bmp \ $(top_srcdir)/doc/README_windows.txt diff --git a/contrib/debian/README.md b/contrib/debian/README.md --- a/contrib/debian/README.md +++ b/contrib/debian/README.md @@ -15,7 +15,7 @@ If you build yourself, you will either need to modify the paths in the .desktop file or copy or symlink your bitcoin-qt binary to `/usr/bin` -and the `../../share/pixmaps/bitcoin128.png` to `/usr/share/pixmaps` +and the `../../share/pixmaps/bitcoin-abc128.png` to `/usr/share/pixmaps` bitcoin-qt.protocol (KDE) diff --git a/contrib/debian/bitcoin-qt.install b/contrib/debian/bitcoin-qt.install --- a/contrib/debian/bitcoin-qt.install +++ b/contrib/debian/bitcoin-qt.install @@ -1,6 +1,6 @@ usr/local/bin/bitcoin-qt usr/bin -share/pixmaps/bitcoin32.xpm usr/share/pixmaps -share/pixmaps/bitcoin16.xpm usr/share/pixmaps -share/pixmaps/bitcoin128.png usr/share/pixmaps +share/pixmaps/bitcoin-abc32.xpm usr/share/pixmaps +share/pixmaps/bitcoin-abc16.xpm usr/share/pixmaps +share/pixmaps/bitcoin-abc128.png usr/share/pixmaps debian/bitcoin-qt.desktop usr/share/applications debian/bitcoin-qt.protocol usr/share/kde4/services/ diff --git a/contrib/debian/copyright b/contrib/debian/copyright --- a/contrib/debian/copyright +++ b/contrib/debian/copyright @@ -82,12 +82,14 @@ Files: src/qt/res/icons/about.png src/qt/res/icons/bitcoin.* - share/pixmaps/bitcoin* src/qt/res/src/bitcoin.svg Copyright: Bitboy, Jonas Schnelli License: public-domain Comment: Site: https://bitcointalk.org/?topic=1756.0 +Files: share/pixmaps/bitcoin-abc* +License: public-domain +Copyright: bitcoincash.org, bitcoinabc.org License: Expat Permission is hereby granted, free of charge, to any person obtaining a diff --git a/contrib/rpm/bitcoin.spec b/contrib/rpm/bitcoin.spec --- a/contrib/rpm/bitcoin.spec +++ b/contrib/rpm/bitcoin.spec @@ -243,20 +243,20 @@ %if %{_buildqt} # qt icons -install -D -p share/pixmaps/bitcoin.ico %{buildroot}%{_datadir}/pixmaps/bitcoin.ico +install -D -p share/pixmaps/bitcoin-abc.ico %{buildroot}%{_datadir}/pixmaps/bitcoin-abc.ico install -p share/pixmaps/nsis-header.bmp %{buildroot}%{_datadir}/pixmaps/ install -p share/pixmaps/nsis-wizard.bmp %{buildroot}%{_datadir}/pixmaps/ install -p %{SOURCE100} %{buildroot}%{_datadir}/pixmaps/bitcoin.svg -%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin16.png -w16 -h16 -%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin32.png -w32 -h32 -%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin64.png -w64 -h64 -%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin128.png -w128 -h128 -%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin256.png -w256 -h256 -%{_bindir}/convert -resize 16x16 %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin16.xpm -%{_bindir}/convert -resize 32x32 %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin32.xpm -%{_bindir}/convert -resize 64x64 %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin64.xpm -%{_bindir}/convert -resize 128x128 %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin128.xpm -%{_bindir}/convert %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin256.xpm +%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin-abc16.png -w16 -h16 +%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin-abc32.png -w32 -h32 +%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin-abc64.png -w64 -h64 +%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin-abc128.png -w128 -h128 +%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin-abc256.png -w256 -h256 +%{_bindir}/convert -resize 16x16 %{buildroot}%{_datadir}/pixmaps/bitcoin-abc256.png %{buildroot}%{_datadir}/pixmaps/bitcoin-abc16.xpm +%{_bindir}/convert -resize 32x32 %{buildroot}%{_datadir}/pixmaps/bitcoin-abc256.png %{buildroot}%{_datadir}/pixmaps/bitcoin-abc32.xpm +%{_bindir}/convert -resize 64x64 %{buildroot}%{_datadir}/pixmaps/bitcoin-abc256.png %{buildroot}%{_datadir}/pixmaps/bitcoin-abc64.xpm +%{_bindir}/convert -resize 128x128 %{buildroot}%{_datadir}/pixmaps/bitcoin-abc256.png %{buildroot}%{_datadir}/pixmaps/bitcoin-abc128.xpm +%{_bindir}/convert %{buildroot}%{_datadir}/pixmaps/bitcoin-abc256.png %{buildroot}%{_datadir}/pixmaps/bitcoin-abc256.xpm touch %{buildroot}%{_datadir}/pixmaps/*.png -r %{SOURCE100} touch %{buildroot}%{_datadir}/pixmaps/*.xpm -r %{SOURCE100} diff --git a/share/pixmaps/bitcoin.ico b/share/pixmaps/bitcoin-abc.ico rename from share/pixmaps/bitcoin.ico rename to share/pixmaps/bitcoin-abc.ico diff --git a/share/pixmaps/bitcoin128.png b/share/pixmaps/bitcoin-abc128.png rename from share/pixmaps/bitcoin128.png rename to share/pixmaps/bitcoin-abc128.png diff --git a/share/pixmaps/bitcoin128.xpm b/share/pixmaps/bitcoin-abc128.xpm rename from share/pixmaps/bitcoin128.xpm rename to share/pixmaps/bitcoin-abc128.xpm diff --git a/share/pixmaps/bitcoin16.png b/share/pixmaps/bitcoin-abc16.png rename from share/pixmaps/bitcoin16.png rename to share/pixmaps/bitcoin-abc16.png diff --git a/share/pixmaps/bitcoin16.xpm b/share/pixmaps/bitcoin-abc16.xpm rename from share/pixmaps/bitcoin16.xpm rename to share/pixmaps/bitcoin-abc16.xpm diff --git a/share/pixmaps/bitcoin256.png b/share/pixmaps/bitcoin-abc256.png rename from share/pixmaps/bitcoin256.png rename to share/pixmaps/bitcoin-abc256.png diff --git a/share/pixmaps/bitcoin256.xpm b/share/pixmaps/bitcoin-abc256.xpm rename from share/pixmaps/bitcoin256.xpm rename to share/pixmaps/bitcoin-abc256.xpm diff --git a/share/pixmaps/bitcoin32.png b/share/pixmaps/bitcoin-abc32.png rename from share/pixmaps/bitcoin32.png rename to share/pixmaps/bitcoin-abc32.png diff --git a/share/pixmaps/bitcoin32.xpm b/share/pixmaps/bitcoin-abc32.xpm rename from share/pixmaps/bitcoin32.xpm rename to share/pixmaps/bitcoin-abc32.xpm diff --git a/share/pixmaps/bitcoin64.png b/share/pixmaps/bitcoin-abc64.png rename from share/pixmaps/bitcoin64.png rename to share/pixmaps/bitcoin-abc64.png diff --git a/share/pixmaps/bitcoin64.xpm b/share/pixmaps/bitcoin-abc64.xpm rename from share/pixmaps/bitcoin64.xpm rename to share/pixmaps/bitcoin-abc64.xpm diff --git a/share/setup.nsi.in b/share/setup.nsi.in --- a/share/setup.nsi.in +++ b/share/setup.nsi.in @@ -10,7 +10,7 @@ !define URL @PACKAGE_URL@ # MUI Symbol Definitions -!define MUI_ICON "@abs_top_srcdir@/share/pixmaps/bitcoin.ico" +!define MUI_ICON "@abs_top_srcdir@/share/pixmaps/bitcoin-abc.ico" !define MUI_WELCOMEFINISHPAGE_BITMAP "@abs_top_srcdir@/share/pixmaps/nsis-wizard.bmp" !define MUI_HEADERIMAGE !define MUI_HEADERIMAGE_RIGHT @@ -50,9 +50,9 @@ # Installer attributes OutFile @abs_top_srcdir@/@PACKAGE_TARNAME@-${VERSION}-win@WINDOWS_BITS@-setup.exe !if "@WINDOWS_BITS@" == "64" -InstallDir $PROGRAMFILES64\Bitcoin +InstallDir $PROGRAMFILES64\Bitcoin-abc !else -InstallDir $PROGRAMFILES\Bitcoin +InstallDir $PROGRAMFILES\Bitcoin-abc !endif CRCCheck on XPStyle on @@ -104,7 +104,7 @@ WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1 WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1 WriteRegStr HKCR "@PACKAGE_TARNAME@" "URL Protocol" "" - WriteRegStr HKCR "@PACKAGE_TARNAME@" "" "URL:Bitcoin" + WriteRegStr HKCR "@PACKAGE_TARNAME@" "" "URL:Bitcoin-abc" WriteRegStr HKCR "@PACKAGE_TARNAME@\DefaultIcon" "" $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@ WriteRegStr HKCR "@PACKAGE_TARNAME@\shell\open\command" "" '"$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" "%1"' SectionEnd @@ -137,7 +137,7 @@ Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (testnet, @WINDOWS_BITS@-bit).lnk" - Delete /REBOOTOK "$SMSTARTUP\Bitcoin.lnk" + Delete /REBOOTOK "$SMSTARTUP\Bitcoin-abc.lnk" Delete /REBOOTOK $INSTDIR\uninstall.exe Delete /REBOOTOK $INSTDIR\debug.log Delete /REBOOTOK $INSTDIR\db.log