Changeset 37
- Timestamp:
- May 3, 2013, 8:16:28 PM (13 years ago)
- Author:
- Alex Taylor
- Message:
-
Various updates to printer manager.
- Location:
- trunk/gui/printer/manager
- Files:
-
- 2 edited
- PRINTOOL.VRX (modified) (10 diffs)
- printm_en.txt (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/gui/printer/manager/PRINTOOL.VRX
r33 r37 119 119 globals.!programs.!gzip = STREAM( globals.!mydir'\gzip.exe', 'C', 'QUERY EXISTS') 120 120 121 (追記) IF globals.!hascups THEN DO (追記ここまで) 122 (追記) globals.!programs.!lpadmin = STREAM( globals.!cupsdir'\sbin\lpadmin.exe', 'C', 'QUERY EXISTS') (追記ここまで) 123 (追記) globals.!programs.!lpinfo = STREAM( globals.!cupsdir'\sbin\lpinfo.exe', 'C', 'QUERY EXISTS') (追記ここまで) 124 (追記) globals.!programs.!lpoptions = STREAM( globals.!cupsdir'\bin\lpoptions.exe', 'C', 'QUERY EXISTS') (追記ここまで) 125 (追記) globals.!programs.!lpstat = STREAM( globals.!cupsdir'\bin\lpstat.exe', 'C', 'QUERY EXISTS') (追記ここまで) 126 (追記) END (追記ここまで) 127 (追記) (追記ここまで) 121 128 RETURN 122 129 … … 188 195 CALL PrinterOpen VRInfo("Record") 189 196 RETURN 197 (追記) (追記ここまで) 198 (追記) /*:VRX CupsDeletePrinter (追記ここまで) 199 (追記) */ (追記ここまで) 200 (追記) CupsDeletePrinter: PROCEDURE EXPOSE globals. (追記ここまで) 201 (追記) PARSE ARG _host, _dest (追記ここまで) 202 (追記) (追記ここまで) 203 (追記) IF TRANSLATE( _host ) <> 'LOCALHOST' THEN (追記ここまで) 204 (追記) del_cmd = globals.!programs.!lpadmin '-h' _host '-d' _dest (追記ここまで) 205 (追記) ELSE (追記ここまで) 206 (追記) del_cmd = globals.!programs.!lpadmin '-d' _dest (追記ここまで) 207 (追記) CALL LINEOUT globals.!log1, 'Delete CUPS destination' _dest' with:' del_cmd (追記ここまで) 208 (追記) (追記ここまで) 209 (追記) nq = RXQUEUE('CREATE') (追記ここまで) 210 (追記) oq = RXQUEUE('SET', nq ) (追記ここまで) 211 (追記) ADDRESS CMD '@' del_cmd '2>&1 | RXQUEUE' nq (追記ここまで) 212 (追記) DO QUEUED() (追記ここまで) 213 (追記) PARSE PULL _output (追記ここまで) 214 (追記) CALL LINEOUT globals.!log2, _output (追記ここまで) 215 (追記) IF LEFT( _output, 8 ) == 'Password' & RIGHT( STRIP( _output ), 1 ) == '?' THEN DO (追記ここまで) 216 (追記) CALL SysSleep 1 (追記ここまで) 217 (追記) CALL CHAROUT, '0d0a'x (追記ここまで) 218 (追記) END (追記ここまで) 219 (追記) END (追記ここまで) 220 (追記) CALL RXQUEUE 'SET', oq (追記ここまで) 221 (追記) CALL RXQUEUE 'DELETE', nq (追記ここまで) 222 (追記) /* (追記ここまで) 223 (追記) ADDRESS CMD '@' del_cmd '2>&1 >>' globals.!log2 (追記ここまで) 224 (追記) */ (追記ここまで) 225 (追記) (追記ここまで) 226 (追記) CALL LINEOUT globals.!log2, '' (追記ここまで) 227 (追記) CALL LINEOUT globals.!log2 (追記ここまで) 228 (追記) CALL LINEOUT globals.!log1, '' (追記ここまで) 229 (追記) (追記ここまで) 230 (追記) RETURN rc (追記ここまで) 190 231 191 232 /*:VRX DriverAdd … … 673 714 RETURN 674 715 716 (追記) /*:VRX InitMessageLog (追記ここまで) 717 (追記) */ (追記ここまで) 718 (追記) /* Initialize the message logfile. Unlike the error log, which is cleared and (追記ここまで) 719 (追記) * recreated every time the program starts, the message log is appended to (追記ここまで) 720 (追記) * until it reaches 100kB in size. If the message log is larger than 100kB when (追記ここまで) 721 (追記) * this function is called, it is renamed (with '~' appended to the name) and (追記ここまで) 722 (追記) * a new message log is started. (追記ここまで) 723 (追記) */ (追記ここまで) 724 (追記) InitMessageLog: PROCEDURE EXPOSE globals. (追記ここまで) 725 (追記) (追記ここまで) 726 (追記) logsize = STREAM( globals.!log1, 'C', 'QUERY SIZE') (追記ここまで) 727 (追記) IF ( logsize <> '') & ( logsize > 102400 ) THEN DO (追記ここまで) 728 (追記) CALL VRCopyFile globals.!log1, globals.!log1 || '~' (追記ここまで) 729 (追記) CALL VRDeleteFile globals.!log1 (追記ここまで) 730 (追記) END (追記ここまで) 731 (追記) (追記ここまで) 732 (追記) datestr = DATE('L') TIME('N') (追記ここまで) 733 (追記) CALL LINEOUT globals.!log1, '--[' datestr ']' ||, (追記ここまで) 734 (追記) COPIES('-', 73 - LENGTH( datestr )) (追記ここまで) 735 (追記) RETURN (追記ここまで) 736 (追記) (追記ここまで) 675 737 /*:VRX LoadSettings 676 738 */ 677 739 LoadSettings: PROCEDURE EXPOSE globals. 678 740 679 globals.!version = '0. (削除) 21 (削除ここまで)'741 globals.!version = '0.(追記) 3 (追記ここまで)' 680 742 globals.!copyright = '2013' 681 743 … … 692 754 cupsdrv = STRIP( cupsdrv, 'T', '\') 693 755 globals.!cupsdir = cupsdrv'\cups' 694 695 /** TODO Identify if CUPS and/or CUPS.PDR is installed */ 696 globals.!hascups = 1 756 globals.!hascups = VRIsDir( globals.!cupsdir ) 697 757 698 758 /* Get system paths. … … 711 771 globals.!logdir = globals.!mydir 712 772 713 globals.!log1 = globals.!logdir'\printmgr.l1' 714 globals.!log2 = globals.!logdir'\printmgr.l2' 773 globals.!log1 = globals.!logdir'\printman.l1' 774 globals.!log2 = globals.!logdir'\printman.l2' 775 CALL InitMessageLog 776 IF VRFileExists( globals.!log2 ) THEN 777 CALL VRDeleteFile globals.!log2 778 715 779 716 780 /* Get printer-related paths. … … 944 1008 od = DIRECTORY() 945 1009 CALL DIRECTORY _workdir 946 IF ppd_file <> '' & VRFileExists( ppd_file ) THEN (削除) (削除ここまで)1010 IF ppd_file <> '' & VRFileExists( ppd_file ) THEN(追記) (追記ここまで) 947 1011 _parms = _parms ppd_file 948 1012 ADDRESS CMD 'start' cupswiz _parms 949 1013 CALL DIRECTORY od 1014 (追記) CALL Quit (追記ここまで) 950 1015 END 951 1016 … … 957 1022 958 1023 ok = OpenPrinterTemplate('WPRPrinter') 1024 (追記) CALL Quit (追記ここまで) 959 1025 960 1026 RETURN ok … … 965 1031 966 1032 ok = OpenPrinterTemplate('WPPrinter') 1033 (追記) CALL Quit (追記ここまで) 967 1034 968 1035 RETURN ok … … 1404 1471 record = recs.1 1405 1472 END 1473 (追記) CALL VRMethod 'CN_PRINTERS', 'SetRecordAttr', record, 'Source', 0 (追記ここまで) 1406 1474 1407 1475 success = 0 1408 1476 _title = VRMethod('CN_PRINTERS', 'GetFieldData', record, globals.!hcfPrinters.!title ) 1409 1477 _queue = VRMethod('CN_PRINTERS', 'GetFieldData', record, globals.!hcfPrinters.!queue ) 1478 (追記) _port = VRMethod('CN_PRINTERS', 'GetFieldData', record, globals.!hcfPrinters.!port ) (追記ここまで) 1479 (追記) (追記ここまで) 1410 1480 _btns.0 = 2 1411 1481 _btns.1 = NLSGetMessage( 14 ) … … 1414 1484 IF _confirm == 1 THEN DO 1415 1485 success = RPUPrinterDelete( _queue ) 1416 END 1417 1418 CALL VRMethod 'CN_PRINTERS', 'SetRecordAttr', record, 'Source', 0 1486 CALL RPUPortInfo _port, 'port.' 1487 IF port.!driver == 'CUPS' THEN DO 1488 /* If this corresponds to a locally-defined CUPS queue, offer to 1489 * to delete that as well. 1490 */ 1491 cups_prnt = RPUPortQuery('CUPS', _port ) 1492 IF cups_prnt <> '' & ( LENGTH( cups_prnt ) == 130 ) THEN DO 1493 PARSE VAR cups_prnt 1 _cups_host 66 _cups_queue 1494 PARSE VAR _cups_host cups_host '00'x . 1495 PARSE VAR _cups_queue cups_queue '00'x . 1496 IF ( TRANSLATE( cups_host ) == 'LOCALHOST') | cups_host = '127.0.0.1' THEN DO 1497 _confirm = VRMessage('WN_MAIN', NLSGetMessage( 204, _title, cups_queue, _port ),, 1498 NLSGetMessage( 200 ), 'Q', '_btns.', 2, 2 ) 1499 IF _confirm == 1 THEN DO 1500 success = CupsDeletePrinter( cups_host, cups_queue ) 1501 IF success == 0 THEN 1502 CALL RPUPortDelete _port 1503 ELSE 1504 CALL VRMessage 'WN_MAIN', NLSGetMessage( 251, cups_queue, success ), NLSGetMessage( 18 ), 'E' 1505 END 1506 END 1507 END 1508 END 1509 END 1510 1511 CALL RefreshPrinters 1512 1419 1513 RETURN success 1420 1514 -
trunk/gui/printer/manager/printm_en.txt
r33 r37 20 20 PTM0016I: Operation Successful 21 21 PTM0017I: Continue 22 PTM0018 (削除) ?: (削除ここまで)22 PTM0018(追記) I: Operation Failed (追記ここまで) 23 23 PTM0019?: 24 24 ; ------- [20-99]: Menus … … 216 216 PTM0202I: Delete port %1? 217 217 PTM0203I: Delete driver "%1"? 218 PTM0204 (削除) ?: (削除ここまで)218 PTM0204(追記) I: Printer "%1" points to the local CUPS queue "%2" via port %3. Delete this CUPS queue and port as well? (追記ここまで) 219 219 PTM0205I: Add a new port of type %1? 220 220 PTM0206?: … … 252 252 PTM0238I: The PPD has been imported. 253 253 PTM0239?: 254 (追記) PTM0240?: (追記ここまで) 255 (追記) PTM0241?: (追記ここまで) 256 (追記) PTM0242?: (追記ここまで) 257 (追記) PTM0243?: (追記ここまで) 258 (追記) PTM0244?: (追記ここまで) 259 (追記) PTM0245?: (追記ここまで) 260 (追記) PTM0246?: (追記ここまで) 261 (追記) PTM0247?: (追記ここまで) 262 (追記) PTM0248?: (追記ここまで) 263 (追記) PTM0249?: (追記ここまで) 264 (追記) ; CUPS errors (追記ここまで) 265 (追記) PTM0250I: The CUPS printer %1 could not be created (CUPS return code %2). (追記ここまで) 266 (追記) PTM0251I: The CUPS printer %1 could not be deleted (CUPS return code %2). (追記ここまで) 267 (追記) PTM0252?: (追記ここまで) 268 (追記) PTM0253?: (追記ここまで) 269 (追記) PTM0254?: (追記ここまで) 270 (追記) PTM0255?: (追記ここまで) 271 (追記) PTM0256?: (追記ここまで) 272 (追記) PTM0257?: (追記ここまで) 273 (追記) PTM0258?: (追記ここまで) 274 (追記) PTM0259?: (追記ここまで) 254 275 276 (追記) (追記ここまで) 277 (追記) (追記ここまで)
Note:
See TracChangeset
for help on using the changeset viewer.