diff -Naur alterator-printers-3.3/ui.orig/printers_connection.scm alterator-printers-3.3/ui/printers_connection.scm --- alterator-printers-3.3/ui.orig/printers_connection.scm 2005-10-05 17:26:28 +0400 +++ alterator-printers-3.3/ui/printers_connection.scm 2005-10-17 15:37:02 +0400 @@ -5,9 +5,9 @@ (on-next (case (printer-location current) - ((0) (goto "/printers/local" 'printer-name (printer-name text))) + ((0) (goto "/printers/local" 'printer-name (printer-name text) 'printer-description (printer-description text) )) ((1) (run-dialog `(/information message ,(_ "Not Implemented yet")))) - ((2) (goto "/printers/samba" 'printer-name (printer-name text))) + ((2) (goto "/printers/samba" 'printer-name (printer-name text) 'printer-description (printer-description text) )) (else (run-dialog '(/error reason (_ "Strange choise")))))) @@ -18,6 +18,9 @@ (id 'printer-name (edit (or (global 'printer-name) "") (on-change (next-button enabled (not-empty-string? (printer-name text))))))) + (hbox spacing 1 + (label (_ "Printer description:")) + (id 'printer-description (edit (or (global 'printer-description) "")))) (label (_"Select printer connection:")) (id 'printer-location (listbox sizepolicy '(expanding . fixed) diff -Naur alterator-printers-3.3/ui.orig/printers_local.scm alterator-printers-3.3/ui/printers_local.scm --- alterator-printers-3.3/ui.orig/printers_local.scm 2005-08-30 20:09:06 +0400 +++ alterator-printers-3.3/ui/printers_local.scm 2005-10-17 15:38:14 +0400 @@ -2,7 +2,8 @@ (include-as-is "/dialog/functions") -(on-prev (goto "/printers/connection" 'printer-name (printer-name))) +(on-prev (goto "/printers/connection" 'printer-name (printer-name) + 'printer-description (global 'printer-description))) (on-next (and (create-printer) @@ -11,6 +12,7 @@ 'prev_url "/printers/local" 'connection-type "Local" 'printer-name (printer-name) + 'printer-description (global 'printer-description) 'auto-vendor (or (cond-car vendor-model) "") 'auto-model (or (cond-cadr vendor-model) ""))))) @@ -63,7 +65,8 @@ (woo-catch (lambda() (woo-new (string-append "/cups/printers/" (printer-name)) - 'local-port (device-name)) + 'description (global 'printer-description) + 'local-port (device-name)) #t) (lambda(reason) (run-dialog '("/printers/error"))))) diff -Naur alterator-printers-3.3/ui.orig/printers_samba.scm alterator-printers-3.3/ui/printers_samba.scm --- alterator-printers-3.3/ui.orig/printers_samba.scm 2005-07-20 16:30:31 +0400 +++ alterator-printers-3.3/ui/printers_samba.scm 2005-10-17 15:36:45 +0400 @@ -2,12 +2,14 @@ (include-as-is "/dialog/functions") -(on-prev (goto "/printers/connection" 'printer-name (printer-name))) +(on-prev (goto "/printers/connection" 'printer-name (printer-name) + 'printer-description (global 'printer-description))) (on-next (and (create-printer) (goto "/printers/vendor" 'prev_url "/printers/samba" 'printer-name (printer-name) + 'printer-description (global 'printer-description) 'smb-host (smb-host text) 'smb-share (smb-share text) 'smb-user (smb-user text) @@ -38,7 +40,7 @@ (define (create-printer) (woo-catch (lambda() - (apply woo-new (cmd-printer-name) (command-options))) + (apply woo-new (cmd-printer-name) 'description (global 'printer-description) (command-options))) on-create-error)) (define (get-smb-host) diff -Naur alterator-printers-3.3/ui.orig/printers_summary.scm alterator-printers-3.3/ui/printers_summary.scm --- alterator-printers-3.3/ui.orig/printers_summary.scm 2005-07-20 16:30:31 +0400 +++ alterator-printers-3.3/ui/printers_summary.scm 2005-10-17 15:32:38 +0400 @@ -7,6 +7,7 @@ (on-prev (goto "/printers/vendor" 'printer-name (global 'printer-name) + 'printer-description (global 'printer-description) 'prev_url (global 'prev_url) 'smb-host (global 'smb-host) 'smb-share (global 'smb-share) diff -Naur alterator-printers-3.3/ui.orig/printers_vendor.scm alterator-printers-3.3/ui/printers_vendor.scm --- alterator-printers-3.3/ui.orig/printers_vendor.scm 2005-08-30 20:09:06 +0400 +++ alterator-printers-3.3/ui/printers_vendor.scm 2005-10-17 15:32:08 +0400 @@ -6,6 +6,7 @@ (on-prev (goto (global 'prev_url) 'printer-name (global 'printer-name) + 'printer-description (global 'printer-description) 'prev_url (global 'prev_url) 'smb-host (global 'smb-host) 'smb-share (global 'smb-share) @@ -18,6 +19,7 @@ 'model-name (string-append (vendors text) " " (models text)) 'printer-name (global 'printer-name) + 'printer-description (global 'printer-description) 'prev_url (global 'prev_url) 'smb-host (global 'smb-host) 'smb-share (global 'smb-share)