[ocrfeeder] Do not ask for scanners if only one is available
- From: Joaquim Manuel Pereira Rocha <jrocha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ocrfeeder] Do not ask for scanners if only one is available
- Date: Sun, 1 Aug 2010 17:35:32 +0000 (UTC)
commit b0dbc7a3f55be716343ee397c5c2d417d2230cef
Author: Joaquim Rocha <jrocha igalia com>
Date: Sun Aug 1 19:30:31 2010 +0200
Do not ask for scanners if only one is available
studio/studioBuilder.py | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/studio/studioBuilder.py b/studio/studioBuilder.py
index c943ae1..e0516f4 100644
--- a/studio/studioBuilder.py
+++ b/studio/studioBuilder.py
@@ -183,7 +183,7 @@ class Studio:
def __obtainScannersFinishedCb(self, dialog, devices, error):
dialog.destroy()
device = None
- if devices:
+ if len(devices) > 1:
scanner_chooser_dialog = widgetPresenter.ScannerChooserDialog(\
self.main_window.window,
devices)
@@ -195,14 +195,16 @@ class Studio:
device = scanner_chooser_dialog.getSelectedDevice()
else:
return
- if device:
- dialog_scan = widgetPresenter.QueuedEventsProgressDialog(\
- self.main_window.window)
- item_scan = AsyncItem(lib.scan,((device.pop(),)),
- self.__scanFinishedCb,(dialog_scan,))
- info_scan = (_('Scanning'), _('Please wait...'))
- dialog_scan.setItemsList([(info_scan, item_scan)])
- dialog_scan.run()
+ elif len(devices) == 1:
+ device = devices[0][0]
+ if device:
+ dialog_scan = widgetPresenter.QueuedEventsProgressDialog(\
+ self.main_window.window)
+ item_scan = AsyncItem(lib.scan,(device,),
+ self.__scanFinishedCb,(dialog_scan,))
+ info_scan = (_('Scanning'), _('Please waitâ?¦'))
+ dialog_scan.setItemsList([(info_scan, item_scan)])
+ dialog_scan.run()
else:
error = widgetPresenter.SimpleDialog(\
_("No scanner devices were found"),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]