Changeset 96 for trunk/gui/printer/cupswiz/cupswiz.VRX

Timestamp:

Jan 28, 2023, 7:56:56 PM (3 years ago)

Author:

Alex Taylor

Message:

Various updates for CUPS-PDF support

File:

• trunk/gui/printer/cupswiz/cupswiz.VRX (modified) (4 diffs)

trunk/gui/printer/cupswiz/cupswiz.VRX

@@ -485 +485 @@
     idx = VRGet('DDCB_PROTOCOL', 'Selected')
     which = VRMethod('DDCB_PROTOCOL', 'GetItemData', idx )
+    show_server = 1
     SELECT
         WHEN which == 1 THEN DO     /* IPP */
@@ -523 +524 @@
         END
         WHEN which == 6 THEN DO     /* CUPS-PDF */
-            show_queue = 0
-            show_user  = 0
-            show_pass  = 0
-            show_pick  = 0
+            show_server = 0
+            show_queue  = 0
+            show_user   = 0
+            show_pass   = 0
+            show_pick   = 0
             server_caption = 83          /* 83: Print server name: */
             queue_caption  = 84          /* 84: Printer queue name: */
@@ -546 +548 @@
     r = NLSSetText('DT_USERID', 'Caption', userid_caption )
 
+    CALL VRSet 'DT_SERVER',      'Visible', show_server
+    CALL VRSet 'EF_SERVER',      'Visible', show_server
     CALL VRSet 'DT_QUEUE',       'Visible', show_queue | show_pick
     CALL VRSet 'EF_QUEUE',       'Visible', show_queue
@@ -1570 +1574 @@
         END
         WHEN which == 6 THEN DO     /* CUPS-PDF */
-            IF server == '' THEN invalid = 1
-            ELSE DO
-                uri = 'cups-pdf://'
-            END
+            /* TODO use lpstat -v to see if cups-pdf:// exists and if so add a queue name? */
+            uri = 'cups-pdf://'
         END
         OTHERWISE DO                /* Existing CUPS */