Changeset 45

Legend:

Unmodified

Added

Removed

• trunk/gui/printer/cupswiz/cupswiz.VRX

  r40	r45
  286	286	*/
  287	287	/* Creates an OS/2 printer port, queue, and desktop object which point to
  288	* the just-created CUPS printer.(削除) Uses the RINSTPRN utility from IBM. (削除ここまで)
  288	* the just-created CUPS printer.(追記) (追記ここまで)
  289	289	*/
  290	290	CreateOS2Printer: PROCEDURE EXPOSE globals.
  …	…
  341	341	ok = CreatePrinterObject( prnt_drv, printer_model,,
  342	342	port_name, queue_name, printer_title )
  343	CALL LINEOUT globals.!log1, 'CreatePrinterObject(' prnt_drv',' printer_model(削除) (削除ここまで),
  343	CALL LINEOUT globals.!log1, 'CreatePrinterObject(' prnt_drv',' printer_model(追記) || (追記ここまで),
  344	344	',' port_name',' queue_name',' printer_title ') RC =' ok
  345	IF (削除) ok <> 0 (削除ここまで) THEN DO
  345	IF (追記) ( ok <> 0 ) & ( printer_model <> 'Generic Postscript Printer') (追記ここまで) THEN DO
  346	346	CALL LINEOUT globals.!log1, 'Failed to create printer object; trying again with generic driver.'
  347	347	ok = CreatePrinterObject( prnt_drv, 'Generic Postscript Printer',,
  348	348	port_name, queue_name, printer_title )
  349	CALL LINEOUT globals.!log1, 'CreatePrinterObject(' prnt_drv', Generic Postscript Printer'(削除) (削除ここまで),
  349	CALL LINEOUT globals.!log1, 'CreatePrinterObject(' prnt_drv', Generic Postscript Printer'(追記) || (追記ここまで),
  350	350	',' port_name',' queue_name',' printer_title ') RC =' ok
  351	351	END
  …	…
  412	412	END
  413	413	END
  414	ELSE IF PrinterExistsInDRV( globals.!os2driver, globals.!prt_nick ) == 0 THEN DO
  415	cups_ppd = globals.!prt_ppd
  416	IF cups_ppd == '' THEN
  417	cups_ppd = STREAM( globals.!cupsdir'\etc\cups\ppd\'globals.!prt_name'.ppd', 'C', 'QUERY EXISTS')
  418	IF cups_ppd == '' THEN
  419	CALL PromptForPMName
  420	ELSE DO
  421	ok = ImportPPD(globals.!os2driver, cups_ppd )
  422	IF ok <> 0 THEN DO
  423	CALL LINEOUT globals.!log1, 'PPD import failed:' ok
  424	CALL VRMessage VRWindow(), NLSGetMessage( 69 ), NLSGetMessage( 70 ), 'W'
  414	ELSE DO
  415	drv_model = PrinterExistsInDRV( globals.!os2driver, globals.!prt_nick )
  416	IF drv_model == '' THEN DO
  417	cups_ppd = globals.!prt_ppd
  418	IF cups_ppd == '' THEN
  419	cups_ppd = STREAM( globals.!cupsdir'\etc\cups\ppd\'globals.!prt_name'.ppd', 'C', 'QUERY EXISTS')
  420	IF cups_ppd == '' THEN DO
  421	CALL LINEOUT globals.!log1, 'CUPS PPD for this printer ('globals.!cupsdir'\etc\cups\ppd\'globals.!prt_name'.ppd) does not exist.'
  422	CALL LINEOUT globals.!log1, 'Cannot import PPD. Prompting user for preferred printer model.'
  425	423	CALL PromptForPMName
  426	/* RETURN 1 RC=1 PPD import failed **/
  424	END
  425	ELSE DO
  426	ok = ImportPPD(globals.!os2driver, cups_ppd )
  427	IF ok <> 0 THEN DO
  428	CALL LINEOUT globals.!log1, 'PPD import failed:' ok
  429	CALL VRMessage VRWindow(), NLSGetMessage( 69 ), NLSGetMessage( 70 ), 'W'
  430	CALL PromptForPMName
  431	/* RETURN 1 RC=1 PPD import failed **/
  432	END
  427	433	END
  428	434	END
  435	(追記) ELSE (追記ここまで)
  436	(追記) /* Make sure the name matches, including case */ (追記ここまで)
  437	(追記) globals.!prt_nick = drv_model (追記ここまで)
  429	438	END
  430	439
  …	…
  1121	1130	_force_remote = 0
  1122	1131	globals.!prt_ppd = ''
  1123	IF InitArgs.0 > 0 THEN(削除) (削除ここまで)
  1132	IF InitArgs.0 > 0 THEN(追記) (追記ここまで)
  1124	1133	DO i = 1 TO InitArgs.0
  1125	1134	InitArgs.i = TRANSLATE( InitArgs.i )
  …	…
  1357	1366	/*:VRX PB_CREATEHELP_Click
  1358	1367	*/
  1359	PB_CREATEHELP_Click:(削除) (削除ここまで)
  1368	PB_CREATEHELP_Click:(追記) (追記ここまで)
  1360	1369	CALL VRMethod 'SW_CREATE', 'InvokeHelp'
  1361	1370	return
  …	…
  1376	1385	/*:VRX PB_HELP_Click
  1377	1386	*/
  1378	PB_HELP_Click:(削除) (削除ここまで)
  1387	PB_HELP_Click:(追記) (追記ここまで)
  1379	1388	CALL VRMethod 'WN_MAIN', 'InvokeHelp'
  1380	1389	return
  …	…
  1402	1411	/*:VRX PB_NETHELP_Click
  1403	1412	*/
  1404	PB_NETHELP_Click:(削除) (削除ここまで)
  1413	PB_NETHELP_Click:(追記) (追記ここまで)
  1405	1414	CALL VRMethod 'SW_NETWORK', 'InvokeHelp'
  1406	1415	return
  …	…
  1891	1900	CALL NLSSetText 'SW_ABOUT', 'Caption', 10 /* 10: Product Information */
  1892	1901	CALL NLSSetText 'DT_ABOUT1', 'Caption', 11 /* 11: eCups Printer Install Utility */
  1893	CALL NLSSetText 'DT_ABOUT2', 'Caption', 12, '1.0(削除) 4 (削除ここまで)' /* 12: Version %1 */
  1902	CALL NLSSetText 'DT_ABOUT2', 'Caption', 12, '1.0(追記) 5 (追記ここまで)' /* 12: Version %1 */
  1894	1903	CALL NLSSetText 'DT_ABOUT3', 'Caption', 13, '2010, 2013' /* 13: (C) %1 Alex Taylor */
  1895	1904	CALL NLSSetText 'PB_ABOUT', 'Caption', 2 /* 10: Product Information */

• trunk/gui/printer/cupswiz/readme.1st

  r40	r45
  1	1	CUPSWIZ - CUPS printer-creation wizard
  2	Version 1.0(削除) 4 (削除ここまで)
  2	Version 1.0(追記) 5 (追記ここまで)
  3	3
  4	4	This program is simple graphical front-end for creating CUPS-based printers

• trunk/gui/printer/manager/readme.txt

  r42	r45
  1	1	PM Printer Manager
  2	Version 0.4(削除) 4 (削除ここまで)
  2	Version 0.4(追記) 5 (追記ここまで)
  3	3
  4	4	Printer Manager is a new graphical printer management tool designed to

• trunk/gui/shared/PrManUtl.VRS

  r44	r45
  292	292	/* Determine if the specified PrinterPak driver already contains support
  293	293	* for the specified printer model.
  294	(追記) * (追記ここまで)
  295	(追記) * If so, return the name of the model as found in the driver (necessary in (追記ここまで)
  296	(追記) * order to make sure the correct case is retained, which may be different (追記ここまで)
  297	(追記) * from what was requested). Otherwise return ''. (追記ここまで)
  294	298	*/
  295	299	PrinterExistsInDRV: PROCEDURE EXPOSE globals.
  …	…
  312	316	*/
  313	317	start = 1
  314	found = (削除) 0 (削除ここまで)
  318	found = (追記) '' (追記ここまで)
  315	319	DO WHILE ( found == 0 ) & ( start < total_len )
  316	320	_strend = POS('0'x, exist_models, start )
  317	321	IF _strend == 0 THEN LEAVE
  318	_model = (削除) TRANSLATE( SUBSTR( exist_models, start, _strend - start ) (削除ここまで))
  319	IF (削除) _model (削除ここまで) == printer_name THEN
  320	found = (削除) 1 (削除ここまで)
  322	_model = (追記) SUBSTR( exist_models, start, _strend - start (追記ここまで))
  323	IF (追記) TRANSLATE( _model ) (追記ここまで) == printer_name THEN
  324	found = (追記) _model (追記ここまで)
  321	325	ELSE
  322	326	start = _strend + 1

• trunk/gui/shared/PrintUtl.VRS

  r38	r45
  177	177	/* Determine if the specified PrinterPak driver already contains support
  178	178	* for the specified printer model.
  179	(追記) * (追記ここまで)
  180	(追記) * If so, return the name of the model as found in the driver (necessary in (追記ここまで)
  181	(追記) * order to make sure the correct case is retained, which may be different (追記ここまで)
  182	(追記) * from what was requested). Otherwise return ''. (追記ここまで)
  179	183	*/
  180	184	PrinterExistsInDRV: PROCEDURE EXPOSE globals.
  …	…
  197	201	*/
  198	202	start = 1
  199	found = (削除) 0 (削除ここまで)
  203	found = (追記) '' (追記ここまで)
  200	204	DO WHILE ( found == 0 ) & ( start < total_len )
  201	205	_strend = POS('0'x, exist_models, start )
  202	206	IF _strend == 0 THEN LEAVE
  203	_model = (削除) TRANSLATE( SUBSTR( exist_models, start, _strend - start ) (削除ここまで))
  204	IF (削除) _model (削除ここまで) == printer_name THEN
  205	found = (削除) 1 (削除ここまで)
  207	_model = (追記) SUBSTR( exist_models, start, _strend - start (追記ここまで))
  208	IF (追記) TRANSLATE( _model ) (追記ここまで) == printer_name THEN
  209	found = (追記) _model (追記ここまで)
  206	210	ELSE
  207	211	start = _strend + 1

Note: See TracChangeset for help on using the changeset viewer.