Changeset 24 for trunk/gui/printer/cupswiz

Timestamp:

Apr 5, 2013, 9:14:35 PM (12 years ago)

Author:

Alex Taylor

Message:

CleanPPD now filters out Translation strings. Check for several required programs on start. Set default paper size somewhat intelligently.

Location:

trunk/gui/printer/cupswiz

Files:

• cupswiz.VRP (modified) (2 diffs)
• cupswiz.VRX (modified) (6 diffs)
• cupswzen.mkm (modified) (2 diffs)
• readme.1st (modified) (2 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: 
@@ -7 +7 @@
 VRXWindow: __VREMainWindow,1,614,2554,5770,9106
 VRXWindow: __VRESectionListWindow,1,675,11804,4529,3891
-VRXWindow: __VREToolsWindow,1,1686,9877,4971,1667
+VRXWindow: __VREToolsWindow,1,1686,9877,4968,1669
 VRXWindow: __VREWindListWindow,1,5228,11804,2650,3891
 UserFile: 1

trunk/gui/printer/cupswiz/cupswiz.VRX

@@ -101 +101 @@
 */
 return
+/*:VRX         CheckPrograms
+*/
+CheckPrograms: PROCEDURE EXPOSE globals.
+
+    /* Make sure CUPS.PDR is installed.
+     */
+    cups_pdr = VRGetIni('PM_PORT_DRIVER', 'CUPS', 'System')
+    IF cups_pdr == '' THEN DO
+        cups_pdr = STREAM( globals.!bootdrv'\OS2\DLL\CUPS.PDR', 'C', 'QUERY EXISTS')
+        IF cups_pdr == '' THEN DO
+            CALL VRMessage VRWindow(),,
+                           NLSGetMessage( 78, globals.!bootdrv'\OS2\DLL\CUPS.PDR'),,    /*  78: The required program %1 is not installed... */  
+                           NLSGetMessage( 79 ), 'E'                                     /*  79: Missing File */
+            CALL Quit 
+        END
+        ELSE CALL VRSetIni('PM_PORT_DRIVER', 'CUPS', cups_pdr, 'System')
+    END
+
+    /* Make sure \TCPIP\BIN\CUPSLPR.EXE (required by CUPS.PDR) is installed. 
+     */
+    tcpipbin = SysSearchPath('PATH', 'inetd.exe')
+    IF tcpipbin <> '' THEN
+        tcpipbin = VRParseFileName( tcpipbin, 'DP')
+    ELSE 
+        tcpipbin = globals.!bootdrv'\TCPIP\BIN'
+    IF \VRFileExists( tcpipbin'\cupslpr.exe') & (SysSearchPath('PATH', 'cupslpr.exe') == '') THEN DO
+        CALL VRMessage VRWindow(),,
+                       NLSGetMessage( 78, 'CUPSLPR.EXE'),,
+                       NLSGetMessage( 79 ), 'E'
+        CALL Quit 
+    END
+
+    /* Make sure GZIP.EXE is installed (required for unpacking PPDs).
+     */
+    gzip_exe = SysSearchPath('PATH', 'gzip.exe')
+    IF gzip_exe == '' THEN gzip_exe = STREAM( DIRECTORY() || '\gzip.exe', 'C', 'QUERY EXISTS') 
+    IF gzip_exe == '' THEN DO
+        CALL VRMessage VRWindow(), NLSGetMessage( 78, 'GZIP.EXE'), NLSGetMessage( 79 ), 'E'
+        CALL Quit 
+    END
+
+RETURN
+
 /*:VRX         CHK_CREATEPM_Click
 */
@@ -169 +212 @@
     END
 
+    /* Temporary until we can offer user configuration:
+     */
+    PARSE UPPER VALUE VALUE('LANG',,'OS2ENVIRONMENT') WITH 1 . 4 _ctry 6 .
+    IF ( WORDPOS( _ctry, 'US CA MX BO CO VE PH CL') > 0 ) THEN
+        page = 'Letter'
+    ELSE
+        page = 'A4'
+    cups_cmd = cups_cmd '-o media='page
+
     CALL LINEOUT globals.!log1, 'Creating CUPS printer using:'
     CALL LINEOUT globals.!log1, '   ' cups_cmd
@@ -244 +296 @@
         CALL LINEOUT globals.!log1, 'CreatePrinterObject(' prnt_drv',' printer_model,
                                     ',' port_name',' queue_name',' printer_title ') RC =' ok
-    END
-
-    IF ok <> 0 THEN
+        IF ok <> 0 THEN DO
+            CALL LINEOUT globals.!log1, 'Failed to create printer object; trying again with generic driver.'
+            ok = CreatePrinterObject( prnt_drv, 'Generic Postscript Printer',,
+                                      port_name, queue_name, printer_title )
+            CALL LINEOUT globals.!log1, 'CreatePrinterObject(' prnt_drv', Generic Postscript Printer',
+                                        ',' port_name',' queue_name',' printer_title ') RC =' ok
+        END
+    END
+
+    IF ok <> 0 THEN DO
+        CALL LINEOUT globals.!log1, 'Printer object creation failed.'
+        IF SysIni('SYSTEM', 'PM_SPOOLER_PRINTER', 'ALL:', 'prt_keys.') == '' THEN DO
+            DO i = 1 TO prt_keys.0
+                key_val = SysIni('SYSTEM', 'PM_SPOOLER_PRINTER', prt_keys.0 )
+                PARSE VAR key_val _kport ';' _ktitle ';' .
+                IF ( _kport == port_name ) & ( _ktitle == printer_title ) THEN DO
+                    CALL LINEOUT globals.!log1, 'Cleaning INI entry:' prt_keys.0 '=' key_val
+                    CALL SysIni 'SYSTEM', 'PM_SPOOLER_PRINTER_DESCR', prt_keys.0, 'DELETE:'
+                    CALL LINEOUT globals.!log1, 'Cleaning INI entry:' prt_keys.0 '=' key_val
+                    CALL SysIni 'SYSTEM', 'PM_SPOOLER_PRINTER', prt_keys.0, 'DELETE:'
+                    LEAVE
+                END
+            END
+        END
+        CALL LINEOUT globals.!log1, 'Deleting port' port_name
         CALL DeletePort port_name
+    END
     ELSE IF port_ok == 1 THEN DO
         CALL VRMessage VRWindow(),,
@@ -293 +368 @@
             cups_ppd = globals.!prt_ppd
             IF cups_ppd == '' THEN
-                cups_ppd = STREAM( globals.!cupsdir'\etc\cups\ppd'globals.!prt_name'.ppd', 'C', 'QUERY EXISTS')
+                cups_ppd = STREAM( globals.!cupsdir'\etc\cups\ppd\'globals.!prt_name'.ppd', 'C', 'QUERY EXISTS')
             IF cups_ppd == '' THEN
                 CALL PromptForPMName
@@ -929 +1004 @@
     CALL LoadSettings
     CALL SetLanguage
+    CALL CheckPrograms
 
     IF InitArgs.0 > 0 THEN globals.!cupsdir = InitArgs.1
@@ -1638 +1714 @@
     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, '0.99'                                  /* 12: Version %1 */
+    CALL NLSSetText 'DT_ABOUT2', 'Caption', 12, '1.00'                                  /* 12: Version %1 */
     CALL NLSSetText 'DT_ABOUT3', 'Caption', 13, '2010, 2013'                            /* 13: (C) %1 Alex Taylor */
     CALL NLSSetText 'PB_ABOUT',  'Caption', 2                                           /* 10: Product Information */

trunk/gui/printer/cupswiz/cupswzen.mkm

@@ -42 +42 @@
 CWZ0032I: Detected network printer (%1) "%2" at %3
 CWZ0033I: Detected network printer %1 at %2
-CWZ0034I: Network printer (manual configuration)
+CWZ0034I: Other printer (manual configuration)
 CWZ0035I: Local printer: %1
 CWZ0036?:
@@ -92 +92 @@
 CWZ0076I: Could not read printer name from %1.
 CWZ0077I: Invalid PPD
-CWZ0078?:
-CWZ0079?:
+CWZ0078I: The required program %1 is not installed.  Please check your installation or contact support.
+CWZ0079I: Missing File
 ;
 ; Network settings dialog

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

@@ -1 +1 @@
 CUPSWIZ - CUPS printer-creation wizard
-Version 0.99
+Version 1.01
 
   This program is simple graphical front-end for creating CUPS-based printers
@@ -57 +57 @@
    should have a bldlevel of 1.03 (February 2011) or later.  (With earlier
    versions, you will be required to restart the WPS after creating a 
-   printer.)
+   printer.)  This also requires CUPSLPR.EXE to be installed on your PATH
+   (preferably in the \TCPIP\BIN directory).
 
    (If you installed CUPS on your system from WarpIN packages, all of the

trunk/gui/printer/cupswiz/todo

@@ -1 @@
-- Check to make sure CUPS.PDR is installed, and (offer to) install if missing.
-- Ditto for gzip.exe and cupsport.exe
+- Offer to install CUPS.PDR if missing?
 - Ditto for ECUPS/ECUPS-HP/PSPRINT driver (...somehow)
 - Offer the option to show both simplified/expert drivers.