f.batch.cc (fotoxx-22.30) | : | f.batch.cc (fotoxx-22.35) | ||
---|---|---|---|---|
skipping to change at line 1764 | skipping to change at line 1764 | |||
zdialog_stuff(zd,"Fvers",Fvers); | zdialog_stuff(zd,"Fvers",Fvers); | |||
if (ovfile && ! ovfilepxb) | if (ovfile && ! ovfilepxb) | |||
ovfilepxb = PXB_load(ovfile,1); | ovfilepxb = PXB_load(ovfile,1); | |||
zdialog_run(zd,batch_overlay_dialog_event,"parent"); // run dialog | zdialog_run(zd,batch_overlay_dialog_event,"parent"); // run dialog | |||
zstat = zdialog_wait(zd); // wait for completion | zstat = zdialog_wait(zd); // wait for completion | |||
zdialog_free(zd); | zdialog_free(zd); | |||
if (zstat != 1) { // canceled | if (zstat != 1) { // canceled | |||
Plog(1,"cancelled \n"); | Plog(0,"cancelled \n"); | |||
Fblock("batch_overlay",0); | Fblock("batch_overlay",0); | |||
return; | return; | |||
} | } | |||
zd2 = popup_report_open("Processing files",Mwin,600,300,0,0,"OK",0); // log report | zd2 = popup_report_open("Processing files",Mwin,600,300,0,0,"OK",0); // log report | |||
for (ii = 0; ii < GScount; ii++) // loop selected files | for (ii = 0; ii < GScount; ii++) // loop selected files | |||
{ | { | |||
zmainloop(); // keep GTK alive | zmainloop(); // keep GTK alive | |||
skipping to change at line 2519 | skipping to change at line 2519 | |||
if (Fblock(0,"blocked edits")) return; // check nothing pending | if (Fblock(0,"blocked edits")) return; // check nothing pending | |||
err = zshell(0,"which gs >/dev/null 2>&1"); // check ghostscript installed | err = zshell(0,"which gs >/dev/null 2>&1"); // check ghostscript installed | |||
if (err) { | if (err) { | |||
zmessageACK(Mwin,"ghostscript must be installed"); | zmessageACK(Mwin,"ghostscript must be installed"); | |||
goto returnx; | goto returnx; | |||
} | } | |||
pp = 0; | pp = 0; | |||
if (navi::gallerytype == GDIR) pp = navi::galleryname; | if (navi::gallerytype == FOLDER) pp = navi::galleryname; | |||
infile = zgetfile("Open Adobe File",MWIN,"file",pp); | infile = zgetfile("Open Adobe File",MWIN,"file",pp); | |||
if (! infile) goto returnx; | if (! infile) goto returnx; | |||
pp = strrchr(infile,'.'); | pp = strrchr(infile,'.'); | |||
if (! strcasestr(".pdf .ps .eps",pp)) { | if (! strcasestr(".pdf .ps .eps",pp)) { | |||
zmessageACK(Mwin,"not an Adobe file (.pdf .ps .eps)"); | zmessageACK(Mwin,"not an Adobe file (.pdf .ps .eps)"); | |||
goto returnx; | goto returnx; | |||
} | } | |||
/*** | /*** | |||
skipping to change at line 2571 | skipping to change at line 2571 | |||
zdialog_fetch(zd,"ww",ww); | zdialog_fetch(zd,"ww",ww); | |||
outfile = zstrdup(infile,"convert adobe",12); // file.pdf >> file-%d.jpg | outfile = zstrdup(infile,"convert adobe",12); // file.pdf >> file-%d.jpg | |||
pp = strrchr(outfile,'.'); | pp = strrchr(outfile,'.'); | |||
if (! pp) goto returnx; | if (! pp) goto returnx; | |||
strcpy(pp,"-%d.jpg"); | strcpy(pp,"-%d.jpg"); | |||
dpi = ww / 8.5 + 0.5; // convert width to dots per inch | dpi = ww / 8.5 + 0.5; // convert width to dots per inch | |||
err = zshell("log ack","gs -q -sDEVICE=jpeg -r%d -o \"%s\" \"%s\" ", | err = zshell("ack","gs -q -sDEVICE=jpeg -r%d -o \"%s\" \"%s\" ", | |||
dpi, outfile, infile); | dpi, outfile, infile); | |||
if (err) goto returnx; | if (err) goto returnx; | |||
strcpy(pp,"-1.jpg"); // open 1st output file | strcpy(pp,"-1.jpg"); // open 1st output file | |||
f_open(outfile,0,0,1,0); | f_open(outfile,0,0,1,0); | |||
m_viewmode(0,"G"); // show gallery at file position | m_viewmode(0,"G"); // show gallery at file position | |||
returnx: | returnx: | |||
if (zd) zdialog_free(zd); | if (zd) zdialog_free(zd); | |||
skipping to change at line 2807 | skipping to change at line 2807 | |||
// execute a script file using the current image file | // execute a script file using the current image file | |||
void run_script(GtkWidget *, cchar *scriptname) | void run_script(GtkWidget *, cchar *scriptname) | |||
{ | { | |||
char buff[200]; | char buff[200]; | |||
char *pp, menuname[40]; | char *pp, menuname[40]; | |||
int ii, err; | int ii, err; | |||
if (! curr_file) return; | if (! curr_file) return; | |||
if (script_fid) Plog(1,"*** run_script(): script_fid not 0 \n"); | if (script_fid) Plog(0,"*** run_script(): script_fid not 0 \n"); | |||
if (Fblock(0,"blocked edits")) return; // check nothing pending | if (Fblock(0,"blocked edits")) return; // check nothing pending | |||
snprintf(scriptfile,200,"%s/%s",scripts_folder,scriptname); // script file from script name | snprintf(scriptfile,200,"%s/%s",scripts_folder,scriptname); // script file from script name | |||
Plog(1,"start script: %s \n",scriptfile); | Plog(1,"start script: %s \n",scriptfile); | |||
script_fid = fopen(scriptfile,"r"); // open script file | script_fid = fopen(scriptfile,"r"); // open script file | |||
if (! script_fid) { | if (! script_fid) { | |||
zmessageACK(Mwin,"script error: %s \n %s",scriptfile,strerror(errno)); | zmessageACK(Mwin,"script error: %s \n %s",scriptfile,strerror(errno)); | |||
goto badfile; | goto badfile; | |||
End of changes. 4 change blocks. | ||||
4 lines changed or deleted | 4 lines changed or added |