Changeset 54 for trunk/gui/printer

Timestamp:

Dec 16, 2016, 2:54:23 PM (9 years ago)

Author:

Alex Taylor

Message:

More minor modifications for compatibility with RPM-installed CUPS.

Location:

trunk/gui/printer

Files:

• cupswiz/cupswiz.VRP (modified) (1 diff)
• cupswiz/cupswiz.VRX (modified) (4 diffs)
• manager/readme.txt (modified) (3 diffs)
• manager/wpi/printman.wis (modified) (2 diffs)

trunk/gui/printer/cupswiz/cupswiz.VRP

@@ -1 +1 @@
 VX-REXX OS/2 V2.14 Build B3
 VRX: cupswiz.VRX
-MacroPath: VRM:E:\DEVELOPMENT\VXREXX\Projects\cupswiz
+MacroPath: VRM:G:\netlabs\svn\ecups\trunk\gui\printer\cupswiz
 EXEPath: 
 RunParameters: 
 RunDirectory: 
-VRXWindow: __VREMainWindow,1,614,2554,5770,9106
-VRXWindow: __VRESectionListWindow,1,687,11804,4529,3891
-VRXWindow: __VREToolsWindow,1,1686,9877,5477,1663
-VRXWindow: __VREWindListWindow,1,5228,11804,2650,3891
+VRXWindow: __VREMainWindow,1,578,2746,5770,9106
+VRXWindow: __VRESectionListWindow,1,650,11900,4529,3891
+VRXWindow: __VREToolsWindow,1,1650,9973,5468,1665
+VRXWindow: __VREWindListWindow,1,5191,11900,2650,3891
 UserFile: 1
 UserWindow: WN_MAIN,1

trunk/gui/printer/cupswiz/cupswiz.VRX

@@ -383 +383 @@
     ARG create_os2
 
+    cups_etc = globals.!cupsdir'\etc'
+    IF \VRIsDir( cups_etc'\cups\ppd') THEN
+        cups_etc = globals.!cupsdrv'\etc'
+    IF \VRIsDir( cups_etc'\cups\ppd') THEN
+        cups_etc = VALUE('ETC',,'OS2ENVIRONMENT')
+    IF \VRIsDir( cups_etc'\cups\ppd') THEN
+        cups_etc = '\etc'
+
     /* Create the CUPS printer */
     IF globals.!remotecups == '' THEN DO
@@ -417 +425 @@
                 cups_ppd = globals.!prt_ppd
                 IF cups_ppd == '' THEN
-                    cups_ppd = STREAM( globals.!cupsdir'\etc\cups\ppd\'globals.!prt_name'.ppd', 'C', 'QUERY EXISTS')
+                    cups_ppd = STREAM( cups_etc'\cups\ppd\'globals.!prt_name'.ppd', 'C', 'QUERY EXISTS')
                 IF cups_ppd == '' THEN DO
-                    CALL LINEOUT globals.!log1, 'CUPS PPD for this printer ('globals.!cupsdir'\etc\cups\ppd\'globals.!prt_name'.ppd) does not exist.'
+                    CALL LINEOUT globals.!log1, 'CUPS PPD for this printer ('cups_etc'\cups\ppd\'globals.!prt_name'.ppd) does not exist.'
                     CALL LINEOUT globals.!log1, 'Cannot import PPD.  Prompting user for preferred printer model.'
                     CALL PromptForPMName
@@ -1287 +1295 @@
      */
     PARSE VALUE VRGetIni('eCups', 'CUPS', 'USER') WITH cupsdrv '00'x
+    IF cupsdrv == '' THEN DO
+        cupsd_exe = SysSearchPath('PATH', 'cupsd.exe')
+        IF cupsd_exe <> '' THEN 
+            cupsdrv = FILESPEC('DRIVE', cupsd_exe )
+    END
     IF cupsdrv == '' THEN
         cupsdrv = VRParseFilePath( me, 'D') || ':'
     ELSE
         cupsdrv = STRIP( cupsdrv, 'T', '\')
-    globals.!cupsdir = cupsdrv'\cups'
+
+    IF VRIsDir( cupsdrv'\cups') THEN
+        globals.!cupsdir = cupsdrv'\cups'
+    ELSE
+        globals.!cupsdir = cupsdrv'\usr'
+    globals.!cupsroot = cupsdrv
 
     /* Get system paths.
@@ -1928 +1946 @@
     CALL NLSSetText 'SW_ABOUT',  'Caption', 10                                          /* 10: Product Information */
     CALL NLSSetText 'DT_ABOUT1', 'Caption', 11                                          /* 11: eCups Printer Install Utility */
-    CALL NLSSetText 'DT_ABOUT2', 'Caption', 12, '1.1'                                   /* 12: Version %1 */
+    CALL NLSSetText 'DT_ABOUT2', 'Caption', 12, '1.11'                                  /* 12: Version %1 */
     CALL NLSSetText 'DT_ABOUT3', 'Caption', 13, '2010-2016'                             /* 13: (C) %1 Alex Taylor */
     CALL NLSSetText 'PB_ABOUT',  'Caption', 2                                           /* 10: Product Information */

trunk/gui/printer/manager/readme.txt

@@ -1 +1 @@
 PM Printer Manager
-Version 0.50
+Version 0.51
 
   Printer Manager is a new graphical printer management tool designed to 
@@ -48 +48 @@
 
   PM Printer Manager
-  (C) 2013-2014 Alexander Taylor
+  (C) 2013-2015 Alexander Taylor
  
     This program is free software; you can redistribute it and/or modify
@@ -72 +72 @@
 -- 
 Alex Taylor
-December 2014
+October 2015

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

@@ -8 +8 @@
         path = VALUE('OSDIR',,'OS2ENVIRONMENT')
         IF path == '' THEN RETURN '$(WARPIN_DEFAULTTOOLSPATH)'
-        RETURN path'\system'
+        IF TRANSLATE( VALUE('OS',,'OS2ENVIRONMENT')) == 'ECS' THEN
+            RETURN path'\system'
+        ELSE
+            RETURN path'\apps'
     </REXX>
 
@@ -54 +57 @@
 
     <PCK INDEX=1
-        PACKAGEID="Alex Taylor\Printer Manager\Program\0\5\0"
+        PACKAGEID="Alex Taylor\Printer Manager\Program\0\5\1"
         TITLE="Printer Manager (including English language support)"
         TARGET="=("DefaultPath")\printman"