Attachment #1198 for bug #8279

View | Details | Raw Unified | Return to bug 8279
Collapse All | Expand All

Lines 5-13 Link Here

(-)alterator-printers-3.3/ui.orig/printers_connection.scm (-2 / +5 lines)
5		5
6	(on-next	6	(on-next
7	(case (printer-location current)	7	(case (printer-location current)
8	((0) (goto "/printers/local" 'printer-name (printer-name text)))	8	((0) (goto "/printers/local" 'printer-name (printer-name text) 'printer-description (printer-description text) ))
9	((1) (run-dialog `(/information message ,(_ "Not Implemented yet"))))	9	((1) (run-dialog `(/information message ,(_ "Not Implemented yet"))))
10	((2) (goto "/printers/samba" 'printer-name (printer-name text)))	10	((2) (goto "/printers/samba" 'printer-name (printer-name text) 'printer-description (printer-description text) ))
11	(else	11	(else
12	(run-dialog '(/error reason (_ "Strange choise"))))))	12	(run-dialog '(/error reason (_ "Strange choise"))))))
13		13
Lines 18-23 Link Here
18	(id 'printer-name (edit (or (global 'printer-name) "")	18	(id 'printer-name (edit (or (global 'printer-name) "")
19	(on-change	19	(on-change
20	(next-button enabled (not-empty-string? (printer-name text)))))))	20	(next-button enabled (not-empty-string? (printer-name text)))))))
		21	(hbox spacing 1
		22	(label (_ "Printer description:"))
		23	(id 'printer-description (edit (or (global 'printer-description) ""))))
21	(label (_"Select printer connection:"))	24	(label (_"Select printer connection:"))
22	(id 'printer-location (listbox	25	(id 'printer-location (listbox
23	sizepolicy '(expanding . fixed)	26	sizepolicy '(expanding . fixed)





(include-as-is "/dialog/functions")

(on-prev (goto "/printers/connection" 'printer-name (printer-name)
			'printer-description (global 'printer-description)))
(on-next
  (and
    (create-printer)

	    '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) "")))))


  (woo-catch
    (lambda()
      (woo-new (string-append "/cups/printers/" (printer-name))
	       'description (global 'printer-description)
               'local-port (device-name))
      #t)
    (lambda(reason)
      (run-dialog '("/printers/error")))))





(include-as-is "/dialog/functions")

(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)

(define (create-printer)
  (woo-catch
    (lambda()
      (apply woo-new (cmd-printer-name) 'description (global 'printer-description) (command-options)))
    on-create-error))

(define (get-smb-host)

Lines 7-12 Link Here

(-)alterator-printers-3.3/ui.orig/printers_summary.scm (+1 lines)
7		7
8	(on-prev (goto "/printers/vendor"	8	(on-prev (goto "/printers/vendor"
9	'printer-name (global 'printer-name)	9	'printer-name (global 'printer-name)
		10	'printer-description (global 'printer-description)
10	'prev_url (global 'prev_url)	11	'prev_url (global 'prev_url)
11	'smb-host (global 'smb-host)	12	'smb-host (global 'smb-host)
12	'smb-share (global 'smb-share)	13	'smb-share (global 'smb-share)

Lines 6-11 Link Here

(-)alterator-printers-3.3/ui.orig/printers_vendor.scm (+2 lines)
6		6
7	(on-prev (goto (global 'prev_url)	7	(on-prev (goto (global 'prev_url)
8	'printer-name (global 'printer-name)	8	'printer-name (global 'printer-name)
		9	'printer-description (global 'printer-description)
9	'prev_url (global 'prev_url)	10	'prev_url (global 'prev_url)
10	'smb-host (global 'smb-host)	11	'smb-host (global 'smb-host)
11	'smb-share (global 'smb-share)	12	'smb-share (global 'smb-share)
Lines 18-23 Link Here
18	'model-name (string-append (vendors text) " " (models text))	19	'model-name (string-append (vendors text) " " (models text))
19		20
20	'printer-name (global 'printer-name)	21	'printer-name (global 'printer-name)
		22	'printer-description (global 'printer-description)
21	'prev_url (global 'prev_url)	23	'prev_url (global 'prev_url)
22	'smb-host (global 'smb-host)	24	'smb-host (global 'smb-host)
23	'smb-share (global 'smb-share)	25	'smb-share (global 'smb-share)

Return to bug 8279

Lines 2-8 Link Here

(-)alterator-printers-3.3/ui.orig/printers_local.scm (-2 / +5 lines)
2		2
3	(include-as-is "/dialog/functions")	3	(include-as-is "/dialog/functions")
4		4
5	(on-prev (goto "/printers/connection" 'printer-name (printer-name)))	5	(on-prev (goto "/printers/connection" 'printer-name (printer-name)
		6	'printer-description (global 'printer-description)))
6	(on-next	7	(on-next
7	(and	8	(and
8	(create-printer)	9	(create-printer)
Lines 11-16 Link Here
11	'prev_url "/printers/local"	12	'prev_url "/printers/local"
12	'connection-type "Local"	13	'connection-type "Local"
13	'printer-name (printer-name)	14	'printer-name (printer-name)
		15	'printer-description (global 'printer-description)
14	'auto-vendor (or (cond-car vendor-model) "")	16	'auto-vendor (or (cond-car vendor-model) "")
15	'auto-model (or (cond-cadr vendor-model) "")))))	17	'auto-model (or (cond-cadr vendor-model) "")))))
16		18
Lines 63-69 Link Here
63	(woo-catch	65	(woo-catch
64	(lambda()	66	(lambda()
65	(woo-new (string-append "/cups/printers/" (printer-name))	67	(woo-new (string-append "/cups/printers/" (printer-name))
66	'local-port (device-name))	68	'description (global 'printer-description)
		69	'local-port (device-name))
67	#t)	70	#t)
68	(lambda(reason)	71	(lambda(reason)
69	(run-dialog '("/printers/error")))))	72	(run-dialog '("/printers/error")))))