Changeset 11

Timestamp:

Nov 4, 2011, 8:32:10 AM (14 years ago)

Author:

Alex Taylor

Message:

Add support for drivers other than ECUPS.DRV.

Location:

trunk/gui

Files:

• printer/cupswiz/cupswiz.VRP (modified) (1 diff)
• printer/cupswiz/cupswiz.VRX (modified) (8 diffs)
• printer/cupswiz/cupswiz.VRY (modified) ( previous)
• printer/cupswiz/readme.1st (modified) (2 diffs)
• printer/cupswiz/todo (modified) (1 diff)
• shared/PrintUtl.VRS (modified) (2 diffs)

trunk/gui/printer/cupswiz/cupswiz.VRP

@@ -1 +1 @@
 VX-REXX OS/2 V2.14 Build B3
 VRX: cupswiz.VRX
-MacroPath: VRM:g:\netlabs\svn\ecups\trunk\gui\printer\cupswiz
+MacroPath: VRM:G:\netlabs\svn\ecups\trunk\gui\printer\cupswiz
 EXEPath: 
 RunParameters: f:\cups
 RunDirectory: 
-VRXWindow: __VREMainWindow,1,2409,2554,5770,9106
-VRXWindow: __VRESectionListWindow,1,2481,11708,4529,3891
-VRXWindow: __VREToolsWindow,1,3481,9781,4968,1665
-VRXWindow: __VREWindListWindow,1,7022,11708,2650,3891
+VRXWindow: __VREMainWindow,1,602,2554,5770,9106
+VRXWindow: __VRESectionListWindow,1,662,11804,4529,3891
+VRXWindow: __VREToolsWindow,1,1674,9877,4989,1667
+VRXWindow: __VREWindListWindow,1,5215,11804,2650,3891
 UserFile: 1
 UserWindow: WN_MAIN,1
 UserWindow: SW_NETWORK,1
 UserWindow: SW_CREATE,1
+UserWindow: SW_MODEL,1

trunk/gui/printer/cupswiz/cupswiz.VRX

@@ -282 +282 @@
     IF create_os2 == 1 THEN DO
 
-        /* Make sure ECUPS.DRV has the printer */
+        /* Make sure the presentation driver supports the printer */
         IF globals.!mode == 2 THEN DO
             /* Always (re)import when a PPD is provided by the user
              */
-            ok = ImportPPD('ECUPS', globals.!prt_ppd )
+            ok = ImportPPD( globals.!os2driver, globals.!prt_ppd )
             IF ok <> 0 THEN DO
                 CALL LINEOUT globals.!log1, 'PPD import failed:' ok
@@ -292 +292 @@
             END
         END
-        ELSE IF PrinterExistsInDRV('ECUPS', globals.!prt_nick ) == 0 THEN DO
+        ELSE IF PrinterExistsInDRV( globals.!os2driver, globals.!prt_nick ) == 0 THEN DO
             IF globals.!prt_ppd == '' THEN
                 CALL PromptForPMName
             ELSE DO
-                ok = ImportPPD('ECUPS', globals.!prt_ppd )
+                ok = ImportPPD(globals.!os2driver, globals.!prt_ppd )
                 IF ok <> 0 THEN DO
                     CALL LINEOUT globals.!log1, 'PPD import failed:' ok
@@ -304 +304 @@
         END
 
-        ok = CreateOS2Printer('ECUPS')
+        ok = CreateOS2Printer( globals.!os2driver )
         IF ok <> 0 THEN
             RETURN 3                    /** RC=3  Error running rinstprn **/
@@ -331 +331 @@
             show_user  = 1
             show_pass  = 0
+            /* CALL VRSet 'DT_USERID', 'Caption', 'User ID (if required):' */
         END
         WHEN which == 4 THEN DO     /* SMB */
@@ -336 +337 @@
             show_user  = 1
             show_pass  = 1
+            /* CALL VRSet 'DT_QUEUE', 'Caption', 'Shared printer name:' */
         END
         OTHERWISE DO                /* CUPS */
@@ -920 +922 @@
     create_os2 = VRGet('CHK_CREATEPM', 'Set')
     globals.!os2printer = create_os2
+    globals.!os2driver  = VRGet('DDCB_PRESDRV', 'SelectedString')
     globals.!create = 1
 
@@ -1107 +1110 @@
             /* TODO support other drivers
              */
-            globals.!os2driver = 'ECUPS'
+            IF WORD( globals.!prt_nick, 1 ) == 'Apollo' |,
+               WORD( globals.!prt_nick, 1 ) == 'HP' |,
+               WORD( globals.!prt_nick, 1 ) == 'Hewlett-Packard' THEN
+                globals.!os2driver = 'ECUPS-HP'
+            ELSE
+                globals.!os2driver = 'ECUPS'
 
             CALL ConfirmAndCreate
@@ -1268 +1276 @@
     CALL VRSet 'EF_CRDESC', 'Value', globals.!prt_info
 
+    IF QueryAvailableDrivers() > 0 THEN DO
+        def_idx = 1
+        CALL VRMethod 'DDCB_PRESDRV', 'AddStringList', 'drv_list.'
+        DO i = 1 TO drv_list.0
+            IF drv_list.i == globals.!os2driver THEN DO
+                def_idx = i
+                LEAVE
+            END
+        END
+        CALL VRSet 'DDCB_PRESDRV', 'Selected', def_idx
+    END
+    /* TODO give an error if no drivers were found */
+
     window = VRInfo( "Object" )
     if( \VRIsChildOf( window, "Notebook" ) ) then do

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

@@ -1 +1 @@
 CUPSWIZ - prototype CUPS printer-creation wizard
-Test release 2
+Test release x
 
 Make sure cupsport.exe is either in the current directory or in the PATH.
@@ -22 +22 @@
 Current limitations: 
  - The CUPS printer is always created with default job options.
- - Currently only ECUPS.DRV is supported (not ECUPS-HP.DRV).
  - The GUI is still somewhat unpolished.  All printer models are currently
    displayed in one massive list (not broken down by manufacturer yet).

trunk/gui/printer/cupswiz/todo

@@ -2 +2 @@
 - Ditto for gzip.exe, rinstprn.exe and cupsport.exe
 - Split first-page printer list into manufacturer-model lists.
-- Check if (mode 1) printer is HP-LIP and use ECUPS-HP instead.
 - Use OS2.INI eCups::CUPS ||'\cups' for cups path if found.
 - How to support total remote CUPS (i.e. no local CUPS install)?

trunk/gui/shared/PrintUtl.VRS

@@ -419 +419 @@
 */
 /* Clean out lines from Gutenprint and Foomatic PPD files that are known to
- * cause problems when importing with PIN.  (Partially based on work Paul
+ * cause problems when importing with PIN.  (Partially based on work by Paul
  * Smedley and Peter Brown).
  */
@@ -528 +528 @@
 */
 RETURN best
+
+/*:VRX         QueryAvailableDrivers
+*/
+/* Determine which of our supported PrinterPak drivers are currently available.
+ */
+QueryAvailableDrivers: PROCEDURE EXPOSE globals. drv_list.
+    drv_list.0 = 0
+
+    test_drivers = 'ECUPS ECUPS-HP PSPRINT'
+    DO i = 1 TO WORDS( test_drivers )
+        driver = WORD( test_drivers, i )
+        ok = GetDriverSource( driver )
+        IF ok == '' THEN
+            ok = VRGetIni('PM_DEVICE_DRIVERS', driver, 'USER')
+        IF ok <> '' THEN
+            CALL SysStemInsert 'drv_list.', drv_list.0+1, driver
+    END
+
+RETURN drv_list.0
+