Skip to content

Commit

Permalink
Merge pull request bitcoin#2 from Pttn/master
Browse files Browse the repository at this point in the history
Qt: Replace remaining Bitcoin icons by Riecoin ones
  • Loading branch information
clo-prime committed Dec 9, 2018
2 parents 7667f75 + 69200b6 commit 20a39bb
Show file tree
Hide file tree
Showing 39 changed files with 16,531 additions and 1,498 deletions.
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ DIST_SHARE = \
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/riecoin.ico \
$(top_srcdir)/share/pixmaps/nsis-header.bmp \
$(top_srcdir)/share/pixmaps/nsis-wizard.bmp \
$(top_srcdir)/doc/README_windows.txt
Expand Down
20 changes: 10 additions & 10 deletions contrib/debian/copyright
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Bitcoin
Upstream-Contact: Satoshi Nakamoto <satoshin@gmx.com>
irc://#bitcoin@freenode.net
Source: https://github.com/bitcoin/bitcoin
Upstream-Name: Riecoin
Upstream-Contact: Gatra <info@riecoin.org>
irc://#riecoin@freenode.net
Source: https://github.com/riecointeam/riecoin

Files: *
Copyright: 2009-2018, Bitcoin Core Developers
Copyright: 2009-2018, Bitcoin and Riecoin Core Developers
License: Expat
Comment: The Bitcoin Core Developers encompasses the current developers listed on bitcoin.org,
as well as the numerous contributors to the project.
Expand Down Expand Up @@ -86,12 +86,12 @@ License: Expat
Comment: Modifications of Stephan Hutchings Typicons

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
src/qt/res/icons/riecoin.*
share/pixmaps/riecoin*
src/qt/res/src/riecoin.svg
Copyright: Mick Bruce
License: public-domain
Comment: Site: https://bitcointalk.org/?topic=1756.0
Comment:


License: Expat
Expand Down
2 changes: 1 addition & 1 deletion contrib/rpm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ assigned to them in the `touch` command that specifies the timestamp.

## SVG, PNG, and XPM Icons

The `bitcoin.svg` file is from the source listed as `Source100`. It is used as
The `riecoin.svg` file is from the source listed as `Source100`. It is used as
the source for the PNG and XPM files. The generated PNG and XPM files are given
the same timestamp as the source SVG file as a means of indicating they are
derived from it.
Expand Down
24 changes: 12 additions & 12 deletions contrib/rpm/bitcoin.spec
Original file line number Diff line number Diff line change
Expand Up @@ -243,20 +243,20 @@ done

%if %{_buildqt}
# qt icons
install -D -p share/pixmaps/bitcoin.ico %{buildroot}%{_datadir}/pixmaps/bitcoin.ico
install -D -p share/pixmaps/riecoin.ico %{buildroot}%{_datadir}/pixmaps/riecoin.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
install -p %{SOURCE100} %{buildroot}%{_datadir}/pixmaps/riecoin.svg
%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/riecoin16.png -w16 -h16
%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/riecoin32.png -w32 -h32
%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/riecoin64.png -w64 -h64
%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/riecoin128.png -w128 -h128
%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/riecoin256.png -w256 -h256
%{_bindir}/convert -resize 16x16 %{buildroot}%{_datadir}/pixmaps/riecoin256.png %{buildroot}%{_datadir}/pixmaps/riecoin16.xpm
%{_bindir}/convert -resize 32x32 %{buildroot}%{_datadir}/pixmaps/riecoin256.png %{buildroot}%{_datadir}/pixmaps/riecoin32.xpm
%{_bindir}/convert -resize 64x64 %{buildroot}%{_datadir}/pixmaps/riecoin256.png %{buildroot}%{_datadir}/pixmaps/riecoin64.xpm
%{_bindir}/convert -resize 128x128 %{buildroot}%{_datadir}/pixmaps/riecoin256.png %{buildroot}%{_datadir}/pixmaps/riecoin128.xpm
%{_bindir}/convert %{buildroot}%{_datadir}/pixmaps/riecoin256.png %{buildroot}%{_datadir}/pixmaps/riecoin256.xpm
touch %{buildroot}%{_datadir}/pixmaps/*.png -r %{SOURCE100}
touch %{buildroot}%{_datadir}/pixmaps/*.xpm -r %{SOURCE100}

Expand Down
Binary file removed share/pixmaps/bitcoin.ico
Binary file not shown.
Binary file removed share/pixmaps/bitcoin128.png
Binary file not shown.

0 comments on commit 20a39bb

Please sign in to comment.