Changeset 12

Timestamp:

Nov 14, 2011, 3:30:15 PM (14 years ago)

Author:

Alex Taylor

Message:

Printer list is now split by manufacturer/model, and model names are more concise. Only 'Simplified' drivers are shown by default. ECUPS-HP and PSPRINT drivers now supported.

Location:

trunk/gui/printer/cupswiz

Files:

• cupswiz.VRP (modified) (3 diffs)
• cupswiz.VRX (modified) (14 diffs)
• cupswiz.VRY (modified) ( previous)
• 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:G:\netlabs\svn\ecups\trunk\gui\printer\cupswiz
+MacroPath: VRM:E:\DEVELOPMENT\VXREXX\Projects\cupswiz
 EXEPath: 
 RunParameters: f:\cups
@@ -7 +7 @@
 VRXWindow: __VREMainWindow,1,602,2554,5770,9106
 VRXWindow: __VRESectionListWindow,1,662,11804,4529,3891
-VRXWindow: __VREToolsWindow,1,1674,9877,4989,1667
+VRXWindow: __VREToolsWindow,1,1674,9877,4995,1667
 VRXWindow: __VREWindListWindow,1,5215,11804,2650,3891
 UserFile: 1
@@ -14 +14 @@
 UserWindow: SW_CREATE,1
 UserWindow: SW_MODEL,1
+UserWindow: SW_ABOUT,1

trunk/gui/printer/cupswiz/cupswiz.VRX

@@ -412 +412 @@
             IF _queue == '' THEN _desc = '('_protocol')'
             ELSE _desc = _queue '('_protocol')'
-            devices.i = 'Detected network printer' _desc 'at' _host 
+            devices.i = 'Detected network printer' _desc 'at' _host
         END
         ELSE IF _type <> 'direct' THEN ITERATE
@@ -439 +439 @@
 /*:VRX         GetCupsPrinters
 */
-GetCupsPrinters: PROCEDURE EXPOSE globals.
+GetCupsPrinters: PROCEDURE EXPOSE globals. manufacturers.
 
     CALL VRSet 'DT_INFO', 'Caption', 'Getting list of supported printers.  Please wait...'
@@ -452 +452 @@
     ADDRESS CMD '@' lpinfo_cmd listqueue
     i = 0
+    makers = ''
     DO QUEUED()
         PARSE PULL line
         IF LEFT( line, 6 ) == 'drv://' THEN ITERATE
+        IF WORD( line, 1 ) == 'raw' THEN ITERATE
         PARSE VAR line _ppd '.ppd.gz ' _name
         _ppd = _ppd'.ppd.gz'
@@ -465 +467 @@
         END
         IF _name <> '' THEN DO
+            PARSE VAR _name _brand _model
+            IF WORDPOS( _brand, makers ) == 0 THEN makers = makers || _brand' '
             i = i + 1
             ppds.i   = _ppd
@@ -477 +481 @@
     CALL DIRECTORY _od
 
-    CALL VRSet    'LB_SELECT', 'Painting', 0
-    CALL VRMethod 'LB_SELECT', 'AddString', '-- Other printer (requires PPD) --',, ''
-    CALL VRMethod 'LB_SELECT', 'AddStringList', 'models.',, 'ppds.'
-    CALL VRSet    'LB_SELECT', 'Selected', 1
-    CALL VRSet    'LB_SELECT', 'Painting', 1
-
-    CALL VRSet 'DT_INFO', 'Caption', 'Select your printer model.'
+/* Now build the 'manufacturers' stem.
+ * This stem takes the following format:
+ *    manufacturers.0                         number of manufacturers
+ *    manufacturers.i.!name                   manufacturer name (e.g. 'Apple')
+ *    manufacturers.i.!printers.0             number of printer models
+ *    manufacturers.i.!printers.j.!model      printer model name, short form (e.g. 'LaserWriter 330')
+ *    manufacturers.i.!printers.j.!type       driver version/type (e.g. 'Gutenprint v5.2.7')
+ *    manufacturers.i.!printers.j.!driver     the internal CUPS printer driver name (PPD or URI)
+ *                                            - by preference this is the "simplified" version if available
+ *    manufacturers.i.!printers.j.!remark     any distinguishing remarks (e.g. 'Simplified')
+ *    manufacturers.i.!printers.j.!driver2    alternate driver in case there is more than one (PPD or URI)
+ *                                            - if defined this is usually the non-"simplified" driver
+ *    manufacturers.i.!printers.j.!remark2    any distinguishing remarks for the alternate driver
+ */
+
+    manufacturers.0 = WORDS( makers )
+    DO i = 1 TO manufacturers.0
+        manufacturers.i.!name = WORD( makers, i )
+        manufacturers.i.!printers.0 = 0
+    END
+
+    DO i = 1 TO models.0
+        PARSE VAR models.i _brand _model ' - CUPS+' _type
+        man = WORDPOS( _brand, makers )
+        IF man == 0 THEN ITERATE
+
+        PARSE VAR _type _version 'Simplified' .
+        _version = STRIP( _version )
+        _flag    = RIGHT( _type, 10 )
+
+        count = manufacturers.man.!printers.0
+        IF count > 0 THEN DO
+            /* If there are two or more printers defined with the same model
+             * name and driver version, keep the first and last as the regular
+             * and alternate drivers; if one if them is 'Simplified', make that
+             * the regular driver by preference.
+             */
+            IF ( manufacturers.man.!printers.count.!model == _model ) & ,
+               ( manufacturers.man.!printers.count.!type  == _version ) THEN
+            DO
+                IF ( WORD( _version, 1 ) == 'Gutenprint') & ( _flag == 'Simplified') THEN DO
+                    manufacturers.man.!printers.count.!driver2 = manufacturers.man.!printers.count.!driver
+                    manufacturers.man.!printers.count.!remark2 = manufacturers.man.!printers.count.!remark
+                    manufacturers.man.!printers.count.!driver  = ppds.i
+                    manufacturers.man.!printers.count.!remark  = 'Simplified'
+                END
+                ELSE DO
+                    manufacturers.man.!printers.count.!driver2 = ppds.i
+                    IF _flag == 'Simplified' THEN
+                        manufacturers.man.!printers.count.!remark2 = 'Simplified'
+                    ELSE
+                        manufacturers.man.!printers.count.!remark2 = ''
+                END
+                ITERATE
+            END
+        END
+        count = count + 1
+        manufacturers.man.!printers.count.!model   = _model
+        manufacturers.man.!printers.count.!type    = _version
+        manufacturers.man.!printers.count.!driver  = ppds.i
+        IF _flag == 'Simplified' THEN
+            manufacturers.man.!printers.count.!remark = 'Simplified'
+        ELSE
+            manufacturers.man.!printers.count.!remark = ''
+        manufacturers.man.!printers.count.!driver2 = ''
+        manufacturers.man.!printers.count.!remark2 = ''
+        manufacturers.man.!printers.0 = count
+    END
+
+    /* Add one more category for special items ...
+     */
+    count = manufacturers.0 + 1
+    manufacturers.count.!name = '-- Custom --'
+    manufacturers.count.!printers.0 = 1
+    manufacturers.count.!printers.1.!model   = '-- Other printer (requires PPD) --'
+    manufacturers.count.!printers.1.!driver  = ''
+    manufacturers.count.!printers.1.!type    = ''
+    manufacturers.count.!printers.1.!remark  = '-- Other printer (requires PPD) --'
+    manufacturers.count.!printers.1.!driver2 = ''
+    manufacturers.count.!printers.1.!remark2 = ''
+    manufacturers.0 = count
 
 RETURN
@@ -835 +913 @@
 RETURN
 
+/*:VRX         LB_BRAND_Click
+*/
+LB_BRAND_Click: PROCEDURE EXPOSE globals. manufacturers.
+
+    CALL VRSet 'WN_MAIN', 'StatusText', ''
+
+    index = VRGet('LB_BRAND', 'Selected')
+    IF index == 0 THEN RETURN
+
+    item = VRMethod('LB_BRAND', 'GetItemData', index )
+    IF item == 0 THEN RETURN
+
+    DO i = 1 TO manufacturers.item.!printers.0
+        models.i = manufacturers.item.!printers.i.!model
+        /* ppds.i   = manufacturers.item.!printers.i.!driver */
+        IF manufacturers.item.!printers.i.!driver == '' THEN
+            ppds.i = ''
+        ELSE
+            ppds.i   = i
+
+/* DEBUG
+say 'Model:    ' manufacturers.item.!printers.i.!model
+say 'Driver:   ' manufacturers.item.!printers.i.!driver
+say '          ' manufacturers.item.!printers.i.!longname
+if manufacturers.item.!printers.i.!driver2 <> '' then
+    say 'Alternate:' manufacturers.item.!printers.i.!driver2
+if manufacturers.item.!printers.i.!longname2 <> '' then
+    say '          ' manufacturers.item.!printers.i.!longname2
+say 'Type:     ' manufacturers.item.!printers.i.!type
+say '---'
+ */
+
+    END
+    models.0 = manufacturers.item.!printers.0
+    ppds.0 = manufacturers.item.!printers.0
+
+    CALL VRSet    'LB_SELECT', 'Painting', 0
+    CALL VRMethod 'LB_SELECT', 'Clear'
+    CALL VRMethod 'LB_SELECT', 'AddStringList', 'models.',, 'ppds.'
+    CALL VRSet    'LB_SELECT', 'Painting', 1
+
+RETURN
+
+/*:VRX         LB_SELECT_Click
+*/
+LB_SELECT_Click: PROCEDURE EXPOSE globals. manufacturers.
+    SELECT
+        WHEN globals.!page == 1 THEN DO
+            CALL VRSet 'WN_MAIN', 'StatusText', ''
+
+            brand = VRGet('LB_BRAND', 'Selected')
+            IF brand == 0 THEN RETURN
+            selected = VRGet('LB_SELECT', 'Selected')
+            IF selected == 0 THEN RETURN
+            which = VRMethod('LB_SELECT', 'GetItemData', selected )
+            IF which == '' THEN RETURN
+            man = VRMethod('LB_BRAND', 'GetItemData', brand )
+            IF man == '' THEN RETURN
+
+            make  = manufacturers.man.!name
+            model = manufacturers.man.!printers.which.!model
+            driver = manufacturers.man.!printers.which.!type
+            remark = manufacturers.man.!printers.which.!remark
+            IF remark == '' THEN 
+                type = ' ('driver')'
+            ELSE
+                type = ' ('driver' - 'remark')'
+
+            CALL VRSet 'WN_MAIN', 'StatusText', make model type
+        END
+
+        OTHERWISE NOP
+    END
+
+RETURN
+
 /*:VRX         LoadSettings
 */
@@ -904 +1058 @@
 RETURN lo_name
 
+/*:VRX         PB_ABOUT_Click
+*/
+PB_ABOUT_Click: 
+    CALL SW_ABOUT_Close
+RETURN
+
 /*:VRX         PB_CANCEL_Click
 */
@@ -1014 +1174 @@
 /*:VRX         PB_NEXT_Click
 */
-PB_NEXT_Click: PROCEDURE EXPOSE globals.
+PB_NEXT_Click: PROCEDURE EXPOSE globals. manufacturers.
 
     SELECT
         WHEN globals.!page == 1 THEN DO
+            brand = VRGet('LB_BRAND', 'Selected')
+            IF brand == 0 THEN RETURN
             selected = VRGet('LB_SELECT', 'Selected')
             IF selected == 0 THEN RETURN
 
-            ppd = VRMethod('LB_SELECT', 'GetItemData', selected )
-            IF ppd == '' THEN DO
+            CALL VRSet 'WN_MAIN', 'StatusText', ''
+
+            which = VRMethod('LB_SELECT', 'GetItemData', selected )
+            IF which == '' THEN DO
                 globals.!mode = 2   /* Mode 2: user-selected PPD file */
                 ppd = VRFileDialog( VRWindow(), 'Select PPD', 'O', '*.ppd')
@@ -1031 +1195 @@
             END
             ELSE DO
+                man = VRMethod('LB_BRAND', 'GetItemData', brand )
+                IF man == '' THEN DO
+                    /* TODO display an error?  But this shouldn't be possible... */
+                    RETURN
+                END
+                ppd = manufacturers.man.!printers.which.!driver
                 globals.!mode = 1   /* Mode 1: CUPS-included model */
                 IF POS('exe://', ppd ) > 0 THEN DO
                     globals.!prt_ppd  = ''
                     globals.!prt_dev  = ppd
-                    sel_name = VRMethod('LB_SELECT', 'GetString', selected )
+                    sel_brand = VRGet('LB_BRAND', 'SelectedString')
+                    sel_name = sel_brand VRMethod('LB_SELECT', 'GetString', selected )
                     PARSE VAR sel_name _nick ' - CUPS' .
                     IF _nick == '' THEN
@@ -1051 +1222 @@
 
             CALL InitMessageLog
-            IF globals.!mode ==2 THEN
+            IF globals.!mode == 2 THEN
                 CALL LINEOUT globals.!log1, 'Starting printer install with user-provided PPD:'
             ELSE
@@ -1133 +1304 @@
 RETURN
 
+/*:VRX         PICT_ICON_Click
+*/
+PICT_ICON_Click: PROCEDURE EXPOSE globals.
+    CALL VRLoadSecondary 'SW_ABOUT', 'W'
+RETURN
+
 /*:VRX         PromptForPMName
 */
@@ -1166 +1343 @@
 /*:VRX         SetPage1
 */
-SetPage1: PROCEDURE EXPOSE globals.
-
-    CALL VRSet 'LB_SELECT',   'Visible', 1
-    CALL VRSet 'GB_INFO',     'Visible', 0
+SetPage1: PROCEDURE EXPOSE globals. manufacturers.
+
+    CALL VRSet 'LB_BRAND', 'Visible', 1
+
+    /* Resize LB_SELECT if necessary to make room for LB_BRAND */
+    lb_x = VRGet('LB_BRAND', 'Left') + VRGet('LB_BRAND', 'Width') + 60
+    lb_w = VRGet('GB_INFO', 'Width') - lb_x + VRGet('GB_INFO', 'Left')
+    CALL VRSet 'LB_SELECT', 'Left', lb_x
+    CALL VRSet 'LB_SELECT', 'Width', lb_w
+
+    CALL VRSet 'LB_SELECT', 'Visible', 1
+    CALL VRSet 'GB_INFO',   'Visible', 0
 
     globals.!page = 1
     CALL VRSet 'WN_MAIN', 'Pointer', 'WAIT'
     CALL GetCupsPrinters
+
+    CALL VRSet 'DT_INFO', 'Caption', 'Select your printer model.'
+
+    /* Populate the manufacturer list */
+    CALL VRSet 'LB_BRAND',  'Painting', 0
+    DO i = 1 TO manufacturers.0
+        addman.i = manufacturers.i.!name
+        addidx.i = i
+    END
+    addman.0 = manufacturers.0
+    addidx.0 = manufacturers.0
+    CALL VRMethod 'LB_BRAND', 'AddStringList', 'addman.',, 'addidx.'
+    CALL VRSet 'LB_BRAND',  'Painting', 1
+
     CALL VRMethod 'LB_SELECT', 'SetFocus'
     CALL VRSet 'WN_MAIN', 'Pointer', '<default>'
+
 RETURN
 
@@ -1183 +1383 @@
 
     globals.!page = 2
+    CALL VRSet 'LB_BRAND', 'Visible', 0
+    CALL VRSet 'WN_MAIN', 'StatusText', 'Selected printer: ' globals.!prt_nick 
+
+    /* Resize LB_SELECT to the full width of GB_INFO */
+    lb_x = VRGet('GB_INFO', 'Left')
+    lb_w = VRGet('GB_INFO', 'Width')
+    CALL VRSet 'LB_SELECT', 'Left', lb_x
+    CALL VRSet 'LB_SELECT', 'Width', lb_w
+
     CALL VRSet 'WN_MAIN', 'Pointer', 'WAIT'
     CALL GetCupsPorts
@@ -1223 +1432 @@
 
     globals.!page = 4
-    CALL VRSet 'LB_SELECT',   'Visible', 0
-    CALL VRSet 'GB_INFO',     'Visible', 0
-
-RETURN
+    CALL VRSet 'LB_SELECT', 'Visible',    0
+    CALL VRSet 'GB_INFO',   'Visible',    0
+    CALL VRSet 'WN_MAIN',   'StatusText', ''
+
+RETURN
+
+/*:VRX         SW_ABOUT_Close
+*/
+SW_ABOUT_Close: 
+    call SW_ABOUT_Fini
+return
+
+/*:VRX         SW_ABOUT_Create
+*/
+SW_ABOUT_Create: 
+    call SW_ABOUT_Init
+return
+
+/*:VRX         SW_ABOUT_Fini
+*/
+SW_ABOUT_Fini: 
+    window = VRInfo( "Window" )
+    call VRDestroy window
+    drop window
+return
+/*:VRX         SW_ABOUT_Init
+*/
+SW_ABOUT_Init: 
+
+    CALL VRSet 'DT_BOOTDRIVE',  'Caption', 'System boot volume:' TRANSLATE( globals.!bootdrv )
+    CALL VRSet 'DT_CUPSPATH',   'Caption', 'Local CUPS directory:' TRANSLATE( globals.!cupsdir )
+    CALL VRSet 'DT_REPOSITORY', 'Caption', 'Local driver repository:' TRANSLATE( globals.!repository )
+
+    window = VRInfo( "Object" )
+    if( \VRIsChildOf( window, "Notebook" ) ) then do
+        call VRMethod window, "CenterWindow"
+        call VRSet window, "Visible", 1
+        call VRMethod window, "Activate"
+    end
+    drop window
+return
 
 /*:VRX         SW_CREATE_Close

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

@@ -1 +1 @@
 CUPSWIZ - prototype CUPS printer-creation wizard
-Test release x
+Test release 3
 
 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.
- - The GUI is still somewhat unpolished.  All printer models are currently
-   displayed in one massive list (not broken down by manufacturer yet).
  - If your %TMP% directory has spaces in the pathname, the program will
    almost certainly fail to work properly.  The same applies to your

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
-- Split first-page printer list into manufacturer-model lists.
 - Use OS2.INI eCups::CUPS ||'\cups' for cups path if found.
 - How to support total remote CUPS (i.e. no local CUPS install)?
+- Offer the option to show both simplified/expert drivers