Browse Source

Update pngs

tags/1.9.4
falkTX 10 years ago
parent
commit
dde5936d53
24 changed files with 55 additions and 360 deletions
  1. BIN
      resources/bitmaps/kbd_h_dark.png
  2. BIN
      resources/bitmaps/kbd_v_dark.png
  3. BIN
      resources/bitmaps/keyboard/black_hover.png
  4. BIN
      resources/bitmaps/keyboard/black_normal.png
  5. BIN
      resources/bitmaps/keyboard/black_on_blue.png
  6. BIN
      resources/bitmaps/keyboard/black_on_green.png
  7. BIN
      resources/bitmaps/keyboard/black_on_orange.png
  8. BIN
      resources/bitmaps/keyboard/black_on_red.png
  9. BIN
      resources/bitmaps/keyboard/bright_sprite.png
  10. +18
    -1
      resources/bitmaps/keyboard/export.sh
  11. +19
    -0
      resources/bitmaps/keyboard/join.sh
  12. +18
    -359
      resources/bitmaps/keyboard/keyboard.svg
  13. BIN
      resources/bitmaps/keyboard/white_bright_hover.png
  14. BIN
      resources/bitmaps/keyboard/white_bright_normal.png
  15. BIN
      resources/bitmaps/keyboard/white_bright_on_blue.png
  16. BIN
      resources/bitmaps/keyboard/white_bright_on_green.png
  17. BIN
      resources/bitmaps/keyboard/white_bright_on_orange.png
  18. BIN
      resources/bitmaps/keyboard/white_bright_on_red.png
  19. BIN
      resources/bitmaps/keyboard/white_dark_hover.png
  20. BIN
      resources/bitmaps/keyboard/white_dark_normal.png
  21. BIN
      resources/bitmaps/keyboard/white_dark_on_blue.png
  22. BIN
      resources/bitmaps/keyboard/white_dark_on_green.png
  23. BIN
      resources/bitmaps/keyboard/white_dark_on_orange.png
  24. BIN
      resources/bitmaps/keyboard/white_dark_on_red.png

BIN
resources/bitmaps/kbd_h_dark.png View File

Before After
Width: 119  |  Height: 118  |  Size: 14KB Width: 169  |  Height: 116  |  Size: 7.7KB

BIN
resources/bitmaps/kbd_v_dark.png View File

Before After
Width: 118  |  Height: 119  |  Size: 14KB Width: 116  |  Height: 169  |  Size: 8.5KB

BIN
resources/bitmaps/keyboard/black_hover.png View File

Before After
Width: 169  |  Height: 58  |  Size: 1.3KB Width: 169  |  Height: 58  |  Size: 1.1KB

BIN
resources/bitmaps/keyboard/black_normal.png View File

Before After
Width: 169  |  Height: 58  |  Size: 1.5KB Width: 169  |  Height: 58  |  Size: 1.4KB

BIN
resources/bitmaps/keyboard/black_on_blue.png View File

Before After
Width: 169  |  Height: 58  |  Size: 1.8KB Width: 169  |  Height: 58  |  Size: 1.7KB

BIN
resources/bitmaps/keyboard/black_on_green.png View File

Before After
Width: 169  |  Height: 58  |  Size: 1.8KB Width: 169  |  Height: 58  |  Size: 1.7KB

BIN
resources/bitmaps/keyboard/black_on_orange.png View File

Before After
Width: 169  |  Height: 58  |  Size: 1.8KB Width: 169  |  Height: 58  |  Size: 1.7KB

BIN
resources/bitmaps/keyboard/black_on_red.png View File

Before After
Width: 169  |  Height: 58  |  Size: 1.7KB Width: 169  |  Height: 58  |  Size: 1.7KB

BIN
resources/bitmaps/keyboard/bright_sprite.png View File

Before After
Width: 169  |  Height: 348  |  Size: 11KB

+ 18
- 1
resources/bitmaps/keyboard/export.sh View File

@@ -1,5 +1,8 @@
# TODO: split flattable from non-flattable PNGs
#! /bin/bash
# Export several areas in keyboard.svg to optimized PNG.
# Dependencies: Inkscape, pngcrush.

# IDs of target area rectangles in keyboard.svg:
IDs="
white_bright_normal
white_bright_hover
@@ -21,6 +24,20 @@ black_on_green
black_on_blue
"

# Export images:
for ID in $IDs; do
inkscape keyboard.svg --export-id=$ID --export-png=$ID.png
done

# Optimize opaque images and remove their alpha channels.
# pngcrush will not overwrite input files, so use a temp dir
# and move/overwrite files afterwards.
# pngcrush creates the dir given for -d, if necessary.
pngcrush -c 2 -reduce -d crushed white_*.png

# Optimze transparent images, keeping their alpha channels:
pngcrush -c 6 -reduce -d crushed black_*.png

# Cleanup:
mv crushed/*.png .
rmdir crushed

+ 19
- 0
resources/bitmaps/keyboard/join.sh View File

@@ -0,0 +1,19 @@
#! /bin/bash
# Join images vertically, to create a sprite sheat.
# Dependencies: Imagemagick (convert)

convert white_bright_normal.png \
white_bright_hover.png \
white_bright_on_red.png \
black_normal.png \
black_hover.png \
black_on_red.png \
-append bright_sprite.png

# convert white_dark_normal.png \
# white_dark_hover.png \
# white_dark_on_red.png \
# black_normal.png \
# black_hover.png \
# black_on_red.png \
# -append dark_sprite.png

+ 18
- 359
resources/bitmaps/keyboard/keyboard.svg View File

@@ -14700,116 +14700,6 @@
y1="735.375"
x2="16.25"
y2="731.375" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8108"
id="radialGradient17321"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8108"
id="radialGradient17323"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8108"
id="radialGradient17325"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8108"
id="radialGradient17327"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8108"
id="radialGradient17329"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8108"
id="radialGradient17331"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8108"
id="radialGradient17333"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8108"
id="radialGradient17335"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8108"
id="radialGradient17337"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8108"
id="radialGradient17339"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient7343"
@@ -14865,61 +14755,6 @@
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient7343"
id="radialGradient17351"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient7343"
id="radialGradient17353"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient7343"
id="radialGradient17355"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient7343"
id="radialGradient17357"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient7343"
id="radialGradient17359"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient11509"
@@ -15217,127 +15052,6 @@
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8108"
id="radialGradient7338"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8108"
id="radialGradient7352"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8108"
id="radialGradient7354"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8108"
id="radialGradient7356"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8108"
id="radialGradient7358"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8108"
id="radialGradient7360"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8108"
id="radialGradient7362"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8108"
id="radialGradient7364"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8108"
id="radialGradient7366"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8108"
id="radialGradient7368"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8108"
id="radialGradient7370"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<filter
inkscape:collect="always"
id="filter7393"
@@ -15403,61 +15117,6 @@
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8108"
id="radialGradient7509"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8108"
id="radialGradient7511"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8108"
id="radialGradient7513"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8108"
id="radialGradient7515"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient8108"
id="radialGradient7517"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
cx="147.00002"
cy="922.70721"
fx="147.00002"
fy="922.70721"
r="7" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4221"
@@ -15830,10 +15489,10 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="1"
inkscape:cx="234.49595"
inkscape:cy="339.17654"
inkscape:cx="661.14113"
inkscape:cy="183.89807"
inkscape:document-units="px"
inkscape:current-layer="layer1"
inkscape:current-layer="layer7"
showgrid="false"
borderlayer="false"
inkscape:showpageshadow="false"
@@ -15888,7 +15547,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -29078,7 +28737,7 @@
inkscape:groupmode="layer"
id="layer2"
inkscape:label="construction"
style="display:inline"
style="display:none"
transform="translate(144,1259.9872)">
<rect
y="-1313"
@@ -29114,9 +28773,9 @@
height="7"
width="7"
id="rect4268"
style="fill:#4a8a0e;fill-opacity:1;stroke:none;enable-background:new" />
style="fill:#b0c714;fill-opacity:1;stroke:none;enable-background:new" />
<rect
style="fill:#b0c714;fill-opacity:1;stroke:none;enable-background:new"
style="fill:#4a8a0e;fill-opacity:1;stroke:none;enable-background:new"
id="rect4270"
width="7"
height="7"
@@ -29130,7 +28789,7 @@
id="rect4272"
style="fill:#a1afe0;fill-opacity:1;stroke:none;enable-background:new" />
<rect
style="fill:#4a8a0e;fill-opacity:1;stroke:none;enable-background:new"
style="fill:#b0c714;fill-opacity:1;stroke:none;enable-background:new"
id="rect4274"
width="7"
height="7"
@@ -29142,7 +28801,7 @@
height="7"
width="7"
id="rect4276"
style="fill:#4e68c4;fill-opacity:1;stroke:none;enable-background:new" />
style="fill:#4a8a0e;fill-opacity:1;stroke:none;enable-background:new" />
<rect
y="-1313"
x="24"
@@ -29151,14 +28810,14 @@
id="rect4278"
style="fill:#b0c714;fill-opacity:1;stroke:none;enable-background:new" />
<rect
style="fill:#b0c714;fill-opacity:1;stroke:none;enable-background:new"
style="fill:#4a8a0e;fill-opacity:1;stroke:none;enable-background:new"
id="rect4280"
width="7"
height="7"
x="31"
y="-1313" />
<rect
style="fill:#4a8a0e;fill-opacity:1;stroke:none;enable-background:new"
style="fill:#b0c714;fill-opacity:1;stroke:none;enable-background:new"
id="rect4282"
width="7"
height="7"
@@ -29242,7 +28901,7 @@
x="17"
y="-1293" />
<rect
style="fill:#4a8a0e;fill-opacity:1;stroke:none;enable-background:new"
style="fill:#b0c714;fill-opacity:1;stroke:none;enable-background:new"
id="rect4306"
width="14"
height="7"
@@ -29254,7 +28913,7 @@
height="7"
width="14"
id="rect4308"
style="fill:#b0c714;fill-opacity:1;stroke:none;enable-background:new" />
style="fill:#4a8a0e;fill-opacity:1;stroke:none;enable-background:new" />
<rect
style="fill:#a1afe0;fill-opacity:1;stroke:none;enable-background:new"
id="rect4310"
@@ -29268,16 +28927,16 @@
height="7"
width="14"
id="rect4312"
style="fill:#4a8a0e;fill-opacity:1;stroke:none;enable-background:new" />
style="fill:#b0c714;fill-opacity:1;stroke:none;enable-background:new" />
<rect
style="fill:#b0c714;fill-opacity:1;stroke:none;enable-background:new"
style="fill:#4a8a0e;fill-opacity:1;stroke:none;enable-background:new"
id="rect4314"
width="14"
height="7"
x="73"
y="-1293" />
<rect
style="fill:#4a8a0e;fill-opacity:1;stroke:none;enable-background:new"
style="fill:#b0c714;fill-opacity:1;stroke:none;enable-background:new"
id="rect4316"
width="14"
height="7"
@@ -29289,14 +28948,14 @@
height="7"
width="14"
id="rect4318"
style="fill:#b0c714;fill-opacity:1;stroke:none;enable-background:new" />
style="fill:#4a8a0e;fill-opacity:1;stroke:none;enable-background:new" />
<rect
y="-1293"
x="115"
height="7"
width="14"
id="rect4320"
style="fill:#4a8a0e;fill-opacity:1;stroke:none;enable-background:new" />
style="fill:#b0c714;fill-opacity:1;stroke:none;enable-background:new" />
<rect
y="-1286"
x="-39"


BIN
resources/bitmaps/keyboard/white_bright_hover.png View File

Before After
Width: 169  |  Height: 58  |  Size: 1.4KB Width: 169  |  Height: 58  |  Size: 1.0KB

BIN
resources/bitmaps/keyboard/white_bright_normal.png View File

Before After
Width: 169  |  Height: 58  |  Size: 1.7KB Width: 169  |  Height: 58  |  Size: 1.5KB

BIN
resources/bitmaps/keyboard/white_bright_on_blue.png View File

Before After
Width: 169  |  Height: 58  |  Size: 4.2KB Width: 169  |  Height: 58  |  Size: 3.7KB

BIN
resources/bitmaps/keyboard/white_bright_on_green.png View File

Before After
Width: 169  |  Height: 58  |  Size: 4.3KB Width: 169  |  Height: 58  |  Size: 3.9KB

BIN
resources/bitmaps/keyboard/white_bright_on_orange.png View File

Before After
Width: 169  |  Height: 58  |  Size: 4.1KB Width: 169  |  Height: 58  |  Size: 3.7KB

BIN
resources/bitmaps/keyboard/white_bright_on_red.png View File

Before After
Width: 169  |  Height: 58  |  Size: 3.8KB Width: 169  |  Height: 58  |  Size: 3.4KB

BIN
resources/bitmaps/keyboard/white_dark_hover.png View File

Before After
Width: 169  |  Height: 58  |  Size: 1.9KB Width: 169  |  Height: 58  |  Size: 1.5KB

BIN
resources/bitmaps/keyboard/white_dark_normal.png View File

Before After
Width: 169  |  Height: 58  |  Size: 1.8KB Width: 169  |  Height: 58  |  Size: 1.5KB

BIN
resources/bitmaps/keyboard/white_dark_on_blue.png View File

Before After
Width: 169  |  Height: 58  |  Size: 4.3KB Width: 169  |  Height: 58  |  Size: 3.8KB

BIN
resources/bitmaps/keyboard/white_dark_on_green.png View File

Before After
Width: 169  |  Height: 58  |  Size: 4.4KB Width: 169  |  Height: 58  |  Size: 3.9KB

BIN
resources/bitmaps/keyboard/white_dark_on_orange.png View File

Before After
Width: 169  |  Height: 58  |  Size: 4.0KB Width: 169  |  Height: 58  |  Size: 3.6KB

BIN
resources/bitmaps/keyboard/white_dark_on_red.png View File

Before After
Width: 169  |  Height: 58  |  Size: 3.8KB Width: 169  |  Height: 58  |  Size: 3.4KB

Loading…
Cancel
Save