diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins index 1d3b6f8..ea88fb6 100644 --- a/CLIENT_DATA/setup3264.ins +++ b/CLIENT_DATA/setup3264.ins @@ -120,7 +120,7 @@ If exist "%System%\defaultassociations.xml" (copy "%System%\defaultassociations. SET Prog=$ProgExe$ SET Prog=%Prog:~0,-4% SET SC=HKLM\Software\Classes -rem SET Extn=$ImageTypeExt$ +rem SET Extn=$ImageTypesExt$ SET Extn=bmp-55 dds-60 gif-65 jpg-70 jpeg-70 pcx-75 png-80 psd-85 tga-90 tif-95 tiff-95 FOR %%j IN (%Extn%) DO ( diff --git a/builder-product.cfg b/builder-product.cfg index 3c78854..35e96ab 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -146,7 +146,7 @@ DL_FILE[21]="imagineicons.zip" DL_SOURCE[21]="http://ftp.disconnected-by-peer.at/pub/imagineicons.zip" DL_ARCH[21]="ALL" DL_EXTRACT_FORMAT[21]="unzip" -DL_EXTRACT_TO[21]="tmpicon" +DL_EXTRACT_TO[21]="Template" # DL_FILE[22]="Imagine_Plugin_7Z_0.0.5.zip" # DL_SOURCE[22]="http://www.nyam.pe.kr/dev/imagine/download/plugin/Imagine_Plugin_7Z_0.0.5.zip" @@ -187,14 +187,14 @@ DL_EXTRACT_TO[21]="tmpicon" # File array index for the image showing while installing the program ICON_DL_INDEX=0 -# 3fr arw cr2 crw dcr dng erf kdc mos mrw nef orf pef raf raw srw sr ani anm dib rle cdr cdt pat ccx cmx clp cur dcm dicom dcx emf exr sxr mxr flc fli hdp jxr wdp hdr icl ico ics -# jbg jbig jp2 jpc j2k jpg jpe jpeg lbm lbmp iff mac macp mbm mng bpm pcd pcx pdn pgm pic cel png ppm psd 8psd psp ras rla rle sgi rgb bw spr wbmp wap wbm webp wmf wpg xbm xcf xpm +# 3fr arw cr2 crw dcr dng erf kdc mos mrw nef orf pef raf raw srw sr ani anm dib rle cdr cdt pat ccx cmx clp cur dcm dicom sxr mxr hdp jxr wdp hdr icl ics +# lbm lbmp iff mac macp mbm pdn pgm pic cel ppm ras rla rle sgi bw spr wap # zip cbz 7z cb7 arj lzh rar cbr alz egg tar gz bz2 iso cab # WINST_VALUE[0] is used in builder-target-cb.sh # if you change the index of this you also have to change it in the *.sh file WINST_NAME[0]="ImageTypesExt" -WINST_VALUE[0]="bmp dds gif jpg jpeg pcx png psd tga tif tiff" +WINST_VALUE[0]="bmp-11 dds-11 gif-11 jpg-11 jpe-11 jpeg-11 pcx-11 png-11 psd-11 8psd-11 tga-11 tif-11 tiff-11 dcx-11 emf-11 exr-11 flc-11 fli-11 ico-11 jbg-11 jbig-11 jp2-11 jpc-11 j2k-11 mng-11 bpm-11 pcd-11 rgb-11 wbmp-11 wbm-11 webp-11 wmf-11 wpg-11 xbm-11 xcf-11 xpm-11" OPSI_INI_SECTION[0]="X86" diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index ecd1db9..eed566f 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -32,103 +32,119 @@ function create() { mkdir $INST_DIR/CLIENT_DATA/ALL/Icons pushd $INST_DIR/CLIENT_DATA/ALL/ - for type in ${WINST_VALUE[0]} + for typenr in ${WINST_VALUE[0]} do - + type=${typenr/-*/} ### 24bit ############################################################################################################################################# # 256x256 - convert -size 256x256 xc:transparent -font DejaVu-Sans-Condensed-Bold -pointsize 70 -fill white -draw "gravity south text 0,5 '$type'" $type-256x256-txt.png - composite -quality 100 $type-256x256-txt.png $INST_DIR/CLIENT_DATA/ALL/tmpicon/icon_imagine_24bit_256x256.png $type-256x256-24bit.png + convert -verbose -size 256x256 xc:transparent -font DejaVu-Sans-Condensed-Bold -pointsize 70 -fill white -draw "gravity south text 0,5 '$type'" $type-256x256-txt.png + composite -verbose -quality 100 -define "png:compression-level=0" $type-256x256-txt.png $INST_DIR/CLIENT_DATA/ALL/Template/icon_imagine_24bit_256x256.png $type-256x256-24bit.png # 180x180 - convert -resize 180x180 $type-256x256-24bit.png $type-180x180-24bit.png + convert -verbose -resize 180x180 -define "png:compression-level=0" $type-256x256-24bit.png $type-180x180-24bit.png # 150x150 - convert -resize 150x150 $type-256x256-24bit.png $type-150x150-24bit.png + convert -verbose -resize 150x150 -define "png:compression-level=0" $type-256x256-24bit.png $type-150x150-24bit.png # 128x128 - convert -size 128x128 xc:transparent -font DejaVu-Sans-Condensed-Bold -pointsize 37 -fill white -draw "gravity south text 0,2 '$type'" $type-128x128-txt.png - composite -quality 100 $type-128x128-txt.png $INST_DIR/CLIENT_DATA/ALL/tmpicon/icon_imagine_24bit_128x128.png $type-128x128-24bit.png + convert -verbose -size 128x128 xc:transparent -font DejaVu-Sans-Condensed-Bold -pointsize 37 -fill white -draw "gravity south text 0,2 '$type'" $type-128x128-txt.png + composite -verbose -quality 100 -define "png:compression-level=0" $type-128x128-txt.png $INST_DIR/CLIENT_DATA/ALL/Template/icon_imagine_24bit_128x128.png $type-128x128-24bit.png # 96x96 - convert -resize 96x96 $type-256x256-24bit.png $type-96x96-24bit.png + convert -verbose -resize 96x96 -define "png:compression-level=0" $type-256x256-24bit.png $type-96x96-24bit.png # 72x72 - convert -resize 72x72 $type-256x256-24bit.png $type-72x72-24bit.png + convert -verbose -resize 72x72 -define "png:compression-level=0" $type-256x256-24bit.png $type-72x72-24bit.png # 64x64 - convert -size 64x64 xc:transparent -font DejaVu-Sans-Condensed-Bold -pointsize 19 -fill white -draw "gravity south text 0,1 '$type'" $type-64x64-txt.png - composite -quality 100 $type-64x64-txt.png $INST_DIR/CLIENT_DATA/ALL/tmpicon/icon_imagine_24bit_64x64.png $type-64x64-24bit.png + convert -verbose -size 64x64 xc:transparent -font DejaVu-Sans-Condensed-Bold -pointsize 19 -fill white -draw "gravity south text 0,1 '$type'" $type-64x64-txt.png + composite -verbose -quality 100 -define "png:compression-level=0" $type-64x64-txt.png $INST_DIR/CLIENT_DATA/ALL/Template/icon_imagine_24bit_64x64.png $type-64x64-24bit.png + # 50x50 + convert -verbose -resize 50x50 -define "png:compression-level=0" $type-64x64-24bit.png $type-50x50-24bit.png # 48x48 - convert -size 48x48 xc:transparent -font DejaVu-Sans-Condensed-Bold -pointsize 14 -fill white -draw "gravity south text 0,1 '$type'" $type-48x48-txt.png - composite -quality 100 $type-48x48-txt.png $INST_DIR/CLIENT_DATA/ALL/tmpicon/icon_imagine_24bit_48x48.png $type-48x48-24bit.png + convert -verbose -size 48x48 xc:transparent -font DejaVu-Sans-Condensed-Bold -pointsize 14 -fill white -draw "gravity south text 0,1 '$type'" $type-48x48-txt.png + composite -verbose -quality 100 -define "png:compression-level=0" $type-48x48-txt.png $INST_DIR/CLIENT_DATA/ALL/Template/icon_imagine_24bit_48x48.png $type-48x48-24bit.png + # 40x40 + convert -verbose -resize 40x40 -define "png:compression-level=0" $type-48x48-24bit.png $type-40x40-24bit.png # 32x32 - convert -resize 32x32 $type-48x48-24bit.png $type-32x32-24bit.png + convert -verbose -resize 32x32 -define "png:compression-level=0" $type-48x48-24bit.png $type-32x32-24bit.png # 30x30 - convert -resize 30x30 $type-48x48-24bit.png $type-30x30-24bit.png + convert -verbose -resize 30x30 -define "png:compression-level=0" $type-48x48-24bit.png $type-30x30-24bit.png # 24x24 - convert -resize 24x24 $type-48x48-24bit.png $type-24x24-24bit.png + convert -verbose -resize 24x24 -define "png:compression-level=0" $type-48x48-24bit.png $type-24x24-24bit.png # 16x16 - #convert -size 16x16 xc:transparent -font DejaVu-Sans-Condensed-Bold -pointsize 7 -fill white -draw "gravity south text 0,0 '$type'" $type-16x16-txt.png - #composite -quality 100 $type-16x16-txt.png $INST_DIR/CLIENT_DATA/ALL/tmpicon/icon_imagine_24bit_16x16.png $type-16x16.png - convert -resize 16x16 $type-48x48-24bit.png $type-16x16-24bit.png + #convert -verbose -size 16x16 xc:transparent -font DejaVu-Sans-Condensed-Bold -pointsize 7 -fill white -draw "gravity south text 0,0 '$type'" $type-16x16-txt.png + #composite -verbose -quality 100 -define "png:compression-level=0" $type-16x16-txt.png $INST_DIR/CLIENT_DATA/ALL/Template/icon_imagine_24bit_16x16.png $type-16x16.png + convert -verbose -resize 16x16 -define "png:compression-level=0" $type-48x48-24bit.png $type-16x16-24bit.png #### 8bit ############################################################################################################################################# # 256x256 - convert $type-256x256-24bit.png -depth 8 -colors 256 +dither png8:$type-256x256-8bit.png + convert -verbose $type-256x256-24bit.png -define "png:compression-level=0" -depth 8 -colors 256 +dither png8:$type-256x256-8bit.png # 180x180 - convert $type-180x180-24bit.png -depth 8 -colors 256 +dither png8:$type-180x180-8bit.png + convert -verbose $type-180x180-24bit.png -define "png:compression-level=0" -depth 8 -colors 256 +dither png8:$type-180x180-8bit.png # 150x150 - convert $type-150x150-24bit.png -depth 8 -colors 256 +dither png8:$type-150x150-8bit.png + convert -verbose $type-150x150-24bit.png -define "png:compression-level=0" -depth 8 -colors 256 +dither png8:$type-150x150-8bit.png # 128x128 - convert $type-128x128-24bit.png -depth 8 -colors 256 +dither png8:$type-128x128-8bit.png + convert -verbose $type-128x128-24bit.png -define "png:compression-level=0" -depth 8 -colors 256 +dither png8:$type-128x128-8bit.png # 96x96 - convert $type-96x96-24bit.png -depth 8 -colors 256 +dither png8:$type-96x96-8bit.png + convert -verbose $type-96x96-24bit.png -define "png:compression-level=0" -depth 8 -colors 256 +dither png8:$type-96x96-8bit.png # 72x72 - convert $type-72x72-24bit.png -depth 8 -colors 256 +dither png8:$type-72x72-8bit.png + convert -verbose $type-72x72-24bit.png -define "png:compression-level=0" -depth 8 -colors 256 +dither png8:$type-72x72-8bit.png # 64x64 - convert $type-64x64-24bit.png -depth 8 -colors 256 +dither png8:$type-64x64-8bit.png + convert -verbose $type-64x64-24bit.png -define "png:compression-level=0" -depth 8 -colors 256 +dither png8:$type-64x64-8bit.png + # 50x50 + convert -verbose $type-50x50-24bit.png -define "png:compression-level=0" -depth 8 -colors 256 +dither png8:$type-50x50-8bit.png # 48x48 - convert $type-48x48-24bit.png -depth 8 -colors 256 +dither png8:$type-48x48-8bit.png + convert -verbose $type-48x48-24bit.png -define "png:compression-level=0" -depth 8 -colors 256 +dither png8:$type-48x48-8bit.png + # 40x40 + convert -verbose $type-40x40-24bit.png -define "png:compression-level=0" -depth 8 -colors 256 +dither png8:$type-40x40-8bit.png # 32x32 - convert $type-32x32-24bit.png -depth 8 -colors 256 +dither png8:$type-32x32-8bit.png + convert -verbose $type-32x32-24bit.png -define "png:compression-level=0" -depth 8 -colors 256 +dither png8:$type-32x32-8bit.png # 30x30 - convert $type-30x30-24bit.png -depth 8 -colors 256 +dither png8:$type-30x30-8bit.png + convert -verbose $type-30x30-24bit.png -define "png:compression-level=0" -depth 8 -colors 256 +dither png8:$type-30x30-8bit.png # 24x24 - convert $type-24x24-24bit.png -depth 8 -colors 256 +dither png8:$type-24x24-8bit.png + convert -verbose $type-24x24-24bit.png -define "png:compression-level=0" -depth 8 -colors 256 +dither png8:$type-24x24-8bit.png # 16x16 - convert $type-16x16-24bit.png -depth 8 -colors 256 +dither png8:$type-16x16-8bit.png + convert -verbose $type-16x16-24bit.png -define "png:compression-level=0" -depth 8 -colors 256 +dither png8:$type-16x16-8bit.png #### 4bit ############################################################################################################################################# # 256x256 - convert $type-256x256-8bit.png -colors 16 +dither $type-256x256-4bit.png + convert -verbose $type-256x256-8bit.png -define "png:compression-level=0" -colors 16 +dither $type-256x256-4bit.png # 180x180 - convert $type-180x180-8bit.png -colors 16 +dither $type-180x180-4bit.png + convert -verbose $type-180x180-8bit.png -define "png:compression-level=0" -colors 16 +dither $type-180x180-4bit.png # 150x150 - convert $type-150x150-8bit.png -colors 16 +dither $type-150x150-4bit.png + convert -verbose $type-150x150-8bit.png -define "png:compression-level=0" -colors 16 +dither $type-150x150-4bit.png # 128x128 - convert $type-128x128-8bit.png -colors 16 +dither $type-128x128-4bit.png + convert -verbose $type-128x128-8bit.png -define "png:compression-level=0" -colors 16 +dither $type-128x128-4bit.png # 96x96 - convert $type-96x96-8bit.png -colors 16 +dither $type-96x96-4bit.png + convert -verbose $type-96x96-8bit.png -define "png:compression-level=0" -colors 16 +dither $type-96x96-4bit.png # 72x72 - convert $type-72x72-8bit.png -colors 16 +dither $type-72x72-4bit.png + convert -verbose $type-72x72-8bit.png -define "png:compression-level=0" -colors 16 +dither $type-72x72-4bit.png # 64x64 - convert $type-64x64-8bit.png -colors 16 +dither $type-64x64-4bit.png + convert -verbose $type-64x64-8bit.png -define "png:compression-level=0" -colors 16 +dither $type-64x64-4bit.png + # 50x50 + convert -verbose $type-50x50-8bit.png -define "png:compression-level=0" -colors 16 +dither $type-50x50-4bit.png # 48x48 - convert $type-48x48-8bit.png -colors 16 +dither $type-48x48-4bit.png + convert -verbose $type-48x48-8bit.png -define "png:compression-level=0" -colors 16 +dither $type-48x48-4bit.png + # 40x40 + convert -verbose $type-40x40-8bit.png -define "png:compression-level=0" -colors 16 +dither $type-40x40-4bit.png # 32x32 - convert $type-32x32-8bit.png -colors 16 +dither $type-32x32-4bit.png + convert -verbose $type-32x32-8bit.png -define "png:compression-level=0" -colors 16 +dither $type-32x32-4bit.png # 30x30 - convert $type-30x30-8bit.png -colors 16 +dither $type-30x30-4bit.png + convert -verbose $type-30x30-8bit.png -define "png:compression-level=0" -colors 16 +dither $type-30x30-4bit.png # 24x24 - convert $type-24x24-8bit.png -colors 16 +dither $type-24x24-4bit.png + convert -verbose $type-24x24-8bit.png -define "png:compression-level=0" -colors 16 +dither $type-24x24-4bit.png # 16x16 - convert $type-16x16-8bit.png -colors 16 +dither $type-16x16-4bit.png + convert -verbose $type-16x16-8bit.png -define "png:compression-level=0" -colors 16 +dither $type-16x16-4bit.png # combine the images into a icon - icotool -c -o $INST_DIR/CLIENT_DATA/ALL/Icons/$type.ico $type-256x256-24bit.png $type-180x180-24bit.png $type-150x150-24bit.png $type-128x128-24bit.png $type-96x96-24bit.png $type-72x72-24bit.png $type-64x64-24bit.png $type-48x48-24bit.png $type-32x32-24bit.png $type-30x30-24bit.png $type-24x24-24bit.png $type-16x16-24bit.png \ - $type-256x256-8bit.png $type-180x180-8bit.png $type-150x150-8bit.png $type-128x128-8bit.png $type-96x96-8bit.png $type-72x72-8bit.png $type-64x64-8bit.png $type-48x48-8bit.png $type-32x32-8bit.png $type-30x30-8bit.png $type-24x24-8bit.png $type-16x16-8bit.png \ - $type-256x256-4bit.png $type-180x180-4bit.png $type-150x150-4bit.png $type-128x128-4bit.png $type-96x96-4bit.png $type-72x72-4bit.png $type-64x64-4bit.png $type-48x48-4bit.png $type-32x32-4bit.png $type-30x30-4bit.png $type-24x24-4bit.png $type-16x16-4bit.png + icotool -c -o $INST_DIR/CLIENT_DATA/ALL/Icons/$type.ico \ + $type-256x256-24bit.png $type-180x180-24bit.png $type-150x150-24bit.png $type-128x128-24bit.png $type-96x96-24bit.png $type-72x72-24bit.png $type-64x64-24bit.png \ + $type-50x50-24bit.png $type-48x48-24bit.png $type-40x40-24bit.png $type-32x32-24bit.png $type-30x30-24bit.png $type-24x24-24bit.png $type-16x16-24bit.png \ + $type-256x256-8bit.png $type-180x180-8bit.png $type-150x150-8bit.png $type-128x128-8bit.png $type-96x96-8bit.png $type-72x72-8bit.png $type-64x64-8bit.png \ + $type-50x50-8bit.png $type-48x48-8bit.png $type-40x40-8bit.png $type-32x32-8bit.png $type-30x30-8bit.png $type-24x24-8bit.png $type-16x16-8bit.png \ + $type-256x256-4bit.png $type-180x180-4bit.png $type-150x150-4bit.png $type-128x128-4bit.png $type-96x96-4bit.png $type-72x72-4bit.png $type-64x64-4bit.png \ + $type-50x50-4bit.png $type-48x48-4bit.png $type-40x40-4bit.png $type-32x32-4bit.png $type-30x30-4bit.png $type-24x24-4bit.png $type-16x16-4bit.png done popd cp $INST_DIR/CLIENT_DATA/ALL/Icons/*.ico $INST_DIR/CLIENT_DATA/X86/Icons cp $INST_DIR/CLIENT_DATA/ALL/Icons/*.ico $INST_DIR/CLIENT_DATA/X86_64/Icons -# rm -rf $INST_DIR/CLIENT_DATA/ALL/ + rm -rf $INST_DIR/CLIENT_DATA/ALL/ }