Changeset 82 for trunk/gui/shared

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.

File:

• trunk/gui/shared/PrintUtl.VRS (modified) (3 diffs)

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 )