Changeset 46 for trunk/gui/printer

Timestamp:

Sep 18, 2013, 1:10:45 AM (12 years ago)

Author:

Alex Taylor

Message:

Minor improvement to allow deleting a broken printer object.

File:

• trunk/gui/printer/manager/PRINTOOL.VRX (modified) (11 diffs)

trunk/gui/printer/manager/PRINTOOL.VRX

@@ -119 +119 @@
         IF cups_pdr == '' THEN DO
             cups_pdr = STREAM( globals.!bootdrv'\OS2\DLL\CUPS.PDR', 'C', 'QUERY EXISTS')
-            IF cups_pdr <> '' THEN CALL VRSetIni('PM_PORT_DRIVER', 'CUPS', cups_pdr, 'System')
+            IF cups_pdr <> '' THEN CALL VRSetIni 'PM_PORT_DRIVER', 'CUPS', cups_pdr, 'System'
         END
         IF cups_pdr <> '' THEN
@@ -158 +158 @@
 /*:VRX         CN_DEVICES_KeyPress
 */
-CN_DEVICES_KeyPress: 
+CN_DEVICES_KeyPress:
     IF VRGet('CN_DEVICES', 'KeyString') == '{Backtab}' THEN
         CALL VRMethod 'TDL_MAIN', 'SetFocus'
@@ -180 +180 @@
 /*:VRX         CN_PORTS_KeyPress
 */
-CN_PORTS_KeyPress: 
+CN_PORTS_KeyPress:
     IF VRGet('CN_PORTS', 'KeyString') == '{Backtab}' THEN
         CALL VRMethod 'TDL_MAIN', 'SetFocus'
@@ -226 +226 @@
 /*:VRX         CN_PRINTERS_KeyPress
 */
-CN_PRINTERS_KeyPress: 
+CN_PRINTERS_KeyPress:
     IF VRGet('CN_PRINTERS', 'KeyString') == '{Backtab}' THEN
         CALL VRMethod 'TDL_MAIN', 'SetFocus'
@@ -1365 +1365 @@
 /*:VRX         PB_DEVICE_REMOVE_KeyPress
 */
-PB_DEVICE_REMOVE_KeyPress: 
+PB_DEVICE_REMOVE_KeyPress:
     IF VRGet('PB_DEVICE_REMOVE', 'KeyString') == '{Tab}' THEN
         CALL VRMethod 'TDL_MAIN', 'SetFocus'
@@ -1479 +1479 @@
 /*:VRX         PB_PORT_EDIT_Click
 */
-PB_PORT_EDIT_Click: 
+PB_PORT_EDIT_Click:
     CALL PortProperties
 return
@@ -1485 +1485 @@
 /*:VRX         PB_PORT_EDIT_KeyPress
 */
-PB_PORT_EDIT_KeyPress: 
+PB_PORT_EDIT_KeyPress:
     IF VRGet('PB_PORT_EDIT', 'KeyString') == '{Tab}' THEN
         CALL VRMethod 'TDL_MAIN', 'SetFocus'
@@ -1641 +1641 @@
 /*:VRX         PB_PRINTER_EDIT_Click
 */
-PB_PRINTER_EDIT_Click: 
+PB_PRINTER_EDIT_Click:
     CALL PrinterProperties
 RETURN
@@ -1647 +1647 @@
 /*:VRX         PB_PRINTER_EDIT_KeyPress
 */
-PB_PRINTER_EDIT_KeyPress: 
+PB_PRINTER_EDIT_KeyPress:
     IF VRGet('PB_PRINTER_EDIT', 'KeyString') == '{Tab}' THEN
         CALL VRMethod 'TDL_MAIN', 'SetFocus'
@@ -1773 +1773 @@
     success = 0
     _title = VRMethod('CN_PRINTERS', 'GetFieldData', record, globals.!hcfPrinters.!title )
+    _device= VRMethod('CN_PRINTERS', 'GetFieldData', record, globals.!hcfPrinters.!name )
     _queue = VRMethod('CN_PRINTERS', 'GetFieldData', record, globals.!hcfPrinters.!queue )
     _port  = VRMethod('CN_PRINTERS', 'GetFieldData', record, globals.!hcfPrinters.!port )
@@ -1781 +1782 @@
     _confirm = VRMessage('WN_MAIN', NLSGetMessage( 201, _title ), NLSGetMessage( 200 ), 'Q', '_btns.', 2, 2 )
     IF _confirm == 1 THEN DO
-        success = RPUPrinterDelete( _queue )
+        IF _queue == '' THEN 
+            success = RPUDeviceDelete( _device )
+        ELSE
+            success = RPUPrinterDelete( _queue )
         CALL RPUPortInfo _port, 'port.'
         IF port.!driver == 'CUPS' THEN DO