diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins index ce49b8d..1d3b6f8 100644 --- a/CLIENT_DATA/setup3264.ins +++ b/CLIENT_DATA/setup3264.ins @@ -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-targets-cb.sh b/builder-targets-cb.sh index ad74e57..1b826cc 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -47,7 +47,7 @@ function create() { 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 + 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 # 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 @@ -57,5 +57,5 @@ function create() { 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/ }