Changeset 24

Legend:

Unmodified

Added

Removed

• trunk/gui/printer/cupswiz/cupswiz.VRP

  r21	r24
  1	1	VX-REXX OS/2 V2.14 Build B3
  2	2	VRX: cupswiz.VRX
  3	MacroPath: VRM:(削除) E:\DEVELOPMENT\VXREXX\Projects (削除ここまで)\cupswiz
  3	MacroPath: VRM:(追記) G:\netlabs\svn\ecups\trunk\gui\printer (追記ここまで)\cupswiz
  4	4	EXEPath:
  5	5	RunParameters:
  …	…
  7	7	VRXWindow: __VREMainWindow,1,614,2554,5770,9106
  8	8	VRXWindow: __VRESectionListWindow,1,675,11804,4529,3891
  9	VRXWindow: __VREToolsWindow,1,1686,9877,49(削除) 71,1667 (削除ここまで)
  9	VRXWindow: __VREToolsWindow,1,1686,9877,49(追記) 68,1669 (追記ここまで)
  10	10	VRXWindow: __VREWindListWindow,1,5228,11804,2650,3891
  11	11	UserFile: 1

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

  r23	r24
  101	101	*/
  102	102	return
  103	(追記) /*:VRX CheckPrograms (追記ここまで)
  104	(追記) */ (追記ここまで)
  105	(追記) CheckPrograms: PROCEDURE EXPOSE globals. (追記ここまで)
  106	(追記) (追記ここまで)
  107	(追記) /* Make sure CUPS.PDR is installed. (追記ここまで)
  108	(追記) */ (追記ここまで)
  109	(追記) cups_pdr = VRGetIni('PM_PORT_DRIVER', 'CUPS', 'System') (追記ここまで)
  110	(追記) IF cups_pdr == '' THEN DO (追記ここまで)
  111	(追記) cups_pdr = STREAM( globals.!bootdrv'\OS2\DLL\CUPS.PDR', 'C', 'QUERY EXISTS') (追記ここまで)
  112	(追記) IF cups_pdr == '' THEN DO (追記ここまで)
  113	(追記) CALL VRMessage VRWindow(),, (追記ここまで)
  114	(追記) NLSGetMessage( 78, globals.!bootdrv'\OS2\DLL\CUPS.PDR'),, /* 78: The required program %1 is not installed... */ (追記ここまで)
  115	(追記) NLSGetMessage( 79 ), 'E' /* 79: Missing File */ (追記ここまで)
  116	(追記) CALL Quit (追記ここまで)
  117	(追記) END (追記ここまで)
  118	(追記) ELSE CALL VRSetIni('PM_PORT_DRIVER', 'CUPS', cups_pdr, 'System') (追記ここまで)
  119	(追記) END (追記ここまで)
  120	(追記) (追記ここまで)
  121	(追記) /* Make sure \TCPIP\BIN\CUPSLPR.EXE (required by CUPS.PDR) is installed. (追記ここまで)
  122	(追記) */ (追記ここまで)
  123	(追記) tcpipbin = SysSearchPath('PATH', 'inetd.exe') (追記ここまで)
  124	(追記) IF tcpipbin <> '' THEN (追記ここまで)
  125	(追記) tcpipbin = VRParseFileName( tcpipbin, 'DP') (追記ここまで)
  126	(追記) ELSE (追記ここまで)
  127	(追記) tcpipbin = globals.!bootdrv'\TCPIP\BIN' (追記ここまで)
  128	(追記) IF \VRFileExists( tcpipbin'\cupslpr.exe') & (SysSearchPath('PATH', 'cupslpr.exe') == '') THEN DO (追記ここまで)
  129	(追記) CALL VRMessage VRWindow(),, (追記ここまで)
  130	(追記) NLSGetMessage( 78, 'CUPSLPR.EXE'),, (追記ここまで)
  131	(追記) NLSGetMessage( 79 ), 'E' (追記ここまで)
  132	(追記) CALL Quit (追記ここまで)
  133	(追記) END (追記ここまで)
  134	(追記) (追記ここまで)
  135	(追記) /* Make sure GZIP.EXE is installed (required for unpacking PPDs). (追記ここまで)
  136	(追記) */ (追記ここまで)
  137	(追記) gzip_exe = SysSearchPath('PATH', 'gzip.exe') (追記ここまで)
  138	(追記) IF gzip_exe == '' THEN gzip_exe = STREAM( DIRECTORY() || '\gzip.exe', 'C', 'QUERY EXISTS') (追記ここまで)
  139	(追記) IF gzip_exe == '' THEN DO (追記ここまで)
  140	(追記) CALL VRMessage VRWindow(), NLSGetMessage( 78, 'GZIP.EXE'), NLSGetMessage( 79 ), 'E' (追記ここまで)
  141	(追記) CALL Quit (追記ここまで)
  142	(追記) END (追記ここまで)
  143	(追記) (追記ここまで)
  144	(追記) RETURN (追記ここまで)
  145	(追記) (追記ここまで)
  103	146	/*:VRX CHK_CREATEPM_Click
  104	147	*/
  …	…
  169	212	END
  170	213
  214	(追記) /* Temporary until we can offer user configuration: (追記ここまで)
  215	(追記) */ (追記ここまで)
  216	(追記) PARSE UPPER VALUE VALUE('LANG',,'OS2ENVIRONMENT') WITH 1 . 4 _ctry 6 . (追記ここまで)
  217	(追記) IF ( WORDPOS( _ctry, 'US CA MX BO CO VE PH CL') > 0 ) THEN (追記ここまで)
  218	(追記) page = 'Letter' (追記ここまで)
  219	(追記) ELSE (追記ここまで)
  220	(追記) page = 'A4' (追記ここまで)
  221	(追記) cups_cmd = cups_cmd '-o media='page (追記ここまで)
  222	(追記) (追記ここまで)
  171	223	CALL LINEOUT globals.!log1, 'Creating CUPS printer using:'
  172	224	CALL LINEOUT globals.!log1, ' ' cups_cmd
  …	…
  244	296	CALL LINEOUT globals.!log1, 'CreatePrinterObject(' prnt_drv',' printer_model,
  245	297	',' port_name',' queue_name',' printer_title ') RC =' ok
  246	END
  247
  248	IF ok <> 0 THEN
  298	IF ok <> 0 THEN DO
  299	CALL LINEOUT globals.!log1, 'Failed to create printer object; trying again with generic driver.'
  300	ok = CreatePrinterObject( prnt_drv, 'Generic Postscript Printer',,
  301	port_name, queue_name, printer_title )
  302	CALL LINEOUT globals.!log1, 'CreatePrinterObject(' prnt_drv', Generic Postscript Printer',
  303	',' port_name',' queue_name',' printer_title ') RC =' ok
  304	END
  305	END
  306
  307	IF ok <> 0 THEN DO
  308	CALL LINEOUT globals.!log1, 'Printer object creation failed.'
  309	IF SysIni('SYSTEM', 'PM_SPOOLER_PRINTER', 'ALL:', 'prt_keys.') == '' THEN DO
  310	DO i = 1 TO prt_keys.0
  311	key_val = SysIni('SYSTEM', 'PM_SPOOLER_PRINTER', prt_keys.0 )
  312	PARSE VAR key_val _kport ';' _ktitle ';' .
  313	IF ( _kport == port_name ) & ( _ktitle == printer_title ) THEN DO
  314	CALL LINEOUT globals.!log1, 'Cleaning INI entry:' prt_keys.0 '=' key_val
  315	CALL SysIni 'SYSTEM', 'PM_SPOOLER_PRINTER_DESCR', prt_keys.0, 'DELETE:'
  316	CALL LINEOUT globals.!log1, 'Cleaning INI entry:' prt_keys.0 '=' key_val
  317	CALL SysIni 'SYSTEM', 'PM_SPOOLER_PRINTER', prt_keys.0, 'DELETE:'
  318	LEAVE
  319	END
  320	END
  321	END
  322	CALL LINEOUT globals.!log1, 'Deleting port' port_name
  249	323	CALL DeletePort port_name
  324	(追記) END (追記ここまで)
  250	325	ELSE IF port_ok == 1 THEN DO
  251	326	CALL VRMessage VRWindow(),,
  …	…
  293	368	cups_ppd = globals.!prt_ppd
  294	369	IF cups_ppd == '' THEN
  295	cups_ppd = STREAM( globals.!cupsdir'\etc\cups\ppd(削除) (削除ここまで)'globals.!prt_name'.ppd', 'C', 'QUERY EXISTS')
  370	cups_ppd = STREAM( globals.!cupsdir'\etc\cups\ppd(追記) \ (追記ここまで)'globals.!prt_name'.ppd', 'C', 'QUERY EXISTS')
  296	371	IF cups_ppd == '' THEN
  297	372	CALL PromptForPMName
  …	…
  929	1004	CALL LoadSettings
  930	1005	CALL SetLanguage
  1006	(追記) CALL CheckPrograms (追記ここまで)
  931	1007
  932	1008	IF InitArgs.0 > 0 THEN globals.!cupsdir = InitArgs.1
  …	…
  1638	1714	CALL NLSSetText 'SW_ABOUT', 'Caption', 10 /* 10: Product Information */
  1639	1715	CALL NLSSetText 'DT_ABOUT1', 'Caption', 11 /* 11: eCups Printer Install Utility */
  1640	CALL NLSSetText 'DT_ABOUT2', 'Caption', 12, '(削除) 0.99 (削除ここまで)' /* 12: Version %1 */
  1716	CALL NLSSetText 'DT_ABOUT2', 'Caption', 12, '(追記) 1.00 (追記ここまで)' /* 12: Version %1 */
  1641	1717	CALL NLSSetText 'DT_ABOUT3', 'Caption', 13, '2010, 2013' /* 13: (C) %1 Alex Taylor */
  1642	1718	CALL NLSSetText 'PB_ABOUT', 'Caption', 2 /* 10: Product Information */

• trunk/gui/printer/cupswiz/cupswzen.mkm

  r20	r24
  42	42	CWZ0032I: Detected network printer (%1) "%2" at %3
  43	43	CWZ0033I: Detected network printer %1 at %2
  44	CWZ0034I: (削除) Network (削除ここまで) printer (manual configuration)
  44	CWZ0034I: (追記) Other (追記ここまで) printer (manual configuration)
  45	45	CWZ0035I: Local printer: %1
  46	46	CWZ0036?:
  …	…
  92	92	CWZ0076I: Could not read printer name from %1.
  93	93	CWZ0077I: Invalid PPD
  94	CWZ0078(削除) ?: (削除ここまで)
  95	CWZ0079(削除) ?: (削除ここまで)
  94	CWZ0078(追記) I: The required program %1 is not installed. Please check your installation or contact support. (追記ここまで)
  95	CWZ0079(追記) I: Missing File (追記ここまで)
  96	96	;
  97	97	; Network settings dialog

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

  r23	r24
  1	1	CUPSWIZ - CUPS printer-creation wizard
  2	Version (削除) 0.99 (削除ここまで)
  2	Version (追記) 1.01 (追記ここまで)
  3	3
  4	4	This program is simple graphical front-end for creating CUPS-based printers
  …	…
  57	57	should have a bldlevel of 1.03 (February 2011) or later. (With earlier
  58	58	versions, you will be required to restart the WPS after creating a
  59	printer.)
  59	printer.) This also requires CUPSLPR.EXE to be installed on your PATH
  60	(preferably in the \TCPIP\BIN directory).
  60	61
  61	62	(If you installed CUPS on your system from WarpIN packages, all of the

• trunk/gui/printer/cupswiz/todo

  r18	r24
  1	- Check to make sure CUPS.PDR is installed, and (offer to) install if missing.
  2	- Ditto for gzip.exe and cupsport.exe
  1	- Offer to install CUPS.PDR if missing?
  3	2	- Ditto for ECUPS/ECUPS-HP/PSPRINT driver (...somehow)
  4	3	- Offer the option to show both simplified/expert drivers.

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