Changeset 56

Legend:

Unmodified

Added

Removed

• trunk/gui/printer/cupswiz

  • Property svn:ignore set to
    __out
    *.exe
    *.EXE
    *.msg
    *.MSG
    *.res
    *.RES
    

• trunk/gui/printer/manager

  • Property svn:ignore set to
    __out
    *.exe
    *.EXE
    *.hlp
    *.HLP
    *.msg
    *.MSG
    *.res
    *.RES
    

• trunk/gui/printer/manager/PRINTOOL.VRP

  r51	r56
  8	8	VRXWindow: __VREMainWindow,1,506,4095,6697,8046
  9	9	VRXWindow: __VRESectionListWindow,1,614,16044,4204,4059
  10	VRXWindow: __VREToolsWindow,1,638,14309,54(削除) 75,1661 (削除ここまで)
  10	VRXWindow: __VREToolsWindow,1,638,14309,54(追記) 66,1663 (追記ここまで)
  11	11	VRXWindow: __VREWindListWindow,1,4854,16044,3505,4059
  12	12	UserFile: 1

• trunk/gui/printer/manager/PRINTOOL.VRX

  r51	r56
  236	236	PARSE ARG _host, _dest
  237	237
  238	(追記) IF globals.!programs.!lpadmin == '' THEN DO (追記ここまで)
  239	(追記) CALL LINEOUT globals.!log1, 'lpadmin is not available, cannot delete CUPS queue.' (追記ここまで)
  240	(追記) RETURN 0 (追記ここまで)
  241	(追記) END (追記ここまで)
  242	(追記) (追記ここまで)
  238	243	IF TRANSLATE( _host ) <> 'LOCALHOST' THEN
  239	244	del_cmd = globals.!programs.!lpadmin '-h' _host '-x' _dest
  …	…
  895	900	LoadSettings: PROCEDURE EXPOSE globals.
  896	901
  897	globals.!version = '0.(削除) 51 (削除ここまで)'
  898	globals.!copyright = '2013-201(削除) 5 (削除ここまで)'
  902	globals.!version = '0.(追記) 6 (追記ここまで)'
  903	globals.!copyright = '2013-201(追記) 7 (追記ここまで)'
  899	904
  900	905	me = VRGet('Application', 'Program')
  …	…
  910	915	cupsdrv = STRIP( cupsdrv, 'T', '\')
  911	916	globals.!cupsdir = cupsdrv'\cups'
  917	(追記) IF \VRIsDir( globals.!cupsdir ) THEN DO (追記ここまで)
  918	(追記) unixroot = VALUE('UNIXROOT',,'OS2ENVIRONMENT') (追記ここまで)
  919	(追記) IF unixroot <> '' THEN (追記ここまで)
  920	(追記) globals.!cupsdir = unixroot'\usr' (追記ここまで)
  921	(追記) ELSE (追記ここまで)
  922	(追記) globals.!cupsdir = cupsdrv'\usr' (追記ここまで)
  923	(追記) END (追記ここまで)
  912	924
  913	925	/* Get system paths.

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

  r54	r56
  1	1	PM Printer Manager
  2	Version 0.(削除) 51 (削除ここまで)
  2	Version 0.(追記) 6 (追記ここまで)
  3	3
  4	Printer Manager is a new graphical printer management tool designed to(削除) (削除ここまで)
  4	Printer Manager is a new graphical printer management tool designed to(追記) (追記ここまで)
  5	5	replace several older, separate programs by integrating their functions
  6	6	in one, centralized utility:
  …	…
  13	13
  14	14	Requirements:
  15	- VROBJ.DLL (widely available, included with eCS)
  16	- WPTOOLS.DLL (widely available, included with eCS)
  17	- PR1UTIL.DLL (widely available, included with eCS 2.x)
  18	- VROBJEX.DLL (available from http://trac.netlabs.org/vxapps,
  19	included in eCS 2.2)
  15	- VROBJ.DLL (widely available)
  16	- WPTOOLS.DLL (widely available)
  17	- PR1UTIL.DLL (widely available)
  18	- VROBJEX.DLL (available from http://trac.netlabs.org/vxapps)
  20	19	- RXPRTUTL.DLL (included here)
  21	20
  …	…
  35	34
  36	35	If the CUPS server (local or remote) requires password authentication for
  37	the use of commands like lpadmin, lpinfo, etc. then these programs will(削除) (削除ここまで)
  36	the use of commands like lpadmin, lpinfo, etc. then these programs will(追記) (追記ここまで)
  38	37	block waiting for a password during various operations. (There doesn't seem
  39	38	to be any way to fix this other than replacing the programs entirely... I'm
  …	…
  48	47
  49	48	PM Printer Manager
  50	(C) 2013-201(削除) 5 (削除ここまで) Alexander Taylor
  51
  49	(C) 2013-201(追記) 7 (追記ここまで) Alexander Taylor
  50
  52	51	This program is free software; you can redistribute it and/or modify
  53	52	it under the terms of the GNU General Public License as published by
  54	53	the Free Software Foundation; either version 2 of the License, or
  55	54	(at your option) any later version.
  56
  55
  57	56	This program is distributed in the hope that it will be useful,
  58	57	but WITHOUT ANY WARRANTY; without even the implied warranty of
  59	58	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  60	59	GNU General Public License for more details.
  61
  60
  62	61	You should have received a copy of the GNU General Public License
  63	62	along with this program; if not, write to the Free Software
  64	63	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  65
  64
  66	65	Permission is granted for the inclusion of the PM Printer Manager binaries
  67	in the eComStation operating system. In this case, the full source code(削除) (削除ここまで)
  66	in the eComStation operating system. In this case, the full source code(追記) (追記ここまで)
  68	67	need not be included in the OS distribution so long it remains publically
  69	68	available through affiliated channels and/or in a location which is clearly
  70	69	indicated by the accompanying documentation.
  71	70
  72	--(削除) (削除ここまで)
  71	--(追記) (追記ここまで)
  73	72	Alex Taylor
  74	October 2015
  73	February 2017

• trunk/gui/printer/manager/wpi

  • Property svn:ignore set to
    *.msg
    *.MSG
    *.wpi
    *.WPI
    *.exe
    *.EXE
    

• trunk/gui/printer/manager/wpi/makewpi.cmd

  r49	r56
  19	19	'@wic.exe' pkgname'.wpi -a 1 printman.exe'
  20	20	'@wic.exe' pkgname'.wpi -a 1 printmen.msg'
  21	(削除) '@wic.exe' pkgname'.wpi -a 1 rxprtutl.dll' (削除ここまで)
  22	21	'@wic.exe' pkgname'.wpi -a 1 -c.. newprint.ico'
  23	22	'@wic.exe' pkgname'.wpi -a 1 -c.. COPYING'
  24	23	'@wic.exe' pkgname'.wpi -a 1 -c.. readme.txt'
  24	(追記) '@wic.exe' pkgname'.wpi -a 2 rxprtutl.dll' (追記ここまで)
  25	25	'@wic.exe' pkgname'.wpi -s' wisname
  26	26	CALL ENDLOCAL

• trunk/gui/printer/manager/wpi/printman.wis

  r54	r56
  12	12	ELSE
  13	13	RETURN path'\apps'
  14	(追記) </REXX> (追記ここまで)
  15	(追記) (追記ここまで)
  16	(追記) <REXX NAME="DefaultPath2"> (追記ここまで)
  17	(追記) path = VALUE('OSDIR',,'OS2ENVIRONMENT') (追記ここまで)
  18	(追記) IF path == '' THEN path = '?:\OS2' (追記ここまで)
  19	(追記) RETURN path (追記ここまで)
  14	20	</REXX>
  15	21
  …	…
  54	60	</REXX>
  55	61
  62	(追記) <REXX NAME="ReqDLL"> (追記ここまで)
  63	(追記) /* Searches the system LIBPATH for the specified DLL. If not found, (追記ここまで)
  64	(追記) * returns the string 'REQUIRES=xxx'. (追記ここまで)
  65	(追記) * (追記ここまで)
  66	(追記) * Parameters: (追記ここまで)
  67	(追記) * dname Name of the DLL to look for (must include extension) (追記ここまで)
  68	(追記) * reqpkg Value of REQUIRES string to return if DLL is not found (追記ここまで)
  69	(追記) */ (追記ここまで)
  70	(追記) CALL RxFuncAdd 'SysLoadFuncs', 'REXXUTIL', 'SysLoadFuncs' (追記ここまで)
  71	(追記) CALL SysLoadFuncs (追記ここまで)
  72	(追記) (追記ここまで)
  73	(追記) PARSE ARG dname reqpkg (追記ここまで)
  74	(追記) IF dname == '' THEN RETURN '' (追記ここまで)
  75	(追記) (追記ここまで)
  76	(追記) _bd = SysBootDrive() (追記ここまで)
  77	(追記) IF _bd == '' THEN (追記ここまで)
  78	(追記) _bd = FILESPEC('DRIVE', VALUE('COMSPEC',,'OS2ENVIRONMENT')) (追記ここまで)
  79	(追記) _csys = _bd'\CONFIG.SYS' (追記ここまで)
  80	(追記) (追記ここまで)
  81	(追記) CALL SysFileSearch 'LIBPATH=', _csys, 'match.' (追記ここまで)
  82	(追記) DO i = 1 TO match.0 (追記ここまで)
  83	(追記) PARSE UPPER VAR match.i _lead 'LIBPATH=' _lpath (追記ここまで)
  84	(追記) IF (_lead == '') & (_lpath <> '') THEN LEAVE (追記ここまで)
  85	(追記) END (追記ここまで)
  86	(追記) CALL SETLOCAL (追記ここまで)
  87	(追記) _testenv = 'TEST_'dname'_LIBPATH' (追記ここまで)
  88	(追記) CALL VALUE _testenv, _lpath, 'OS2ENVIRONMENT' (追記ここまで)
  89	(追記) location = SysSearchPath( _testenv, dname ) (追記ここまで)
  90	(追記) CALL ENDLOCAL (追記ここまで)
  91	(追記) (追記ここまで)
  92	(追記) IF location == '' THEN DO (追記ここまで)
  93	(追記) CALL WirexxPutEnv dname, '0' (追記ここまで)
  94	(追記) IF reqpkg <> '' THEN (追記ここまで)
  95	(追記) RETURN 'REQUIRES='reqpkg (追記ここまで)
  96	(追記) END (追記ここまで)
  97	(追記) (追記ここまで)
  98	(追記) CALL WirexxPutEnv dname, '1' (追記ここまで)
  99	(追記) RETURN '' (追記ここまで)
  100	(追記) </REXX> (追記ここまで)
  101	(追記) (追記ここまで)
  102	(追記) <REXX NAME="ConditionalTitle"> (追記ここまで)
  103	(追記) PARSE ARG dllname title (追記ここまで)
  104	(追記) was_found = WirexxGetEnv( dllname ) (追記ここまで)
  105	(追記) IF was_found == 1 THEN (追記ここまで)
  106	(追記) RETURN '[Already Installed]' title (追記ここまで)
  107	(追記) ELSE (追記ここまで)
  108	(追記) RETURN title (追記ここまで)
  109	(追記) </REXX> (追記ここまで)
  110	(追記) (追記ここまで)
  111	(追記) <REXX NAME="SelectIfRequired"> (追記ここまで)
  112	(追記) PARSE ARG dllname (追記ここまで)
  113	(追記) was_found = WirexxGetEnv( dllname ) (追記ここまで)
  114	(追記) IF was_found == 1 THEN (追記ここまで)
  115	(追記) RETURN '' (追記ここまで)
  116	(追記) ELSE (追記ここまで)
  117	(追記) RETURN 'SELECT' (追記ここまで)
  118	(追記) </REXX> (追記ここまで)
  119	(追記) (追記ここまで)
  120	(追記) (追記ここまで)
  56	121	<!-- PACKAGES ----------------------------------------------------------->
  57	122
  58	123	<PCK INDEX=1
  59	PACKAGEID="Alex Taylor\Printer Manager\Program0円\(削除) 51円 (削除ここまで)"
  124	PACKAGEID="Alex Taylor\Printer Manager\Program0円\(追記) 60円 (追記ここまで)"
  60	125	TITLE="Printer Manager (including English language support)"
  61	126	TARGET="=("DefaultPath")\printman"
  …	…
  67	132	=("CheckDLL PR1UTIL.DLL 0 The runtime library PR1UTIL.DLL was not found on your system. You must install this library in order to use Printer Manager.")
  68	133
  134	(追記) =("ReqDLL RXPRTUTL.DLL 2") (追記ここまで)
  135	(追記) (追記ここまで)
  69	136	CREATEOBJECT="REPLACE WPProgram|Manage Printers|<WP_PRINTERSFOLDER>|EXENAME=$(1)\printman.exe;PROGTYPE=PM;OBJECTID=<PRINT_MANAGER>;"
  70	CREATEOBJECT="REPLACE WPProgram|Install Printer|<WP_PRINTERSFOLDER>|EXENAME=$(1)\printman.exe;PARAMETERS=/create;PROGTYPE=PM;ICONFILE=$(1)\newprint.ico;OBJECTID=<(削除) ECS (削除ここまで)_PRINTGUIDE>;"
  137	CREATEOBJECT="REPLACE WPProgram|Install Printer|<WP_PRINTERSFOLDER>|EXENAME=$(1)\printman.exe;PARAMETERS=/create;PROGTYPE=PM;ICONFILE=$(1)\newprint.ico;OBJECTID=<(追記) WP (追記ここまで)_PRINTGUIDE>;"
  71	138	>This package contains the graphical printer manager along with the English language files.</PCK>
  139	(追記) (追記ここまで)
  140	(追記) <PCK INDEX=2 (追記ここまで)
  141	(追記) PACKAGEID="Alex Taylor\REXX Printer Utilities\Runtime0円3円" (追記ここまで)
  142	(追記) TITLE="=("ConditionalTitle RXPRTUTL.DLL REXX Printer Utilities (RXPRTUTL.DLL)")" (追記ここまで)
  143	(追記) TARGET="=("DefaultPath2")\dll" (追記ここまで)
  144	(追記) =("SelectIfRequired RXPRTUTL.DLL") (追記ここまで)
  145	(追記) >This package contains the required library VROBJ.DLL</PCK> (追記ここまで)
  72	146
  73	147	</HEAD>

• trunk/gui/util/cupsport

  • Property svn:ignore set to
    *.map
    *.exe
    *.sym
    *.obj
    

• trunk/gui/util/prntobj

  • Property svn:ignore set to
    *.map
    *.exe
    *.sym
    *.obj
    

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