Changeset 38 for trunk/gui/shared

Timestamp:

May 8, 2013, 5:56:26 PM (13 years ago)

Author:

Alex Taylor

Message:

Printer Manager: various fixes & updates.

Location:

trunk/gui/shared

Files:

• PrManUtl.VRS (modified) (2 diffs)
• PrintUtl.VRS (modified) (3 diffs)

trunk/gui/shared/PrManUtl.VRS

@@ -491 +491 @@
         CALL VRSetIni 'PM_SPOOLER_DD', driver'.'model, driver'.DRV;;;'||'00'x, 'SYSTEM'
     END
+RETURN ok
+
+/*:VRX         DeletePrintDriver
+*/
+/* Removes (that is to say, de-registers with the spooler) a PM printer
+ * device driver/model.
+ *
+ *   driver     - The name of the printerpak driver (without path or extension)
+ *   model      - The printer make/model name used by the driver
+ *
+ * Returns: 0 on success, 1 on error
+ */
+DeletePrintDriver: PROCEDURE EXPOSE globals.
+    PARSE ARG driver, model
+
+    ok = VRDelIni('PM_SPOOLER_DD', driver'.'model, 'SYSTEM')
 RETURN ok
 
@@ -807 +823 @@
 RETURN success
 
+/*:VRX         StringTokenize
+*/
+StringTokenize:
+    PARSE ARG string, separator, __stem
+    CALL __StringTokenize string, separator, __stem
+    DROP __stem
+RETURN
+
+/*:VRX         __StringTokenize
+*/
+__StringTokenize: PROCEDURE EXPOSE (__stem)
+    PARSE ARG string, separator, tokens
+
+    /* Note: this differs slightly from my usual implementation in that
+     * each token is STRIPped of leading and trailing spaces.
+     */
+
+    IF ( string = '') THEN RETURN string
+    IF ( separator = '') THEN separator = ' '
+
+    i = 0
+    CALL VALUE tokens || '0', i
+    DO WHILE LENGTH( string ) > 0
+        x = 1
+        y = POS( separator, string, x )
+        IF y > 0 THEN DO
+            current = SUBSTR( string, 1, y-1 )
+            x = y + 1
+            i = i + 1
+            CALL VALUE tokens || 'i', STRIP( current )
+        END
+        ELSE DO
+            current = STRIP( string, 'B', separator )
+            i = i + 1
+            CALL VALUE tokens || 'i', STRIP( current )
+            x = LENGTH( string ) + 1
+        END
+        string = SUBSTR( string, x )
+    END
+    CALL VALUE tokens || '0', i
+
+RETURN
+

trunk/gui/shared/PrintUtl.VRS

@@ -182 +182 @@
     printer_name = TRANSLATE( printer_name, '_', '.')
 
-    printer_drv = globals.!bootdrv'\OS2\DLL\'driver_name'\'driver_name'.DRV'
+    printer_drv = globals.!os2dir'\DLL\'driver_name'\'driver_name'.DRV'
     /* ?? TODO: install driver_name if not found (prompt first) ?? */
 
@@ -535 +535 @@
             WHEN LEFT( line, 18 ) == '*StpResolutionMap:' THEN NOP
             WHEN LEFT( line, 14 ) == '*OPOptionHints'     THEN NOP
+            WHEN LEFT( line, 4 ) ==  '*da.'               THEN NOP
             WHEN LEFT( line, 4 ) ==  '*de.'               THEN NOP
             WHEN LEFT( line, 4 ) ==  '*es.'               THEN NOP
+            WHEN LEFT( line, 4 ) ==  '*fi.'               THEN NOP
             WHEN LEFT( line, 4 ) ==  '*fr.'               THEN NOP
             WHEN LEFT( line, 4 ) ==  '*it.'               THEN NOP
             WHEN LEFT( line, 4 ) ==  '*ja.'               THEN NOP
             WHEN LEFT( line, 4 ) ==  '*ko.'               THEN NOP
+            WHEN LEFT( line, 4 ) ==  '*nb.'               THEN NOP
             WHEN LEFT( line, 4 ) ==  '*nl.'               THEN NOP
             WHEN LEFT( line, 4 ) ==  '*pt.'               THEN NOP
@@ -581 +584 @@
     PARSE UPPER ARG driver_name, printer_name
     printer_name = TRANSLATE( printer_name, '_', '.')
-    printer_drv = globals.!bootdrv'\OS2\DLL\'driver_name'\'driver_name'.DRV'
+    printer_drv = globals.!os2dir'\DLL\'driver_name'\'driver_name'.DRV'
     models.0 = 0