# HG changeset patch
# User robcast
# Date 1337940913 -7200
# Node ID dbd1cf7cd86ad3b69f9da6e7fffee5a3a8d97712
# Parent 9c2abceb05c53ac4941c920107fad407d8759b74
first version of improved icons.
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/back.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/back.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/birds-eye.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/birds-eye.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/brightness.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/brightness.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/calibration.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/calibration.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/cat.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/cat.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/contrast.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/contrast.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/delmark.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/delmark.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/first.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/first.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/fwd.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/fwd.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/info.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/info.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/last.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/last.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/mark.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/mark.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/mirror-horizontal.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/mirror-horizontal.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/mirror-vertical.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/mirror-vertical.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/options.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/options.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/original-size.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/original-size.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/page.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/page.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/pagewidth.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/pagewidth.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/quality.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/quality.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/reference.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/reference.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/reset.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/reset.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/rgb.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/rgb.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/rotate.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/rotate.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/size-bigger.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/size-bigger.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/size-smaller.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/size-smaller.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/zoom-area.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/zoom-area.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/zoom-full.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/zoom-full.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/zoom-in.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/zoom-in.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen/zoom-out.png
Binary file webapp/src/main/webapp/jquery/img/fullscreen/zoom-out.png has changed
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/fullscreen2.svg
--- a/webapp/src/main/webapp/jquery/img/fullscreen2.svg Thu May 24 14:35:43 2012 +0200
+++ b/webapp/src/main/webapp/jquery/img/fullscreen2.svg Fri May 25 12:15:13 2012 +0200
@@ -16,9 +16,9 @@
sodipodi:version="0.32"
inkscape:version="0.48.2 r9819"
sodipodi:docname="fullscreen2.svg"
- inkscape:export-filename="/Users/casties/Library/Eclipse/digilib/webapp/src/main/webapp/jquery/img/textgrid/16/down.gif.png"
- inkscape:export-xdpi="48.30703"
- inkscape:export-ydpi="48.30703"
+ inkscape:export-filename="/Users/casties/Library/Eclipse/digilib/webapp/src/main/webapp/jquery/img/fullscreen/zoom-area.png"
+ inkscape:export-xdpi="73.860001"
+ inkscape:export-ydpi="73.860001"
version="1.1"
style="display:inline">
+
@@ -75,91 +82,72 @@
image/svg+xml
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ style="fill:#ffffff;fill-opacity:0.70588235;stroke:#808080;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
@@ -191,62 +179,57 @@
style="display:none"
sodipodi:insensitive="true">
+ style="fill:#4d4d4d;fill-opacity:1;stroke:#4d4d4d;stroke-width:1.08393705"
+ id="g3803"
+ transform="matrix(0.89460641,0,0,0.89460641,2.3784983,3.6704705)">
+
-
-
-
-
-
-
-
-
-
+ style="fill:#4d4d4d;fill-opacity:1;stroke:#4d4d4d;stroke-width:1.08393705"
+ id="g2968">
+
+
+
+
+
+
+ transform="matrix(1.5369436,0,0,1.4848439,-14.999997,-11.136915)" />
+ d="m 24,18.025188 0,12.2724"
+ style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ d="m 31,18.307671 0,7.08157 0,0 0,0"
+ style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
@@ -315,7 +298,7 @@
style="display:none"
sodipodi:insensitive="true">
+ style="fill:#ffffff;fill-opacity:0.70588235;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ style="fill:#ffffff;fill-opacity:0.70588235;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-
-
-
-
+
+
+ style="fill:#ffffff;fill-opacity:0.70588235;stroke:#808080;stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
1:1
+ x="9.2063198"
+ y="30.622778">1:1
@@ -607,8 +586,8 @@
x="17.584454"
y="30.786526">#
@@ -638,7 +617,7 @@
style="display:none"
sodipodi:insensitive="true">
+ width="10"
+ height="10"
+ x="19"
+ y="11" />
+ width="10"
+ height="10"
+ x="26"
+ y="24" />
+ inkscape:export-ydpi="90"
+ sodipodi:nodetypes="cccc" />
+ d="M 39.840312,24.193792 24.108322,39.806208 8.2278954,24.200006 z"
+ style="fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-width:0.38758382;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ sodipodi:nodetypes="cccc" />
+ inkscape:export-ydpi="90"
+ sodipodi:nodetypes="cccc" />
+ style="display:none"
+ sodipodi:insensitive="true">
+ d="M 24.233222,8.219043 39.845638,24.027122 24.239376,39.83146 z"
+ style="fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-width:0.38758379;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ sodipodi:nodetypes="cccc" />
+ width="17"
+ height="21"
+ x="15.5"
+ y="13.5" />
+ inkscape:transform-center-x="-0.83451887"
+ inkscape:transform-center-y="0.046236667"
+ transform="matrix(-0.72606566,-0.02961542,0.01577906,-1.3627389,46.412545,57.058942)" />
+ inkscape:transform-center-x="-0.04623393"
+ inkscape:transform-center-y="-0.83451794"
+ transform="matrix(-0.02961542,0.72606566,-1.362739,-0.01577906,56.984749,-0.40842676)" />
+ style="fill:#ffffff;fill-opacity:0.70588235;stroke:#808080;stroke-width:0.99999982;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ inkscape:transform-center-x="-0.80489315"
+ inkscape:transform-center-y="0.04547113"
+ transform="matrix(-0.70028962,-0.02912551,0.01521889,-1.3401961,22.075297,56.512072)" />
+ inkscape:transform-center-x="0.045472026"
+ inkscape:transform-center-y="-0.80489258"
+ transform="matrix(0.02912551,0.70028962,1.3401961,-0.01521889,-8.5120722,27.924703)" />
+ width="23"
+ height="29"
+ x="12.5"
+ y="9.5" />
+ inkscape:transform-center-x="-0.83451887"
+ inkscape:transform-center-y="0.029774418"
+ transform="matrix(-0.72606566,-0.01907168,0.01577906,-0.87757405,40.144628,45.289236)" />
+
+ style="fill:#ffffff;fill-opacity:0.70588235;stroke:#808080;stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ inkscape:transform-center-x="0.83451873"
+ inkscape:transform-center-y="0.02977442"
+ transform="matrix(0.72606565,-0.01907168,-0.01577906,-0.87757405,7.6274701,45.289236)" />
+ inkscape:transform-center-x="0.029774885"
+ inkscape:transform-center-y="0.83451886"
+ transform="matrix(0.01907168,-0.72606566,0.87757405,0.01577906,2.7107641,43.29753)" />
+
+
+ width="23"
+ height="29"
+ x="12.5"
+ y="9.5" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- display:inline
-
-
-
-
-
-
-
-
-
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/gen_fullscreen_icons.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/webapp/src/main/webapp/jquery/img/gen_fullscreen_icons.sh Fri May 25 12:15:13 2012 +0200
@@ -0,0 +1,28 @@
+#!/bin/bash
+#
+# script for creating PNG icons from icon SVG file
+
+SVGFILE="fullscreen2.svg"
+XSLTFILE="fullscreen_icons.xsl"
+SVGDIR="fullscreen/svg_gen"
+# PNG directory relative to SVGDIR
+PNGDIR="32"
+
+# run XSLT to create separate SVG files (in fullscreen/svg)
+SAXON="java -jar /Volumes/Schlachteplatte/stuff/java/lib/saxonb9-1-0-7j/saxon9.jar"
+echo "running Saxon to create separate SVGs"
+mkdir -p $SVGDIR
+$SAXON $SVGFILE $XSLTFILE
+
+# create PNGs from separate SVGs using inkscape
+INKSCAPE=" /Volumes/Schlachteplatte/Applications/Inkscape.app/Contents/Resources/bin/inkscape"
+echo "running Inkscape to create PNGs"
+cd $SVGDIR
+mkdir -p $PNGDIR
+ls *.svg | while read fx
+do
+ f=`basename "$fx" svg`
+ $INKSCAPE --file="$fx" --export-area-drawing --export-height=32 --export-png="$PNGDIR/${f}png"
+ #$INKSCAPE --file="$fx" --export-height=32 --export-png="$PNGDIR/${f}png"
+done
+echo "done."
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/img/gen_fullscreen_icons.xsl
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/webapp/src/main/webapp/jquery/img/gen_fullscreen_icons.xsl Fri May 25 12:15:13 2012 +0200
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ display:inline
+
+
+
+
+
+
+
+
+
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/jquery.digilib.buttons.js
--- a/webapp/src/main/webapp/jquery/jquery.digilib.buttons.js Thu May 24 14:35:43 2012 +0200
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.buttons.js Fri May 25 12:15:13 2012 +0200
@@ -60,7 +60,7 @@
about : {
onclick : "about",
tooltip : "about Digilib",
- icon : "help.png"
+ icon : "info.png"
},
reset : {
onclick : "reset",
@@ -105,13 +105,13 @@
size : {
onclick : "setSize",
tooltip : "set page size",
- icon : "size.png"
+ icon : "size-bigger.png"
},
calibrationx : {
// onclick : "showCalibrationDiv",
onclick : "calibrate",
tooltip : "calibrate screen resolution",
- icon : "calibration-x.png"
+ icon : "calibration.png"
},
scale : {
// onclick : "showScaleModeSelector",
diff -r 9c2abceb05c5 -r dbd1cf7cd86a webapp/src/main/webapp/jquery/jquery.digilib.js
--- a/webapp/src/main/webapp/jquery/jquery.digilib.js Thu May 24 14:35:43 2012 +0200
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.js Fri May 25 12:15:13 2012 +0200
@@ -38,7 +38,7 @@
var defaults = {
// version of this script
- 'version' : 'jquery.digilib.js 2.1.7b1',
+ 'version' : 'jquery.digilib.js 2.1.8a1',
// logo url
'logoUrl' : 'img/digilib-logo-text1.png',
// homepage url (behind logo)