Changeset 82 for trunk/gui

Timestamp:

Feb 20, 2019, 6:27:50 PM (7 years ago)

Author:

Alex Taylor

Message:

CUPSWIZ and PRINTMAN add support for EPSONINK driver.
CUPSWIZ: fixed logic to find model in driver.

Location:

trunk/gui

Files:

• printer/cupswiz/cupswiz.VRP (modified) (1 diff)
• printer/cupswiz/cupswiz.VRX (modified) (3 diffs)
• printer/cupswiz/readme.1st (modified) (1 diff)
• printer/manager/PRINTOOL.VRP (modified) (1 diff)
• printer/manager/PRINTOOL.VRX (modified) (3 diffs)
• printer/manager/readme.txt (modified) (2 diffs)
• printer/manager/wpi/printman.wis (modified) (1 diff)
• shared/PrintUtl.VRS (modified) (3 diffs)
• util/cupsport/buildicc.cmd (added)

trunk/gui/printer/cupswiz/cupswiz.VRP

@@ -6 +6 @@
 RunDirectory: 
 VRXWindow: __VREMainWindow,1,578,2746,5770,9106
-VRXWindow: __VRESectionListWindow,1,711,11900,4529,3891
-VRXWindow: __VREToolsWindow,1,1650,9973,5468,1665
+VRXWindow: __VRESectionListWindow,1,723,11900,4529,3891
+VRXWindow: __VREToolsWindow,1,1650,9973,5468,1661
 VRXWindow: __VREWindListWindow,1,5191,11900,2650,3891
 UserFile: 1

trunk/gui/printer/cupswiz/cupswiz.VRX

@@ -444 +444 @@
                     CALL LINEOUT globals.!log1, 'PPD not found. Looking for model:' globals.!os2driver'.'globals.!prt_nick
             END
-            drv_model = PrinterExistsInDRV( globals.!os2driver, globals.!prt_nick )
-            CALL LINEOUT globals.!log1, 'PrinterExistsInDRV(' globals.!os2driver',' globals.!prt_nick '):' drv_model
+            drv_path = GetDriverSource( globals.!os2driver )
+            drv_model = PrinterExistsInDRV( drv_path, globals.!prt_nick )
+            CALL LINEOUT globals.!log1, 'PrinterExistsInDRV(' drv_path',' globals.!prt_nick '):' drv_model
             IF drv_model == '' THEN DO
                 IF cups_ppd == '' THEN DO
@@ -1686 +1687 @@
                WORD( globals.!prt_nick, 1 ) == 'Hewlett-Packard' THEN
                 globals.!os2driver = 'ECUPS-HP'
+            ELSE IF TRANSLATE( WORD( globals.!prt_nick, 1 )) == 'Epson' THEN
+                globals.!os2driver = 'EPSONINK'
             ELSE
                 globals.!os2driver = 'ECUPS'
@@ -2011 +2014 @@
     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.17'                                  /* 12: Version %1 */
+    CALL NLSSetText 'DT_ABOUT2', 'Caption', 12, '1.18'                                  /* 12: Version %1 */
     CALL NLSSetText 'DT_ABOUT3', 'Caption', 13, '2010-2019'                             /* 13: (C) %1 Alex Taylor */
     CALL NLSSetText 'PB_ABOUT',  'Caption', 2                                           /* 10: Product Information */

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

@@ -52 +52 @@
      - ECUPS.DRV     (eCups driver for Gutenprint and other filter packages)
      - ECUPS-HP.DRV  (eCups driver for HPLIP) 
+     - EPSONINK.DRV  (CUPS driver for EPSONINK) 
      - PSPRINT.DRV   (Enhanced OS/2 Postscript driver replacement)
 

trunk/gui/printer/manager/PRINTOOL.VRP

@@ -8 +8 @@
 VRXWindow: __VREMainWindow,1,964,4288,6697,8046
 VRXWindow: __VRESectionListWindow,1,1084,16044,4204,4059
-VRXWindow: __VREToolsWindow,1,1096,14309,5475,1661
+VRXWindow: __VREToolsWindow,1,1096,14309,5466,1663
 VRXWindow: __VREWindListWindow,1,5312,16044,3505,4059
 UserFile: 1

trunk/gui/printer/manager/PRINTOOL.VRX

@@ -911 +911 @@
 LoadSettings: PROCEDURE EXPOSE globals.
 
-    globals.!version = '0.84'
+    globals.!version = '0.85'
     globals.!copyright = '2013-2019'
 
@@ -2443 +2443 @@
     CALL NLSSetText 'RB_DEVICE_SHIPPED',  'Caption', 261, _platform
     CALL NLSSetText 'RB_DEVICE_3RDPARTY', 'Caption', 262, _platform
+    CALL NLSSetText 'GB_DEVICE_LIST',     'Caption', 264
     CALL NLSSetText 'PB_DEVICE_OTHER',    'Caption', 188
     CALL NLSSetText 'PB_DEVICE_REFRESH',  'Caption', 63
@@ -2458 +2459 @@
     END
     PARSE UPPER VALUE VRGetIni('PrinterManager', 'ThirdParty', 'USER') WITH known_3p '00'x .
-    IF known_3p == '' THEN known_3p = 'ECUPS ECUPS-HP GUTENPRT PSPRINT'
+    IF known_3p == '' THEN known_3p = 'ECUPS ECUPS-HP EPSONINK GUTENPRT PSPRINT'
     DO i = 1 TO WORDS( known_3p )
         _basename = WORD( known_3p, i )

trunk/gui/printer/manager/readme.txt

@@ -1 +1 @@
 PM Printer Manager
-Version 0.84
+Version 0.85
 
   Printer Manager is a new graphical printer management tool designed to
@@ -71 +71 @@
 --
 Alex Taylor
-January 2019
+February 2019

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

@@ -122 +122 @@
 
     <PCK INDEX=1
-        PACKAGEID="Alex Taylor\Printer Manager\Program\0\8\1"
+        PACKAGEID="Alex Taylor\Printer Manager\Program\0\8\4"
         TITLE="Printer Manager (including English language support)"
         TARGET="=("DefaultPath")\printman"

trunk/gui/shared/PrintUtl.VRS

@@ -183 +183 @@
  */
 PrinterExistsInDRV: PROCEDURE EXPOSE globals.
-    PARSE UPPER ARG driver_name, printer_name
+    PARSE UPPER ARG printer_drv, printer_name
     printer_name = TRANSLATE( printer_name, '_', '.')
 
-    printer_drv = globals.!os2dir'\DLL\'driver_name'\'driver_name'.DRV'
-    /* ?? TODO: install driver_name if not found (prompt first) ?? */
+    IF STREAM( printer_drv, 'C', 'QUERY EXISTS') == '' THEN
+        printer_drv = GetDriverSource( VRParseFilePath( printer_drv, 'N'))
+    IF STREAM( printer_drv, 'C', 'QUERY EXISTS') == '' THEN
+        RETURN ''
 
     IF SysGetEA( printer_drv, '.EXPAND', 'exist_ea') <> 0 THEN RETURN ''
@@ -202 +204 @@
     start = 1
     found = ''
-    DO WHILE ( found == 0 ) & ( start < total_len )
+    CALL LINEOUT globals.!log1, 'Looking for "'printer_name'" in' printer_drv'...'
+    DO WHILE ( found == '') & ( start < total_len )
         _strend = POS('0'x, exist_models, start )
         IF _strend == 0 THEN LEAVE
@@ -647 +650 @@
     drv_list.0 = 0
 
-    test_drivers = 'ECUPS ECUPS-HP PSPRINT'
+    test_drivers = 'ECUPS ECUPS-HP EPSONINK PSPRINT'
     DO i = 1 TO WORDS( test_drivers )
         driver = WORD( test_drivers, i )