Browse Source

Revert "Merge pull request #1931 from laanwj/2012_10_newicons"

This reverts commit 199d88cf90, reversing
changes made to 65bc1573e7.

License is worse instead of better. Will only accept public domain and
MIT-licensed icons from now on.
pull/145/head
Wladimir J. van der Laan 12 years ago
parent
commit
485d667748
  1. 20
      doc/assets-attribution.txt
  2. 39
      share/qt/how_to_generate_update_spinner.txt
  3. BIN
      share/qt/img/reload.xcf
  4. 43
      share/qt/make_spinner.py
  5. BIN
      src/qt/res/icons/connect0_16.png
  6. BIN
      src/qt/res/icons/connect1_16.png
  7. BIN
      src/qt/res/icons/connect2_16.png
  8. BIN
      src/qt/res/icons/connect3_16.png
  9. BIN
      src/qt/res/icons/connect4_16.png
  10. BIN
      src/qt/res/movies/update_spinner.mng

20
doc/assets-attribution.txt

@ -14,11 +14,11 @@ Designer: David Vignoni (david@icon-king.com)
License: LGPL
Site: http://www.icon-king.com/projects/nuvola/
Icon: src/qt/res/icons/connect*.png (edited, originally Wireless Signal.png)
Icon Pack: The Clean Desk
Designer: Alfred Pereira
License: freeware
Site: http://cdn.365psd.com/wp-content/uploads/2012/03/The-Clean-Desk-Set.zip and http://findicons.com/icon/547785/wireless_signal?id=547912
Icon: src/qt/res/icons/connect*.png
Icon Pack: Human-O2
Designer: schollidesign
License: GNU/GPL
Site: http://findicons.com/icon/93743/blocks_gnome_netstatus_0
Icon: src/qt/res/icons/transaction*.png
Designer: md2k7
@ -40,11 +40,11 @@ Designer: Bitboy (optimized for 16x16 by Wladimir van der Laan)
License: Public Domain
Site: https://bitcointalk.org/?topic=1756.0
Movie: src/qt/res/movies/update_spinner.mng
Site: http://preloaders.net/en/circular
License: You are encouraged and legally entitled to copy and modify any animated GIF and APNG images, generated by http://preloaders.net web-site.
All animated GIF and APNG images are completely free to use in all projects (web and desktop applications, freeware and commercial projects), WITH THE EXCEPTION of any other animated images generator applications
You are encouraged, but NOT obligated to place any reference to http://preloaders.net web-site to use it's content in any projects and applications.
Icon: scripts/img/reload.xcf (modified),src/qt/res/movies/update_spinner.mng
Icon Pack: Kids
Designer: Everaldo (Everaldo Coelho)
License: GNU/GPL
Site: http://findicons.com/icon/17102/reload?id=17102
Image: src/qt/res/images/splash2.jpg (Wallet image)
Designer: Crobbo (forum)

39
share/qt/how_to_generate_update_spinner.txt

@ -1,39 +0,0 @@
How to generate the update_spinner.mng
You will need ImageMagick in your path (the 'convert' executable at least)
Go here: http://preloaders.net/en/circular
Select the base image you want to use.
Image type: APNG
Transparent background: Yes
Foreground color: F2A555 (or select a color)
Animation speed: (default value)
Preloader size: 16 x 16
(no Advanced Options changed)
Additional download options:
Check Download as sprites
Press Download now
Rename the file to base.png
convert -dispose 3 -delay 10 base.png -crop 16x16 +repage update_spinner.mng
If you want to use the make_spinner.py (gives worse results):
In http://preloaders.net/en/circular change
Preloader size: 128 x 128
Press Download now
Rename the file to base.png
convert base.png -crop 128x128+0+0 reload_scaled.png
and use the make_spinner.py . Note that the results aren't very good.

BIN
share/qt/img/reload.xcf

Binary file not shown.

43
share/qt/make_spinner.py

@ -0,0 +1,43 @@
#!/usr/bin/env python
# W.J. van der Laan, 2011
# Make spinning .mng animation from a .png
# Requires imagemagick 6.7+
from __future__ import division
from os import path
from PIL import Image
from subprocess import Popen
SRC='img/reload_scaled.png'
DST='../../src/qt/res/movies/update_spinner.mng'
TMPDIR='/tmp'
TMPNAME='tmp-%03i.png'
NUMFRAMES=35
FRAMERATE=10.0
CONVERT='convert'
CLOCKWISE=True
DSIZE=(16,16)
im_src = Image.open(SRC)
if CLOCKWISE:
im_src = im_src.transpose(Image.FLIP_LEFT_RIGHT)
def frame_to_filename(frame):
return path.join(TMPDIR, TMPNAME % frame)
frame_files = []
for frame in xrange(NUMFRAMES):
rotation = (frame + 0.5) / NUMFRAMES * 360.0
if CLOCKWISE:
rotation = -rotation
im_new = im_src.rotate(rotation, Image.BICUBIC)
im_new.thumbnail(DSIZE, Image.ANTIALIAS)
outfile = frame_to_filename(frame)
im_new.save(outfile, 'png')
frame_files.append(outfile)
p = Popen([CONVERT, "-delay", str(FRAMERATE), "-dispose", "2"] + frame_files + [DST])
p.communicate()

BIN
src/qt/res/icons/connect0_16.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 702 B

BIN
src/qt/res/icons/connect1_16.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 612 B

BIN
src/qt/res/icons/connect2_16.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 623 B

BIN
src/qt/res/icons/connect3_16.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 625 B

BIN
src/qt/res/icons/connect4_16.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 673 B

BIN
src/qt/res/movies/update_spinner.mng

Binary file not shown.
Loading…
Cancel
Save