Changeset 82 for trunk/gui/printer/cupswiz/cupswiz.VRX

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/printer/cupswiz/cupswiz.VRX (modified) (3 diffs)

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 */