Changeset 32 for trunk/gui

Timestamp:

May 1, 2013, 2:48:27 AM (12 years ago)

Author:

Alex Taylor

Message:

Accept a PPD as command line argument (in which case Page 1 is skipped).
Begun work on help file.

Location:

trunk/gui/printer/cupswiz

Files:

• cupswiz.VRX (modified) (5 diffs)
• cupswzen.ipf (added)
• readme.1st (modified) (1 diff)

trunk/gui/printer/cupswiz/cupswiz.VRX

@@ -1090 +1090 @@
     CALL CheckPrograms
 
-    IF InitArgs.0 > 0 THEN globals.!cupsdir = InitArgs.1
-
-    IF \VRIsDir( globals.!cupsdir ) THEN DO
-        IF TRANSLATE( globals.!cupsdir ) <> '/R' THEN
-            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.) */
-                           NLSGetMessage( 28 ), 'E'                     /* 28: CUPS Path Not Found or Not Valid */
-        globals.!cupsdir = ''
-    END
+    _force_remote = 0
+    globals.!prt_ppd = ''
+    IF InitArgs.0 > 0 THEN 
+    DO i = 1 TO InitArgs.0
+        InitArgs.i = TRANSLATE( InitArgs.i )
+        IF VRIsDir( InitArgs.i ) THEN
+            globals.!cupsdir = InitArgs.1
+        ELSE IF InitArgs.i == '/R' THEN DO
+                globals.!cupsdir = ''
+                _force_remote = 1
+        END
+        ELSE IF VRFileExists( InitArgs.i ) THEN DO
+            _filetype = VRParseFileName( InitArgs.i, 'E')
+            IF _filetype == 'PPD' THEN
+                globals.!prt_ppd = InitArgs.i
+        END
+    END
+
+    IF globals.!cupsdir == '' & \_force_remote THEN
+        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.) */
+                       NLSGetMessage( 28 ), 'E'                     /* 28: CUPS Path Not Found or Not Valid */
 
     /* Delete the error log file each time the program starts.
@@ -1540 +1553 @@
             CALL VRSet 'EF_LOCATION', 'Value', ''
             CALL VRSet 'EF_DESC',     'Value', ''
+
+            globals.!prt_ppd = ''
             CALL SetPage1
         END
@@ -1643 +1658 @@
 
     CALL VRMethod 'LB_BRAND', 'Clear'
-    CALL VRSet 'PB_NEXT',  'Enabled', 0
-    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
-    globals.!prt_ppd    = ''
-    globals.!prt_dev    = ''
-    globals.!prt_nick   = ''
     globals.!prt_port   = ''
     globals.!remotecups = ''
@@ -1665 +1666 @@
     globals.!prt_info   = ''
     globals.!os2driver  = ''
+
+    /* If a PPD was passed on the command line, skip to page 2 */
+    IF globals.!prt_ppd <> '' THEN DO
+        globals.!prt_dev  = ''
+        globals.!prt_nick = GetNameFromPPD( globals.!prt_ppd )
+        IF globals.!prt_nick == '' THEN DO
+            CALL VRMessage VRWindow(), NLSGetMessage( 76, globals.!prt_ppd  ),,     /* 76: Could not read printer name from %1. */
+                                       NLSGetMessage( 77 ), 'E'                     /* 77: Invalid PPD */
+        END
+        ELSE DO
+            globals.!mode = 2   /* Mode 2: user-selected PPD file */
+            globals.!remotecups = ''
+            CALL InitMessageLog
+            CALL LINEOUT globals.!log1, 'Starting printer install with user-provided PPD:'
+            CALL LINEOUT globals.!log1, ''
+            CALL SetPage2
+            RETURN
+        END
+    END
+
+    globals.!prt_ppd    = ''
+    globals.!prt_dev    = ''
+    globals.!prt_nick   = ''
+
+    CALL VRSet 'PB_NEXT',  'Enabled', 0
+    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
 
     CALL VRSet 'WN_MAIN', 'Pointer', 'WAIT'
@@ -1799 +1835 @@
     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, '1.02'                                  /* 12: Version %1 */
+    CALL NLSSetText 'DT_ABOUT2', 'Caption', 12, '1.04'                                  /* 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/readme.1st

@@ -1 +1 @@
 CUPSWIZ - CUPS printer-creation wizard
-Version 1.02
+Version 1.04
 
   This program is simple graphical front-end for creating CUPS-based printers