Changeset 16 for trunk/gui/printer

Timestamp:

Oct 14, 2012, 2:03:22 AM (13 years ago)

Author:

Alex Taylor

Message:

Should now fail gracefully (instead of crashing) if no PM printer drivers are found. Also fixed typo causing syntax error in SW_MODEL_Init.

Location:

trunk/gui/printer/cupswiz

Files:

• cupswiz.VRX (modified) (3 diffs)
• cupswiz.VRY (modified) ( previous)

trunk/gui/printer/cupswiz/cupswiz.VRX

@@ -300 +300 @@
 
     /* Now create the OS/2 printer object */
-    IF create_os2 == 1 THEN DO
+    IF create_os2 == 1 & globals.!os2driver <> '' THEN DO
 
         /* Make sure the presentation driver supports the printer */
@@ -1644 +1644 @@
         CALL VRSet 'DDCB_PRESDRV', 'Selected', def_idx
     END
+    ELSE DO
+        CALL VRMessage VRWindow(), 'No eCups-compatible OS/2 presentation drivers are installed.',
+                       '0d0a0d0a'x || 'Please install the ECUPS or ECUPS-HP printer driver before continuing.',,
+                       'Missing PM Driver', 'E'
+        CALL VRSet 'PB_CREATEOK', 'Enabled', 0
     /* TODO give an error if no drivers were found */
+    END
 
     window = VRInfo( "Object" )
@@ -1688 +1694 @@
     ok = VRMethod( "LB_OS2MODELS", "AddStringList", "models.",  )
     IF best > 0 THEN
-        CALL VRSet 'LP_OS2MODELS', 'Selected', best
+        CALL VRSet 'LB_OS2MODELS', 'Selected', best
 
     CALL VRSet 'DT_MODEL1', 'Caption',,