Changeset 50 for trunk/gui

Timestamp:

Dec 27, 2014, 6:55:22 AM (11 years ago)

Author:

Alex Taylor

Message:

Removed debug output on /R option in CUPWIZ, plus a few minor tweaks.

Location:

trunk/gui/printer/cupswiz

Files:

• cupswiz.VRP (modified) (1 diff)
• cupswiz.VRX (modified) (5 diffs)

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: 
 RunDirectory: 
 VRXWindow: __VREMainWindow,1,614,2554,5770,9106
-VRXWindow: __VRESectionListWindow,1,675,11804,4529,3891
-VRXWindow: __VREToolsWindow,1,1686,9877,4968,1669
+VRXWindow: __VRESectionListWindow,1,687,11804,4529,3891
+VRXWindow: __VREToolsWindow,1,1686,9877,5471,1659
 VRXWindow: __VREWindListWindow,1,5228,11804,2650,3891
 UserFile: 1

trunk/gui/printer/cupswiz/cupswiz.VRX

@@ -561 +561 @@
     call VRSet window, "Visible", 0
     drop window
+
+    CALL PrintManCheckIn 'CUPSWIZ DONE'
+
 return 0
 
@@ -1136 +1139 @@
             globals.!cupsdir = InitArgs.1
         ELSE IF InitArgs.i == '/R' THEN DO
-say 'remote'
             globals.!cupsdir = ''
             _force_remote = 1
@@ -1157 +1159 @@
     IF VRFileExists( globals.!log2 ) THEN
         CALL VRDeleteFile globals.!log2
+
+    CALL PrintManCheckIn 'CUPSWIZ INIT'
 
     window = VRWindow()
@@ -1626 +1630 @@
 RETURN
 
+/*:VRX         PrintManCheckIn
+*/
+PrintManCheckIn: PROCEDURE
+    PARSE ARG data
+
+    /* This function attempts to report in to Printer Manager (if it's running)
+     * by using a named pipe.
+     */
+    IF data == '' THEN RETURN 0
+
+    npipe = '\PIPE\PRINTMAN'
+    RC_PIPE_BUSY = '231'
+
+    PARSE UPPER VALUE STREAM( npipe, 'C', 'OPEN WRITE') WITH state ':' rc .
+    IF state <> 'READY' THEN DO
+        IF rc == RC_PIPE_BUSY THEN
+            rc = SysWaitNamedPipe( npipe, 0 )
+        IF rc <> 0 THEN RETURN 0
+    END
+    CALL CHAROUT npipe, data
+    CALL STREAM npipe, 'C', 'CLOSE'
+
+RETURN 0
+
 /*:VRX         PromptForPMName
 */
@@ -1901 +1929 @@
     CALL NLSSetText 'DT_ABOUT1', 'Caption', 11                                          /* 11: eCups Printer Install Utility */
     CALL NLSSetText 'DT_ABOUT2', 'Caption', 12, '1.05'                                  /* 12: Version %1 */
-    CALL NLSSetText 'DT_ABOUT3', 'Caption', 13, '2010, 2013'                            /* 13: (C) %1 Alex Taylor */
+    CALL NLSSetText 'DT_ABOUT3', 'Caption', 13, '2010-2014'                             /* 13: (C) %1 Alex Taylor */
     CALL NLSSetText 'PB_ABOUT',  'Caption', 2                                           /* 10: Product Information */