From: <ro...@us...> - 2003-04-02 18:36:16
|
Update of /cvsroot/nsclspectcl/SpecTcl/Display In directory sc8-pr-cvs1:/tmp/cvs-serv21953 Modified Files: printer.cc Log Message: Connect the options->Setup Printer... dialog appropriately with the defaults file and the default information used by Jason's printer dialogs. Index: printer.cc =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/Display/printer.cc,v retrieving revision 4.11 retrieving revision 4.12 diff -C2 -d -r4.11 -r4.12 *** printer.cc 2 Jan 2003 16:13:00 -0000 4.11 --- printer.cc 2 Apr 2003 18:36:12 -0000 4.12 *************** *** 176,183 **** void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under ! this License will not have their licenses terminated so long as such ! parties remain in full compliance. ! ! 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are --- 176,180 ---- void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under ! this License will not have their licenses terminat this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are *************** *** 294,297 **** --- 291,297 ---- /* $Log$ + Revision 4.12 2003/04/02 18:36:12 ron-fox + Connect the options->Setup Printer... dialog appropriately with the defaults file and the default information used by Jason's printer dialogs. + Revision 4.11 2003/01/02 16:13:00 venema Major version upgrade to SpecTcl 2.0. This version adds arbitrary user-coordinate mapping to Xamine using, and a special mapping button on the Xamine GUI. Also, print options are now sticky and are maintained in the Xamine.Defaults file. *************** *** 548,552 **** char *Xamine_GetPrintCommand() { ! return printcmd; } --- 548,556 ---- char *Xamine_GetPrintCommand() { ! if(!dflt_print_opts) { ! dflt_print_opts = new struct DefaultPrintOptions; ! strcpy(dflt_print_opts->print_cmd,printcmd); ! } ! return dflt_print_opts->print_cmd; } *************** *** 1580,1586 **** --- 1584,1595 ---- newcmd = dlg->printcmd(); strcpy(printcmd, newcmd); + strcpy(dflt_print_opts->print_cmd, printcmd); XtFree(newcmd); ptype = dlg->printertype(); + + // Save the defaults file: + + Xamine_SaveDefaultProperties(); } *************** *** 1846,1851 **** /* Make the dialog contents match the current defaults. */ ! dialog->printcmd(printcmd); ! dialog->printertype(ptype); /* Manage the dialog to pop it up */ --- 1855,1861 ---- /* Make the dialog contents match the current defaults. */ ! ! dialog->printcmd(Xamine_GetPrintCommand()); ! dialog->printertype(Xamine_GetPrinterType()); /* Manage the dialog to pop it up */ |