Changeset 96 for trunk/gui/printer

Timestamp:

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

Author:

Alex Taylor

Message:

Various updates for CUPS-PDF support

Location:

trunk/gui/printer/cupswiz

Files:

• cupswiz.VRP (modified) (1 diff)
• cupswiz.VRX (modified) (4 diffs)
• cupswzen.ipf (modified) (4 diffs)
• cupswzen.mkm (modified) (1 diff)

trunk/gui/printer/cupswiz/cupswiz.VRP

@@ -7 +7 @@
 VRXWindow: __VREMainWindow,1,650,2746,5770,9106
 VRXWindow: __VRESectionListWindow,1,795,11900,4529,3891
-VRXWindow: __VREToolsWindow,1,1722,9973,5474,1669
+VRXWindow: __VREToolsWindow,1,1722,9973,5477,1659
 VRXWindow: __VREWindListWindow,1,5264,11900,2650,3891
 UserFile: 1

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 */

trunk/gui/printer/cupswiz/cupswzen.ipf

@@ -85 +85 @@
 :li.The CUPS &osq.backend&csq. (analogous to a port driver) which is
 responsible for transmitting the converted print job data to the printer,
-across the appropriate (physical or network) connection.
+across the appropriate (physical, network or virtual) connection.
 :eul.
 :p.The eCups Printer Wizard is designed to automate the configuration of all
@@ -152 +152 @@
 detected automatically.  If your network printer is not detected, select
 :hp2.Network or other printer (manual configuration):ehp2. and configure it
-manually.  (See :link reftype=hd refid=network.Configuring a network printer
-:elink. for details.)
+manually.  (See :link reftype=hd refid=network.Configuring a network or virtual
+printer:elink. for details.)
 
 :p.If you are installing a USB printer, it should appear in the list of
@@ -162 +162 @@
 .* ............................................................................
 :h2 res=310 name=network
-    x=left y=bottom width=100% height=100%.Configuring a network printer
-:p.The settings on this dialog specify how your network printer is connected.
+    x=left y=bottom width=100% height=100%.Configuring a network or virtual printer
+:p.The settings on this dialog specify how your network or virtual printer is connected.
 :p.First, you must select the type of network connection using the
-:hp2.Network protocol:ehp2. control.  The remaining options will vary
-depending on the network type.
+:hp2.Protocol:ehp2. control.  The remaining options will vary depending on
+the network type.
 :dl break=all.
 :dt.:hp2.Internet Printing Protocol (IPP):ehp2.
@@ -255 +255 @@
 in the directory specified in the file &osq.cups-pdf.conf&csq. which resides
 in the CUPS configuration directory (usually %UNIXROOT%\etc\cups).  The
-normal default location is %UNIXROOT%\var\spool\cups.  (If you specify a server
-other than the local computer, the file will be created on that server.)
+default location is %UNIXROOT%\var\spool\cups.
 :p.This option is only available if the :hp2.cups-pdf:ehp2. module is
 installed on your system.
 :edl.
-:p.All network protocols except for :hp2.Existing CUPS printer:ehp2. require
+:p.All protocols except for :hp2.Existing CUPS printer:ehp2. require
 CUPS to be installed on the local system.
 :p.Choose whichever protocol your printer (or its print server) best supports.  Consult

trunk/gui/printer/cupswiz/cupswzen.mkm

@@ -96 +96 @@
 ;
 ; Network settings dialog
-CWZ0080I: Network Printer
-CWZ0081I: Network protocol:
+CWZ0080I: Network or Virtual Printer
+CWZ0081I: Protocol:
 CWZ0082I: Printer or server address:
 CWZ0083I: Print server name: