diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins index 5b7e180..ce49b8d 100644 --- a/CLIENT_DATA/setup3264.ins +++ b/CLIENT_DATA/setup3264.ins @@ -120,8 +120,8 @@ 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$ SET Extn=bmp-55 dds-60 gif-65 jpg-70 jpeg-70 pcx-75 png-80 psd-85 tga-90 tif-95 tiff-95 -rem SET Extn=3fr-11 arw-11 cr2-11 crw-11 dcr-11 dng-11 erf-11 kdc-11 mos-11 mrw-11 nef-11 orf-11 pef-11 raf-11 raw-11 srw-11 sr-11 ani-11 anm-11 dib-11 rle-11 cdr-11 cdt-11 pat-11 ccx-11 cmx-11 clp-11 cur-11 dcm-11 dicom-11 dcx-11 dds-11 emf-11 exr-11 sxr-11 mxr-11 flc-11 fli-11 hdp-11 jxr-11 wdp-11 hdr-11 icl-11 ico-11 ics-11 jbg-11 jbig-11 jp2-11 jpc-11 j2k-11 jpg-11 jpe-11 jpeg-11 lbm-11 lbmp-11 iff-11 mac-11 macp-11 mbm-11 mng-11 bpm-11 pcd-11 pcx-11 pdn-11 pgm-11 pic-11 cel-11 png-11 ppm-11 psd-11 8psd-11 psp-11 ras-11 rla-11 rle-11 sgi-11 rgb-11 bw-11 spr-11 wbmp-11 wap-11 wbm-11 webp-11 wmf-11 wpg-11 xbm-11 xcf-11 xpm-11 zip-11 cbz-11 7z-11 cb7-11 arj-11 lzh-11 rar-11 cbr-11 alz-11 egg-11 tar-11 gz-11 bz2-11 iso-11 cab-11 FOR %%j IN (%Extn%) DO ( FOR /F "tokens=1,2 delims=-" %%A IN ("%%j") DO ( @@ -132,7 +132,7 @@ FOR %%j IN (%Extn%) DO ( copy "$LogDir$\defaultassociations.xml" "$LogDir$\defaultassociations.xml.old" xml ed -d /DefaultAssociations/Association[@Identifier='.%%A'] "$LogDir$\defaultassociations.xml.old"> "$LogDir$\defaultassociations.xml" copy "$LogDir$\defaultassociations.xml" "$LogDir$\defaultassociations.xml.old" - xml ed -s /DefaultAssociations -t elem -n Association_new -v "" -i /DefaultAssociations/Association_new -t attr -n Identifier -v .%%A -i /DefaultAssociations/Association_new -t attr -n ProgId -v Imagine.%%A -i /DefaultAssociations/Association_new -t attr -n ApplicationName -v "Image & Animation Viewer" -r "/DefaultAssociations/Association_new" -v Association "$LogDir$\defaultassociations.xml.old"> "$LogDir$\defaultassociations.xml" + xml ed -s /DefaultAssociations -t elem -n Association_new -v "" -i /DefaultAssociations/Association_new -t attr -n Identifier -v .%%A -i /DefaultAssociations/Association_new -t attr -n ProgId -v Imagine.%%A -i /DefaultAssociations/Association_new -t attr -n ApplicationName -v "Image & Animation Viewer" -r "/DefaultAssociations/Association_new" -v Association "$LogDir$\defaultassociations.xml.old"> "$LogDir$\defaultassociations.xml" ) ) diff --git a/builder-product.cfg b/builder-product.cfg index 250974f..3c78854 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -142,10 +142,11 @@ DL_ARCH[20]="X86_64" DL_EXTRACT_FORMAT[20]="unzip" DL_EXTRACT_TO[20]="Plugin" -DL_FILE[21]="simplexity_file_icons_by_jrdn88-d1b3b04.zip" -DL_SOURCE[21]="http://www.deviantart.com/download/79096180/simplexity_file_icons_by_jrdn88-d1b3b04.zip" +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_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" @@ -186,6 +187,15 @@ DL_EXTRACT_FORMAT[21]="unzip" # 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 +# 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" + OPSI_INI_SECTION[0]="X86" OPSI_INI_OPTION[0]="UninstallProg32" diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index 9c48ccd..ad74e57 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -29,8 +29,33 @@ function create() { cp $INST_DIR/CLIENT_DATA/opsi-${PN}.ini $INST_DIR/CLIENT_DATA/Imagine.ini mkdir $INST_DIR/CLIENT_DATA/X86/Icons mkdir $INST_DIR/CLIENT_DATA/X86_64/Icons - find $INST_DIR/CLIENT_DATA/ALL/ -type f -iname '*.ico' -exec cp -v {} $INST_DIR/CLIENT_DATA/X86/Icons \; - find $INST_DIR/CLIENT_DATA/ALL/ -type f -iname '*.ico' -exec cp -v {} $INST_DIR/CLIENT_DATA/X86_64/Icons \; + mkdir $INST_DIR/CLIENT_DATA/ALL/Icons + + pushd $INST_DIR/CLIENT_DATA/ALL/ + for type in ${WINST_VALUE[0]} + do + # 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.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.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.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.png + # 16x16 + convert -size 16x16 xc:transparent -font DejaVu-Sans-Condensed-Bold -pointsize 8 -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 + # combine the images into a icon + icotool -c -o $INST_DIR/CLIENT_DATA/ALL/Icons/$type.ico $type-256x256.png $type-128x128.png $type-64x64.png $type-48x48.png $type-16x16.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/ } diff --git a/imagineicons.zip.sha1sum b/imagineicons.zip.sha1sum new file mode 100644 index 0000000..2998718 --- /dev/null +++ b/imagineicons.zip.sha1sum @@ -0,0 +1 @@ +07fd539fc81b08447374e4b88c5a0c21f06c3b74 /home/mario/.opsi-dist-cache/nyam.imagine-1.0.9/ALL/imagineicons.zip diff --git a/simplexity_file_icons_by_jrdn88-d1b3b04.zip.sha1sum b/simplexity_file_icons_by_jrdn88-d1b3b04.zip.sha1sum deleted file mode 100644 index 0b064e0..0000000 --- a/simplexity_file_icons_by_jrdn88-d1b3b04.zip.sha1sum +++ /dev/null @@ -1 +0,0 @@ -19ecb696445e78cb0e8bc7bbd27ad4d488a029a6 /home/mario/.opsi-dist-cache/nyam.imagine-1.0.9/ALL/simplexity_file_icons_by_jrdn88-d1b3b04.zip