Changeset 17 for trunk/gui/printer/cupswiz

Timestamp:

Nov 6, 2012, 6:22:25 PM (13 years ago)

Author:

Alex Taylor

Message:

Eliminate need for RINSTPRN. Try to import PPD from \cups\etc\cups\ppd if it doesn't exist in OS/2 driver. Some minor UI-related fixes.

Location:

trunk/gui/printer/cupswiz

Files:

• cupswiz.VRP (modified) (1 diff)
• cupswiz.VRX (modified) (7 diffs)
• readme.1st (modified) (3 diffs)
• todo (modified) (1 diff)

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: f:\cups
+RunParameters: 
 RunDirectory: 
 VRXWindow: __VREMainWindow,1,602,2554,5770,9106
-VRXWindow: __VRESectionListWindow,1,662,11804,4529,3891
-VRXWindow: __VREToolsWindow,1,1674,9877,4995,1667
+VRXWindow: __VRESectionListWindow,1,650,11804,4529,3891
+VRXWindow: __VREToolsWindow,1,1674,9877,4965,1659
 VRXWindow: __VREWindListWindow,1,5215,11804,2650,3891
 UserFile: 1

trunk/gui/printer/cupswiz/cupswiz.VRX

@@ -202 +202 @@
     queue_name    = GetQueueName( printer_title )
     port_name     = GetNextPortName('CUPS')
-    use_drv       = globals.!prdrv
-
-    /* Determine the source directories/files to pass to RINSTPRN.EXE.  (Some
-     * of this logic is repeated from ImportPPD, but we have to do it again
-     * here because (a) we might not have gone through ImportPPD to get to this
-     * point, and (b) even if we did, the repository information might have
-     * changed.)
-     */
-    copied_driver = 0
+
+    /* Determine the printer driver source directories/files.  Yes, this is
+     * repeated from ImportPPD, but we have to do it again here because 
+     * (a) we might not have gone through ImportPPD to get to this point, and
+     * (b) even if we did, the repository information might have changed.
+     */
     driver_path = GetDriverSource( prnt_drv )
-
-    IF ( pmdx <> '') & ( globals.!prdrv <> '') & ( globals.!prdesc <> '') THEN DO
-        /* Printer driver is in the local repository, so we can just point
-         * to that, and use the system PRDESC.LST file.
+    IF driver_path == '' THEN
+        /* Driver was not found in the repository.  Check for a previously-
+         * installed copy under \OS2\DLL.
          */
-        use_desc = globals.!prdesc
-        use_src  = globals.!repository
-    END
-    ELSE IF driver_path <> '' THEN DO
-        /* Driver is not in the repository, but was found in another designated
-         * location.  Point to that location, and create a temporary PRDESC.LST
-         * file for it.
-         */
-        use_src  = VRParseFilePath( driver_path, 'DP')
-        use_desc = use_src'\PRDESC.LST'
-        CALL CreateDriverList driver_path, use_desc
-    END
-    ELSE DO
-        /* Driver is not in the repository.  Try to grab the installed files
-         * from under \OS2\DLL, copy them into a temporary working directory,
-         * and create a temporary PRDESC.LST file.
-         */
-        driver_path = globals.!os2dir'\DLL\'prnt_drv'\'prnt_drv'.DRV'
-
-        use_src  = SysTempFileName( globals.!tmpdir'\PDR_????')
-        use_desc = use_src'\PRDESC.LST'
-
-        IF VRMkDir( use_src ) == 0 THEN DO
-            CALL LINEOUT globals.!log1, 'Failed to create working directory' use_src':' VRError()
-            RETURN 1
-        END
-        IF CopyDriverToSource( driver_path, use_src ) == 0 THEN DO
-            CALL LINEOUT globals.!log1, 'Failed to copy driver' driver_path 'to working directory' use_src'.'
-            RETURN 1
-        END
-        CALL CreateDriverList driver_path, use_desc
-        copied_driver = 1
+        driver_path = STREAM( globals.!os2dir'\DLL\'prnt_drv'\'prnt_drv'.DRV', 'C', 'QUERY EXISTS')
+
+    IF driver_path == '' THEN DO
+        /* TODO allow the user to browse for the driver on their system */
+        CALL VRMessage VRWindow(), 'The printer driver' prnt_drv 'could not  ',
+                                   'be located.  If you have the driver      ',
+                                   'files, please copy them to the directory ',
+                                   globals.!os2dir'\DLL\'prnt_drv' and then  ',
+                                   'try again.', 'Driver Not Found', 'E'
+        RETURN 1
     END
 
@@ -257 +231 @@
         RETURN 1
 
-    rsp_file = globals.!tmpdir'\printer.rsp'
-    CALL RSPCreatePrinter rsp_file, prnt_drv, printer_model,,
-                          port_name, queue_name, printer_title
-
-    /* Install the printer driver.  (We do this manually because doing it
-     * through RINSTPRN seems not to work properly on some systems.)
-     */
+    /* New logic to create the printer ourselves (instead of using RINSTPRN).
+     * There are two necessary steps: make sure the driver is installed, and 
+     * then create the printer object (which causes the underlying device and
+     * queue to be created automatically as well).
+     */
+
     result = InstallPrintDriver( prnt_drv, driver_path, printer_model )
-    IF result == 0 THEN CALL RSPInstallDriver rsp_file, prnt_drv, printer_model
-
-    /* Now call RINSTPRN to create the printer queue/device and object. 
-     */
-    result = ExecRINSTPRN( use_desc, use_drv, use_src, rsp_file )
+    CALL LINEOUT globals.!log1, 'InstallPrintDriver(' prnt_drv',' driver_path',' printer_model ') RC =' result
+
+    IF result == 0 THEN 
+        result = CreatePrinterObject( prnt_drv, printer_model,,
+                                      port_name, queue_name, printer_title )
+    CALL LINEOUT globals.!log1, 'CreatePrinterObject(' prnt_drv',' printer_model,
+                                ',' port_name',' queue_name',' printer_title,
+                                ') RC =' result
+
     IF result <> 0 THEN
         CALL DeletePort port_name
@@ -278 +255 @@
                        'usable until the desktop is restarted.',,
                        'Port Driver Problem', 'W'
-    END
-
-    IF copied_driver == 1 THEN DO
-        CALL VRDeleteFile use_src'\*'
-        CALL VRRmDir use_src
     END
 
@@ -313 +285 @@
         END
         ELSE IF PrinterExistsInDRV( globals.!os2driver, globals.!prt_nick ) == 0 THEN DO
-            IF globals.!prt_ppd == '' THEN
+            cups_ppd = globals.!prt_ppd
+            IF cups_ppd == '' THEN
+                cups_ppd = STREAM( globals.!cupsdir'\etc\cups\ppd'globals.!prt_name'.ppd', 'C', 'QUERY EXISTS')
+            IF cups_ppd == '' THEN
                 CALL PromptForPMName
             ELSE DO
-                ok = ImportPPD(globals.!os2driver, globals.!prt_ppd )
+                ok = ImportPPD(globals.!os2driver, cups_ppd )
                 IF ok <> 0 THEN DO
                     CALL LINEOUT globals.!log1, 'PPD import failed:' ok
@@ -618 +593 @@
     manufacturers.count.!printers.1.!remark2 = ''
     manufacturers.0 = count
+
+    CALL VRSet 'DT_INFO', 'Caption', 'Select the printer manufacturer and model from the list below.'
 
 RETURN
@@ -1403 +1380 @@
                        'no similar models were found.  The generic PostScript',
                        'driver will be used for application support.',,
-                       'Printer Name Not Found', 'E'
+                       'Printer Name Not Found', 'W'
         globals.!prt_nick = 'Generic PostScript Printer'
         RETURN
@@ -1448 +1425 @@
 
     CALL VRSet 'WN_MAIN', 'Pointer', 'WAIT'
-    CALL VRSet 'DT_INFO', 'Caption', 'Select your printer model.'
 
     /* Populate the manufacturer list */

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

@@ -1 +1 @@
 CUPSWIZ - CUPS printer-creation wizard
-Version 0.95
+Version 0.96
+
+  This program is simple graphical front-end for creating CUPS-based printers
+  under OS/2.
+
+  Without this program, creating a CUPS printer under OS/2 is something of a
+  headache.  First, you need to go into the CUPS web GUI and go through its
+  (often agonizingly slow) creation wizard.  Then you need to make sure support
+  for your printer has been imported into the OS/2 CUPS printer driver (which
+  may require you to manually prep and then import a PPD file yourself).  Then
+  you have to create a new OS/2 CUPS port and point it to the CUPS queue you
+  created earlier.  Finally, you have to create an actual OS/2 printer object
+  for your applications to print to.  This may be fine for a few expert users,
+  but the average person just wants to create a printer quickly and simply.
+
+  This program attempts to automate most of these steps.  The basic idea is 
+  that you select your printer make/model from the list of those supported 
+  (which will depend on your installed CUPS setup), or import a special CUPS
+  PPD file which defines your printer, indicate how the printer is connected
+  (whether via USB or one of a number of types of network connection), give
+  it a name and description, and the program does the rest.
+
+  Some of the highlights:
+   - When you create the printer, both the CUPS printer queue and a
+     corresponding OS/2 printer object are created; the CUPS port linking
+     the two is also created and configured automatically.  (You can also
+     opt to only create the CUPS queue if you wish.)
+   - You can also select an existing CUPS printer queue (locally or on a
+     remote server), in which case a corresponding OS/2 printer object will
+     be created for it.
+   - The appropriate model in the OS/2 PM printer driver (ECUPS.DRV or
+     ECUPS-HP.DRV) is automatically identified and installed in the new OS/2
+     printer object.  If an exact match is not found (and no PPD is available
+     - see next point) you will offered a list of similar models, or allowed 
+     to select generic support.
+   - When installing a printer which is not currently defined in the OS/2
+     printer driver, if a PPD exists for the new printer it will be imported
+     automatically.  (If not, you will be prompted as above.)
+
+  As this program is still under development, it is not yet as smooth as it
+  could be.  See the 'Limitations & Known Problems' section below for more.
 
 
@@ -24 +64 @@
    Other required files (all included out of the box with eComStation;
    other versions of OS/2 may or may not have them installed):
-     - RINSTPRN.EXE (OS/2 printer CID installer, usually located in \OS2)
      - VROBJ.DLL (VX-REXX standard runtime; must be in the LIBPATH)
      - GZIP.EXE (GNU gzip; must be on the PATH)
@@ -71 +110 @@
     to change them, you will have to do so from the CUPS administration GUI.
   - This program is currently available in English only.
-  - There is no help or documentation.
+  - There is no help.
   - There may well be undiscovered bugs; please report any you find.
 

trunk/gui/printer/cupswiz/todo

@@ -1 +1 @@
 - Check to make sure CUPS.PDR is installed, and (offer to) install if missing.
-- Ditto for gzip.exe, rinstprn.exe and cupsport.exe
+- Ditto for gzip.exe and cupsport.exe
+- Ditto for ECUPS/ECUPS-HP/PSPRINT driver (...somehow)
 - Offer the option to show both simplified/expert drivers.
 - Allow setting at least some basic job options like paper/colour/quality.
 - I18N support
-- Is there a way to generate the PPD for driver import when using exe://?  e.g.
-  get the saved PPD from the cups\etc\cups\ppd directory.