Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Slightly overhaul NSI pixmaps #10644

Merged
merged 1 commit into from Jun 23, 2017

Conversation

Projects
None yet
3 participants
@jonasschnelli
Copy link
Member

jonasschnelli commented Jun 21, 2017

Slightly overhaul the NSI pixmaps.
As far as I can see the share/pixmaps/bitcoin*.png|.xmp files are unused (removed in this PR).

Gitian build will follow.

@jonasschnelli

This comment has been minimized.

Copy link
Member Author

jonasschnelli commented Jun 22, 2017

Gitian build:
https://bitcoin.jonasschnelli.ch/build/188

How it looks after this PR:
bildschirmfoto 2017-06-22 um 09 02 35
bildschirmfoto 2017-06-22 um 09 02 45

@MarcoFalke

This comment has been minimized.

Copy link
Member

MarcoFalke commented Jun 22, 2017

Looks like they are used in contrib.

utACK on the other change.

git grep xpm ./contrib/
contrib/debian/bitcoin-qt.install:share/pixmaps/bitcoin32.xpm usr/share/pixmaps
contrib/debian/bitcoin-qt.install:share/pixmaps/bitcoin16.xpm usr/share/pixmaps
contrib/rpm/bitcoin.spec:%{_bindir}/convert -resize 16x16 %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin16.xpm
contrib/rpm/bitcoin.spec:%{_bindir}/convert -resize 32x32 %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin32.xpm
contrib/rpm/bitcoin.spec:%{_bindir}/convert -resize 64x64 %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin64.xpm
contrib/rpm/bitcoin.spec:%{_bindir}/convert -resize 128x128 %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin128.xpm
contrib/rpm/bitcoin.spec:%{_bindir}/convert %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin256.xpm
contrib/rpm/bitcoin.spec:touch %{buildroot}%{_datadir}/pixmaps/*.xpm -r %{SOURCE100}
contrib/rpm/bitcoin.spec:%attr(0644,root,root) %{_datadir}/pixmaps/*.xpm

@MarcoFalke MarcoFalke added this to the 0.15.0 milestone Jun 22, 2017

@jonasschnelli jonasschnelli force-pushed the jonasschnelli:2017/06/cleanup branch to 92fb8bd Jun 22, 2017

@jonasschnelli

This comment has been minimized.

Copy link
Member Author

jonasschnelli commented Jun 22, 2017

@MarcoFalke: yes, your right.

Restored the files (force push amend commit).

@MarcoFalke

This comment has been minimized.

Copy link
Member

MarcoFalke commented Jun 22, 2017

ACK 92fb8bd

@laanwj

This comment has been minimized.

Copy link
Member

laanwj commented Jun 23, 2017

LGTM, utACK

@jonasschnelli jonasschnelli merged commit 92fb8bd into bitcoin:master Jun 23, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

jonasschnelli added a commit that referenced this pull request Jun 23, 2017

Merge #10644: Slightly overhaul NSI pixmaps
92fb8bd Slightly overhaul NSI pixmaps (Jonas Schnelli)

Tree-SHA512: d10508e38c37d63a1a1f0f640a402f24c9d4a4e94b603752c4e48b51ad7d2cbd12267a1ab038af69b9a519293ee57bce7c2c4236fec4031ca789cf2f20fdb863
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.