From 950a3a656c544b76b75ef60e27bcfd00bcb9b3d6 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 20 Oct 2014 15:33:25 +0530 Subject: [PATCH] Use a dedicated icon for metadata downloading --- imgsrc/download-metadata.svg | 1 + resources/images/download-metadata.png | Bin 0 -> 2711 bytes src/calibre/gui2/actions/edit_metadata.py | 17 +++++++++-------- src/calibre/gui2/metadata/bulk_download.py | 4 ++-- src/calibre/gui2/metadata/single_download.py | 2 +- 5 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 imgsrc/download-metadata.svg create mode 100644 resources/images/download-metadata.png diff --git a/imgsrc/download-metadata.svg b/imgsrc/download-metadata.svg new file mode 100644 index 0000000000..d5c8e2b21c --- /dev/null +++ b/imgsrc/download-metadata.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/images/download-metadata.png b/resources/images/download-metadata.png new file mode 100644 index 0000000000000000000000000000000000000000..454f4bf56708ccc581d08f51c6a9c586a6eb7227 GIT binary patch literal 2711 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 literal 0 HcmV?d00001 diff --git a/src/calibre/gui2/actions/edit_metadata.py b/src/calibre/gui2/actions/edit_metadata.py index 4dad0edf12..5b2a3d956d 100644 --- a/src/calibre/gui2/actions/edit_metadata.py +++ b/src/calibre/gui2/actions/edit_metadata.py @@ -159,14 +159,15 @@ class EditMetadataAction(InterfaceAction): failed_ids.union(failed_covers)) review_apply = partial(self.apply_downloaded_metadata, True) normal_apply = partial(self.apply_downloaded_metadata, False) - self.gui.proceed_question(normal_apply, payload, - log_file, _('Download log'), _('Download complete'), msg, - det_msg=det_msg, show_copy_button=show_copy_button, - cancel_callback=partial(self.cleanup_bulk_download, tdir), - log_is_file=True, checkbox_msg=checkbox_msg, - checkbox_checked=False, action_callback=review_apply, - action_label=_('Review downloaded metadata'), - action_icon=QIcon(I('auto_author_sort.png'))) + self.gui.proceed_question( + normal_apply, payload, log_file, _('Download log'), + _('Metadata download complete'), msg, icon='download-metadata.png', + det_msg=det_msg, show_copy_button=show_copy_button, + cancel_callback=partial(self.cleanup_bulk_download, tdir), + log_is_file=True, checkbox_msg=checkbox_msg, + checkbox_checked=False, action_callback=review_apply, + action_label=_('Review downloaded metadata'), + action_icon=QIcon(I('auto_author_sort.png'))) def apply_downloaded_metadata(self, review, payload, *args): good_ids, tdir, log_file, lm_map, failed_ids = payload diff --git a/src/calibre/gui2/metadata/bulk_download.py b/src/calibre/gui2/metadata/bulk_download.py index 592072d8be..f85acdea63 100644 --- a/src/calibre/gui2/metadata/bulk_download.py +++ b/src/calibre/gui2/metadata/bulk_download.py @@ -53,13 +53,13 @@ class ConfirmDialog(QDialog): def __init__(self, ids, parent): QDialog.__init__(self, parent) self.setWindowTitle(_('Schedule download?')) - self.setWindowIcon(QIcon(I('dialog_question.png'))) + self.setWindowIcon(QIcon(I('download-metadata.png'))) l = self.l = QGridLayout() self.setLayout(l) i = QLabel(self) - i.setPixmap(QPixmap(I('dialog_question.png'))) + i.setPixmap(QPixmap(I('download-metadata.png'))) l.addWidget(i, 0, 0) t = QLabel( diff --git a/src/calibre/gui2/metadata/single_download.py b/src/calibre/gui2/metadata/single_download.py index dba6119b26..a9a153dcc2 100644 --- a/src/calibre/gui2/metadata/single_download.py +++ b/src/calibre/gui2/metadata/single_download.py @@ -1029,7 +1029,7 @@ class FullFetch(QDialog): # {{{ self.book = self.cover_pixmap = None self.setWindowTitle(_('Downloading metadata...')) - self.setWindowIcon(QIcon(I('metadata.png'))) + self.setWindowIcon(QIcon(I('download-metadata.png'))) self.stack = QStackedWidget() self.l = l = QVBoxLayout()