Changeset 58 for trunk/gui/printer/manager

Timestamp:

Jul 15, 2017, 1:19:09 PM (8 years ago)

Author:

Alex Taylor

Message:

Incremented version to 0.7.
Fix population of shipped driver list when opening Install Driver dialog.
Fix installation of non-PostScript drivers from Drivers tab (parsing of DFFF EA type).
Refresh properly when deleting the only printer, driver, or port.
Add 'ArcaOS' to branding logic.
Added more logging (still needs work).

Location:

trunk/gui/printer/manager

Files:

• PRINTOOL.VRP (modified) (1 diff)
• PRINTOOL.VRX (modified) (22 diffs)
• PRINTOOL.VRY (modified) ( previous)

trunk/gui/printer/manager/PRINTOOL.VRP

@@ -4 +4 @@
 MacroPath: VRM:E:\DEVELOPMENT\VXREXX\Projects\PrintTool
 EXEPath: E:\Development\VXREXX\Projects\PrintTool\PRINTMAN.EXE
-RunParameters: 
+RunParameters: /D
 RunDirectory: 
-VRXWindow: __VREMainWindow,1,506,4095,6697,8046
-VRXWindow: __VRESectionListWindow,1,614,16044,4204,4059
-VRXWindow: __VREToolsWindow,1,638,14309,5469,1665
-VRXWindow: __VREWindListWindow,1,4854,16044,3505,4059
+VRXWindow: __VREMainWindow,1,687,4192,6697,8046
+VRXWindow: __VRESectionListWindow,1,795,16044,4204,4059
+VRXWindow: __VREToolsWindow,1,819,14309,5469,1661
+VRXWindow: __VREWindListWindow,1,5035,16044,3505,4059
 UserFile: 1
 UserWindow: WN_MAIN,1

trunk/gui/printer/manager/PRINTOOL.VRX

@@ -277 +277 @@
 */
 DDCB_DEVICE_3RDPARTY_Click: PROCEDURE EXPOSE globals. shipped.
+    IF VRGet('DDCB_DEVICE_3RDPARTY', 'Enabled') == 0 THEN RETURN
+
     new_path = TRANSLATE( STRIP( VRGet('DDCB_DEVICE_3RDPARTY', 'SelectedString')))
     IF new_path == '' THEN RETURN
@@ -289 +291 @@
 */
 DDCB_DEVICE_3RDPARTY_Verify: PROCEDURE EXPOSE globals. shipped.
+    IF VRGet('DDCB_DEVICE_3RDPARTY', 'Enabled') == 0 THEN RETURN
+
     old_path = VRGet('DDCB_DEVICE_3RDPARTY', 'UserData')
     new_path = TRANSLATE( STRIP( VRGet('DDCB_DEVICE_3RDPARTY', 'Value')))
@@ -363 +367 @@
     IF _confirm == 1 THEN DO
         success = DeletePrintDriver( _driver, _name )
+        CALL LINEOUT globals.!log1, 'Deleting installed driver' device_name':' success
         IF success == 1 THEN CALL RefreshDevices
+
         /* TODO check if any other _driver definitions exist and if not, offer to delete _driver files & profile */
     END
@@ -382 +388 @@
     IF globals.!prdrv  == '' THEN RETURN 0
 
-    IF globals.!is_ecs == 1 THEN _osname = 'eComStation'
+    IF globals.!oem_os == 1 THEN _osname = 'eComStation'
+    ELSE IF globals.!oem_os == 2 THEN _osname = 'ArcaOS'
     ELSE _osname = 'OS/2'
 
@@ -499 +506 @@
     shipped.0 = count
     CALL VRSortStem 'shipped.'
+
+    CALL LINEOUT globals.!log1, 'Enumerated' count 'shipped printer devices.'
 
 RETURN count
@@ -902 +911 @@
 LoadSettings: PROCEDURE EXPOSE globals.
 
-    globals.!version = '0.61'
+    globals.!version = '0.7'
     globals.!copyright = '2013-2017'
 
@@ -960 +969 @@
     /* Determine the OS.
      */
+    globals.!oem_os = 0
+    oem_osdir = VALUE('OSDIR',,'OS2ENVIRONMENT')
+    IF oem_osdir == '' THEN oem_osdir = globals.!os2dir
     IF VRFileExists( globals.!os2dir'\INSTALL\SYSLEVEL.ECS') THEN
-        globals.!is_ecs = 1
-    ELSE
-        globals.!is_ecs = 0
+        globals.!oem_os = 1
+    IF VRFileExists( oem_osdir'\INSTALL\INSTALL.FLG') THEN DO
+        PARSE VALUE LINEIN( oem_osdir'\INSTALL\INSTALL.FLG') WITH p_os p_release p_nlv .
+        CALL STREAM oem_osdir'\INSTALL\INSTALL.FLG', 'C', 'CLOSE'
+        IF p_os == 'ArcaOS' THEN globals.!oem_os = 2
+    END
 
     globals.!create_mode = ''
@@ -1801 +1816 @@
     _confirm = VRMessage('WN_MAIN', NLSGetMessage( 202, _name ), NLSGetMessage( 200 ), 'Q', '_btns.', 2, 2 )
     IF _confirm == 1 THEN DO
+        CALL LINEOUT globals.!log1, 'Deleting port' _name
         success = RPUPortDelete( _name )
-        IF success == 1 THEN CALL RefreshPorts
+        IF success <> 1 THEN CALL LINEOUT globals.!log1, 'Error deleting port:' RPUERROR
+        CALL RefreshPorts
     END
 
@@ -1851 +1868 @@
     _confirm = VRMessage('WN_MAIN', NLSGetMessage( 201, _title ), NLSGetMessage( 200 ), 'Q', '_btns.', 2, 2 )
     IF _confirm == 1 THEN DO
-        IF _queue == '' THEN
+
+        IF _queue == '' THEN DO
+            CALL LINEOUT globals.!log1, 'Printer' _device '(no queue) will be deleted.'
             success = RPUDeviceDelete( _device )
-        ELSE
+        END
+        ELSE DO
+            CALL LINEOUT globals.!log1, 'Printer' _device 'with queue' _queue 'will be deleted.'
             success = RPUPrinterDelete( _queue )
+        END
+        CALL LINEOUT globals.!log1, 'Deletion status:' success
+
         CALL RPUPortInfo _port, 'port.'
         IF port.!driver == 'CUPS' THEN DO
@@ -1866 +1890 @@
                 PARSE VAR _cups_queue cups_queue '00'x .
                 IF ( TRANSLATE( cups_host ) == 'LOCALHOST') | cups_host = '127.0.0.1' THEN DO
+                    CALL LINEOUT globals.!log1, 'Printer points to local CUPS queue' cups_queue 'via port:' _port
                     _confirm = VRMessage('WN_MAIN', NLSGetMessage( 204, _title, cups_queue, _port ),,
                                           NLSGetMessage( 200 ), 'Q', '_btns.', 2, 2 )
                     IF _confirm == 1 THEN DO
+                        CALL LINEOUT globals.!log1, 'Deleting CUPS printer' cups_queue 'on host' cups_host'.'
                         success = CupsDeletePrinter( cups_host, cups_queue )
+                        CALL LINEOUT globals.!log1, 'CUPS deletion status:' success
                         IF success == 0 THEN DO
                             CALL RPUPortDelete _port
@@ -2040 +2067 @@
 
     ok = RPUEnumDrivers('drivers.')
+    CALL LINEOUT globals.!log1, 'Enumerating drivers:' ok
+
+    CALL VRSet 'CN_DEVICES', 'Painting', 0
+    CALL VRMethod 'CN_DEVICES', 'RemoveRecord', 'All'
+
     IF rc <> 0 THEN DO
-        CALL VRSet 'CN_DEVICES', 'Painting', 0
-        CALL VRMethod 'CN_DEVICES', 'RemoveRecord', 'All'
+        CALL LINEOUT globals.!log1, drivers.0 'drivers found.'
         DO i = 1 TO drivers.0
             PARSE VAR drivers.i _pdrv'.'_model
@@ -2056 +2087 @@
         DROP drivers.
         DROP driverinfo.
-        CALL VRSet 'CN_DEVICES', 'Painting', 1
-    END
+    END
+    CALL VRSet 'CN_DEVICES', 'Painting', 1
 
 RETURN
@@ -2066 +2097 @@
 
     ok = RPUEnumPorts('ports.')
+    CALL LINEOUT globals.!log1, 'Enumerating ports:' ok
+
+    CALL VRSet 'CN_PORTS', 'Painting', 0
+    CALL VRMethod 'CN_PORTS', 'RemoveRecord', 'All'
+
     IF rc <> 0 THEN DO
-        CALL VRSet 'CN_PORTS', 'Painting', 0
-        CALL VRMethod 'CN_PORTS', 'RemoveRecord', 'All'
+        CALL LINEOUT globals.!log1, ports.0 'ports found.'
         DO i = 1 TO ports.0
             PARSE VAR ports.i _name _driver _path
@@ -2096 +2131 @@
         DROP ports.
         DROP portinfo.
-        CALL VRSet 'CN_PORTS', 'Painting', 1
-    END
+    END
+    CALL VRSet 'CN_PORTS', 'Painting', 1
 
 RETURN
@@ -2105 +2140 @@
 RefreshPrinters: PROCEDURE EXPOSE globals.
     ok = RPUEnumPrinters('printers.')
+    CALL LINEOUT globals.!log1, 'Enumerating printers:' ok
+
+    CALL VRSet 'CN_PRINTERS', 'Painting', 0
+    CALL VRMethod 'CN_PRINTERS', 'RemoveRecord', 'All'
+
     IF ok <> 0 THEN DO
-        CALL VRSet 'CN_PRINTERS', 'Painting', 0
-        CALL VRMethod 'CN_PRINTERS', 'RemoveRecord', 'All'
+        CALL LINEOUT globals.!log1, printers.0 'printers found.'
 
         DO i = 1 TO printers.0
@@ -2145 +2184 @@
         DROP details.
 
-        CALL VRSet 'CN_PRINTERS', 'Painting', 1
-    END
+    END
+    CALL VRSet 'CN_PRINTERS', 'Painting', 1
 
 RETURN
@@ -2159 +2198 @@
 
     IF VRGet('RB_DEVICE_SHIPPED', 'Set') == 1 THEN DO
+        CALL LINEOUT globals.!log1, 'Refreshing shipped driver list ('shipped.0' devices).'
         CALL VRMethod 'CN_DEVICE_LIST', 'AddRecordList',,, 'shipped.'
     END
@@ -2165 +2205 @@
             driver_path = TRANSLATE( STRIP( VRGet('DDCB_DEVICE_3RDPARTY', 'Value')))
         IF driver_path <> '' THEN DO
+            CALL LINEOUT globals.!log1, 'Refreshing third-party driver list for' driver_path'.'
             drivers.0 = 0
             _total = 0
@@ -2209 +2250 @@
      */
     execPath = VRGet('Application', 'Program')
-    execDir  = VRParseFileName( execPath, 'DP')
+    IF execPath <> '' THEN
+        execDir  = VRParseFileName( execPath, 'DP')
+    ELSE
+        execDir = DIRECTORY()
 
     /*
@@ -2320 +2364 @@
 SW_ABOUT_Init: PROCEDURE EXPOSE globals.
 
-    IF globals.!is_ecs == 1 THEN
+    IF globals.!oem_os == 1 THEN
         _platform = 'eComStation'
     ELSE
@@ -2383 +2427 @@
     fld_driver = VRMethod('CN_DEVICE_LIST', 'AddField', 'String', NLSGetMessage( 266 ), 'DRIVER')
 
-    IF globals.!is_ecs == 1 THEN
+    IF globals.!oem_os == 1 THEN
         _platform = 'eComStation'
+    ELSE IF globals.!oem_os == 2 THEN
+        _platform = 'ArcaOS'
     ELSE
         _platform = 'OS/2'
@@ -2430 +2476 @@
 
     IF GetShippedDrivers() > 0 THEN DO
-/*        CALL VRMethod 'CN_DEVICE_LIST', 'AddRecordList',,, 'shipped.' */
+/*
+        CALL VRSet 'RB_DEVICE_SHIPPED', 'Set', 1
+*/
+        CALL VRMethod 'CN_DEVICE_LIST', 'AddRecordList',,, 'shipped.'
     END