28 files changed, 25 insertions, 32 deletions

diff --git a/Makefile b/Makefile
index ac4cf99..7e5b4ab 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,19 @@
-all: clean
-        make generate
+all: actions apps categories devices emblems places status mimetypes-templates
         
-generate: preview.png versions update-cache
+%.png:
+        rm -f $@
 
-preview.png:
-        #$(shell find "scalable/" -type f -name "*.png" -not -path ".git/*" -not -path 'scalable/animations/*' -not -path 'scalable/mimetypes/*' | sort | feh -m -y 96 -E 96 -s -p -b trans -O preview.png -f-)
-        $(shell for path in $(ls -d scalable/*/); do montage -label '\n%t'  $(find $path -type f) -tile 5 -background white -geometry 96x96+24+24  doc/img/$(echo $path | cut -d "/" -f2).jpg; done)
+%: %.png
+        $(shell /usr/bin/env montage -label '\n%t'  $(shell find scalable/$(@) -type f) -tile 5 -background white -geometry 96x96+24+24  doc/img/$(@).jpg)
 
-preview_mimetypes.png:
-        $(shell find "scalable/mimetypes" -type f -name "*.png" | sort | feh -m -y 256 -E 256 -W 8192 -s -p -b trans -O preview_mimetypes.png -f-)
+mimetypes:
+        ./icons-mkmimetypes.sh /usr/share/mime/generic-icons 
+        ./icons-mkmimetypes.sh /usr/share/mime/globs
 
-versions:
-        find scalable/ -name '*.png' -exec ./generate.sh '{}' \;
+resize:
+        find scalable/ -name '*.png' -exec ./icons-mkdefaultsizes.sh '{}' \;
 
-update-cache:
+iconcache:
         gtk-update-icon-cache `pwd`
 
 clean:
diff --git a/doc/img/actions.jpg b/doc/img/actions.jpg
index 9aec71f..83102c5 100644
--- a/doc/img/actions.jpg
+++ b/doc/img/actions.jpg
diff --git a/doc/img/apps.jpg b/doc/img/apps.jpg
index 1c57a3c..b0ba043 100644
--- a/doc/img/apps.jpg
+++ b/doc/img/apps.jpg
diff --git a/doc/img/categories.jpg b/doc/img/categories.jpg
index 51dd56a..9208609 100644
--- a/doc/img/categories.jpg
+++ b/doc/img/categories.jpg
diff --git a/doc/img/devices.jpg b/doc/img/devices.jpg
index 8c845db..2db6eaa 100644
--- a/doc/img/devices.jpg
+++ b/doc/img/devices.jpg
diff --git a/doc/img/emblems.jpg b/doc/img/emblems.jpg
index f0d4673..756512b 100644
--- a/doc/img/emblems.jpg
+++ b/doc/img/emblems.jpg
diff --git a/doc/img/mimetypes-templates.jpg b/doc/img/mimetypes-templates.jpg
new file mode 100644
index 0000000..f229bcc
--- /dev/null
+++ b/doc/img/mimetypes-templates.jpg
diff --git a/doc/img/places.jpg b/doc/img/places.jpg
index 76f6946..3a09874 100644
--- a/doc/img/places.jpg
+++ b/doc/img/places.jpg
diff --git a/doc/img/status.jpg b/doc/img/status.jpg
index b752b6f..235c3b8 100644
--- a/doc/img/status.jpg
+++ b/doc/img/status.jpg
diff --git a/doc/readme.md b/doc/readme.md
index b4da9aa..db07ace 100644
--- a/doc/readme.md
+++ b/doc/readme.md
@@ -46,7 +46,8 @@ To use this theme <a href="http://git.entwicklerseite.de/icons/snapshot/icons-ma
 Mime type Icons can be dynamically generated for all file types. As a result
 you gonna get hundreds of icons allowing you to easily distinguish between
 different file types. The generator uses templates, which you can see here:
-
+<br/>
+<img src="/icons/plain/doc/img/mimetypes-templates.jpg" />
 
 
 
diff --git a/generate.sh b/icons-mkdefaultsizes.sh
index d1737fb..6d4b756 100755
--- a/generate.sh
+++ b/icons-mkdefaultsizes.sh
@@ -2,8 +2,6 @@
 # invoke as ./generate.sh FILENAME
 # it is used to generate smaller versions from the one found in scalable
 
-
-
 FILE=${1#scalable/}
 PATH=$(dirname $FILE)
 
@@ -12,7 +10,7 @@ do
   /bin/mkdir -p "cache/$VERSION/$PATH"
 done
 
-
+echo "$1..."
 /usr/bin/convert $1 \
   \( -clone 0 -resize 16x16 -write cache/16x16/$FILE \) \
   \( -clone 0 -resize 32x32 -write cache/32x32/$FILE \) \
diff --git a/scalable/mimetypes/templates/generate.sh b/icons-mkmimetypes.sh
index be8de9c..202dbd5 100755
--- a/scalable/mimetypes/templates/generate.sh
+++ b/icons-mkmimetypes.sh
@@ -1,8 +1,9 @@
-DEFAULT_FILE='file' # .png gets added automatically
+$TEMPLATE_FOLDER_FILE='file' # .png gets added automatically
 #INPUT_FILE=test-globs
 #INPUT_FILE=/usr/share/mime/generic-icons < /usr/share/mime/globs
 INPUT_FILE=$1
-OUT_PATH="../"
+TEMPLATE_FOLDER='scalable/mimetypes-templates' 
+OUT_PATH="scalable/mimetypes"
 
 MAX_LINES=`cat $INPUT_FILE | wc -l`
 CUR_LINE=0
@@ -20,23 +21,23 @@ do
   ((CUR_LINE++))
   printf "[%-4d/%-4d] checking for %s\n" "$CUR_LINE" "$MAX_LINES" "$FILE.png"
 
-  if [[ -f "default/$FILE.png" ]]; then
-    echo "using default."
-    cp "default/$FILE.png" "$OUT_PATH/$FILE.png"
+  if [[ -f "$TEMPLATE_FOLDER/$FILE.png" ]]; then
+    echo "using $TEMPLATE_FOLDER"
+    cp "$TEMPLATE_FOLDER/$FILE.png" "$OUT_PATH/$FILE.png"
   else
 
     FIND=$FILE
     while [[ 1 ]]
     do
       # printf "%s\n" $FIND
-      if [[ -f "default/$FIND.png" ]]; then break; fi
+      if [[ -f "$TEMPLATE_FOLDER/$FIND.png" ]]; then break; fi
 
-      if [[ "$FIND" == "${FIND%-*}" ]]; then FIND="$DEFAULT_FILE"; break; fi
+      if [[ "$FIND" == "${FIND%-*}" ]]; then FIND="$$TEMPLATE_FOLDER_FILE"; break; fi
       FIND=${FIND%-*}
     done
 
-    # create default file... just in case there is no desktop file...
-    cp "default/$FIND.png" "$OUT_PATH/$FILE.png"
+    # create $TEMPLATE_FOLDER file... just in case there is no desktop file...
+    cp "$TEMPLATE_FOLDER/$FIND.png" "$OUT_PATH/$FILE.png"
 
     DESKTOP=`xdg-mime query default $MIME`
     if [[ -f /usr/share/applications/$DESKTOP ]]; then
@@ -47,7 +48,7 @@ do
 
       if [[ "$APPICON" ]]; then
         convert \
-          "default/$FIND.png"  \( -density 400 $APPICON -resize 256 \) \
+          "$TEMPLATE_FOLDER/$FIND.png"  \( -density 400 $APPICON -resize 256 \) \
           -gravity north -geometry +0+20 \
           -compose darken -composite  $OUT_PATH/$FILE.png
       fi
diff --git a/scalable/mimetypes/templates/default/application-x-executable.png b/scalable/mimetypes-templates/application-x-executable.png
index 92c5515..92c5515 100644
--- a/scalable/mimetypes/templates/default/application-x-executable.png
+++ b/scalable/mimetypes-templates/application-x-executable.png
diff --git a/scalable/mimetypes/templates/default/application-xml-dtd.png b/scalable/mimetypes-templates/application-xml-dtd.png
index 6e75df0..6e75df0 100644
--- a/scalable/mimetypes/templates/default/application-xml-dtd.png
+++ b/scalable/mimetypes-templates/application-xml-dtd.png
diff --git a/scalable/mimetypes/templates/default/application.png b/scalable/mimetypes-templates/application.png
index 78ee865..78ee865 100644
--- a/scalable/mimetypes/templates/default/application.png
+++ b/scalable/mimetypes-templates/application.png
diff --git a/scalable/mimetypes/templates/default/audio.png b/scalable/mimetypes-templates/audio.png
index 1271597..1271597 100644
--- a/scalable/mimetypes/templates/default/audio.png
+++ b/scalable/mimetypes-templates/audio.png
diff --git a/scalable/mimetypes/templates/default/file.png b/scalable/mimetypes-templates/file.png
index 69fd3ec..69fd3ec 100644
--- a/scalable/mimetypes/templates/default/file.png
+++ b/scalable/mimetypes-templates/file.png
diff --git a/scalable/mimetypes/templates/default/image.png b/scalable/mimetypes-templates/image.png
index 69fd3ec..69fd3ec 100644
--- a/scalable/mimetypes/templates/default/image.png
+++ b/scalable/mimetypes-templates/image.png
diff --git a/scalable/mimetypes/templates/default/text-css.png b/scalable/mimetypes-templates/text-css.png
index 64c2aa5..64c2aa5 100644
--- a/scalable/mimetypes/templates/default/text-css.png
+++ b/scalable/mimetypes-templates/text-css.png
diff --git a/scalable/mimetypes/templates/default/text-x-chdr.png b/scalable/mimetypes-templates/text-x-chdr.png
index 539f127..539f127 100644
--- a/scalable/mimetypes/templates/default/text-x-chdr.png
+++ b/scalable/mimetypes-templates/text-x-chdr.png
diff --git a/scalable/mimetypes/templates/default/text-x-csrc.png b/scalable/mimetypes-templates/text-x-csrc.png
index d55737a..d55737a 100644
--- a/scalable/mimetypes/templates/default/text-x-csrc.png
+++ b/scalable/mimetypes-templates/text-x-csrc.png
diff --git a/scalable/mimetypes/templates/default/text-x-generic.png b/scalable/mimetypes-templates/text-x-generic.png
index 69fd3ec..69fd3ec 100644
--- a/scalable/mimetypes/templates/default/text-x-generic.png
+++ b/scalable/mimetypes-templates/text-x-generic.png
diff --git a/scalable/mimetypes/templates/default/text-x-makefile.png b/scalable/mimetypes-templates/text-x-makefile.png
index bd48fd4..bd48fd4 100644
--- a/scalable/mimetypes/templates/default/text-x-makefile.png
+++ b/scalable/mimetypes-templates/text-x-makefile.png
diff --git a/scalable/mimetypes/templates/default/text-x-script.png b/scalable/mimetypes-templates/text-x-script.png
index 6eb0d88..6eb0d88 100644
--- a/scalable/mimetypes/templates/default/text-x-script.png
+++ b/scalable/mimetypes-templates/text-x-script.png
diff --git a/scalable/mimetypes/templates/default/text.png b/scalable/mimetypes-templates/text.png
index 7d7cb76..7d7cb76 100644
--- a/scalable/mimetypes/templates/default/text.png
+++ b/scalable/mimetypes-templates/text.png
diff --git a/scalable/mimetypes/templates/default/video.png b/scalable/mimetypes-templates/video.png
index 6527c94..6527c94 100644
--- a/scalable/mimetypes/templates/default/video.png
+++ b/scalable/mimetypes-templates/video.png
diff --git a/scalable/mimetypes/templates/Makefile b/scalable/mimetypes/templates/Makefile
deleted file mode 100644
index f9ca85b..0000000
--- a/scalable/mimetypes/templates/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-all:
-        ./generate.sh /usr/share/mime/generic-icons 
-        ./generate.sh /usr/share/mime/globs
diff --git a/scalable/mimetypes/templates/test-globs b/scalable/mimetypes/templates/test-globs
deleted file mode 100644
index 9b062d7..0000000
--- a/scalable/mimetypes/templates/test-globs
+++ /dev/null
@@ -1,4 +0,0 @@
-text/x-csrc:*.c
-application/x-blender:*.blend
-text/plain:*.txt
-application/x-kexiproject-sqlite3:*.kkk