← Back to branch summary

~ubuntu-branches/ubuntu/raring/hplip/raring

« back to all changes in this revision

Viewing changes to ui/scrollcopy.py

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2012-10-06 15:03:44 UTC
  • mfrom: (1.6.1) (20.1.16 quantal)
  • Revision ID: package-import@ubuntu.com-20121006150344-2p3xz26br0t3hu2q
Tags: 3.12.10-1
http://bugs.debian.org/683033
http://bugs.debian.org/687129
* New upstream release
  - Fixes "Network scanning fails (Closes: #683033)
* quilt refresh hplip-syslog-fix-debug-messages-to-error.dpatch
* Fix "error in clean build env" updated debian/rules (Closes: #687129)

Show diffs side-by-side

added added

removed removed

Lines of Context:
ui/scrollcopy.py
66
66
            if self.quality is None:
67
67
                result_code, self.quality = self.dev.getPML(pml.OID_COPIER_QUALITY)
68
68
 
69
 
            if self.scan_style == SCAN_STYLE_FLATBED and self.fit_to_page is None:
 
69
            if self.scan_src == SCAN_SRC_FLATBED and self.fit_to_page is None:
70
70
                result_code, self.fit_to_page = self.dev.getPML(pml.OID_COPIER_FIT_TO_PAGE)
71
71
 
72
72
                if result_code != pml.ERROR_OK:
76
76
            else:
77
77
                self.fit_to_page = pml.COPIER_FIT_TO_PAGE_DISABLED
78
78
 
79
 
            if self.scan_style != SCAN_STYLE_FLATBED:
 
79
            if self.scan_src != SCAN_SRC_FLATBED:
80
80
                self.fitToPageCheckBox.setEnabled(False)
81
81
 
82
82
            result_code, self.max_reduction = self.dev.getPML(pml.OID_COPIER_REDUCTION_MAXIMUM)
161
161
                s = 'Disabled' # 1
162
162
 
163
163
            log.debug("Default Fit to page: %s (%s)" % (self.fit_to_page, s))
164
 
            log.debug("Scan style (models.dat: scan-style): %d" % self.scan_style)
 
164
            log.debug("Scan src (models.dat: scan-src): %d" % self.scan_src)
165
165
 
166
166
        finally:
167
167
            self.dev.closePML()
200
200
        self.dev = copier.PMLCopyDevice(device_uri=self.cur_device.device_uri,
201
201
                                        printer_name=self.cur_printer)
202
202
 
203
 
        self.scan_style = self.dev.mq.get('scan-style', SCAN_STYLE_FLATBED)
 
203
        self.scan_src = self.dev.mq.get('scan-src', SCAN_SRC_FLATBED)
204
204
        self.copy_type = self.dev.mq.get('copy-type', COPY_TYPE_DEVICE)
205
205
 
206
 
        if self.scan_style == SCAN_STYLE_SCROLLFED:
 
206
        if self.scan_src == SCAN_SRC_SCROLLFED:
207
207
            self.fitToPageCheckBox.setEnabled(False)
208
208
            self.fit_to_page = pml.COPIER_FIT_TO_PAGE_DISABLED
209
209
 
524
524
                s = 'Disabled' # 1
525
525
 
526
526
            log.debug("Fit to page: %s (%s)" % (self.fit_to_page, s))
527
 
            log.debug("Scan style: %d" % self.scan_style)
 
527
            log.debug("Scan src: %d" % self.scan_src)
528
528
 
529
529
            # Open the dialog box.
530
530
            #
536
536
            self.copy_timer.start(1000) # 1 sec UI updates
537
537
 
538
538
            self.dev.copy(self.num_copies, self.contrast, self.reduction,
539
 
                          self.quality, self.fit_to_page, self.scan_style,
 
539
                          self.quality, self.fit_to_page, self.scan_src,
540
540
                          self.update_queue, self.event_queue)
541
541
 
542
542
        finally: