Changeset 23 for trunk/gui/printer/cupswiz/cupswiz.VRX

Timestamp:

Mar 20, 2013, 3:47:17 PM (13 years ago)

Author:

Alex Taylor

Message:

Fix bug in return code processing when creating OS/2 printer.

File:

• trunk/gui/printer/cupswiz/cupswiz.VRX (modified) (6 diffs)

trunk/gui/printer/cupswiz/cupswiz.VRX

@@ -251 +251 @@
         CALL VRMessage VRWindow(),,
                        NLSGetMessage( 62 ),,        /* 62: The installed version of CUPS.PDR appears to be out of date.  As a result, the desktop printer will not be usable until the desktop is restarted. */
-                       NLSGetMessage( 58 ), 'W'     /* 58: Port Driver Problem */ 
+                       NLSGetMessage( 58 ), 'W'     /* 58: Port Driver Problem */
     END
 
@@ -875 +875 @@
      */
     target = VRParseFilePath( driver_path, 'DP')
-    CALL LINEOUT globals.!log1, 'Copying files from' workdir'\OUT to' target 
+    CALL LINEOUT globals.!log1, 'Copying files from' workdir'\OUT to' target
     ADDRESS CMD '@UNLOCK' target'\'driver'.DRV 2>NUL 1>NUL'
     ok = VRCopyFile( workdir'\OUT\'driver'.DRV', target'\'driver'.DRV')
@@ -934 +934 @@
     IF \VRIsDir( globals.!cupsdir ) THEN DO
         IF TRANSLATE( globals.!cupsdir ) <> '/R' THEN
-            CALL VRMessage VRWindow(), 
+            CALL VRMessage VRWindow(),
                            NLSGetMessage( 65, 'CUPSWIZ F:\CUPS') ||,    /* 65: CUPS could not be located ... on the command line to this program (e.g "%1"). */
                            '0d0a0d0a'x || NLSGetMessage( 66 ),,         /* 66: Only remote CUPS queues ... start this program with the /R parameter.) */
@@ -1638 +1638 @@
     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.98'                                  /* 12: Version %1 */
+    CALL NLSSetText 'DT_ABOUT2', 'Caption', 12, '0.99'                                  /* 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 */
 
-    CALL NLSSetText 'DT_BOOTDRIVE',  'Caption', 14, TRANSLATE( globals.!bootdrv )       /* 14: System boot volume: %1 */ 
-    CALL NLSSetText 'DT_CUPSPATH',   'Caption', 15, TRANSLATE( globals.!cupsdir )       /* 15: Local CUPS directory: %1 */ 
+    CALL NLSSetText 'DT_BOOTDRIVE',  'Caption', 14, TRANSLATE( globals.!bootdrv )       /* 14: System boot volume: %1 */
+    CALL NLSSetText 'DT_CUPSPATH',   'Caption', 15, TRANSLATE( globals.!cupsdir )       /* 15: Local CUPS directory: %1 */
     CALL NLSSetText 'DT_REPOSITORY', 'Caption', 16, TRANSLATE( globals.!repository )    /* 16: Local driver repository: %1 */
 
@@ -1730 +1730 @@
     ELSE DO                                             /* 112: No eCups-compatible OS/2 presentation drivers are installed. */
                                                         /* 113: Please install the ECUPS or ECUPS-HP printer driver before continuing. */
-        CALL VRMessage VRWindow(), 
-                       NLSGetMessage( 112 ) || '0d0a0d0a'x || NLSGetMessage( 113 ),,  
+        CALL VRMessage VRWindow(),
+                       NLSGetMessage( 112 ) || '0d0a0d0a'x || NLSGetMessage( 113 ),,
                        NLSGetMessage( 114 ), 'E'                                        /* 114: Missing PM Driver */
         CALL VRSet 'PB_CREATEOK', 'Enabled', 0
@@ -1783 +1783 @@
         CALL VRSet 'LB_OS2MODELS', 'Selected', best
 
-    CALL NLSSetText 'DT_MODEL1', 'Caption',, 
+    CALL NLSSetText 'DT_MODEL1', 'Caption',,
                     121, globals.!prt_nick, globals.!os2driver      /* 121: The printer "%1" could not ... to applications. */
     CALL NLSSetText 'DT_MODEL2', 'Caption', 122                     /* 122: You can select one of ... use a generic driver. */