From e5edb7b945e0411bed22c3f2e8ab7953bb829a84 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Thu, 14 May 2015 22:52:33 -0500 Subject: [PATCH] Polish Fetch from Page, busy cursor. --- calibre-plugin/fff_plugin.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/calibre-plugin/fff_plugin.py b/calibre-plugin/fff_plugin.py index 7bbf97b..46ee905 100644 --- a/calibre-plugin/fff_plugin.py +++ b/calibre-plugin/fff_plugin.py @@ -421,7 +421,7 @@ class FanFicFarePlugin(InterfaceAction): if prefs['imapsessionpass']: self.imap_pass = imap_pass - QApplication.setOverrideCursor(QCursor(Qt.WaitCursor)) + self.busy_cursor() self.gui.status_bar.show_message(_('Fetching Story URLs from Email...')) url_list = get_urls_from_imap(prefs['imapserver'], prefs['imapuser'], @@ -434,7 +434,7 @@ class FanFicFarePlugin(InterfaceAction): url_list = url_list - reject_list self.gui.status_bar.show_message(_('Finished Fetching Story URLs from Email.'),3000) - QApplication.restoreOverrideCursor() + self.restore_cursor() if url_list: self.add_dialog("\n".join(url_list),merge=False) @@ -465,8 +465,14 @@ class FanFicFarePlugin(InterfaceAction): return url = u"%s"%d.url.text() + self.busy_cursor() + self.gui.status_bar.show_message(_('Fetching Story URLs from Page...')) + url_list = self.get_urls_from_page(url) + self.gui.status_bar.show_message(_('Finished Fetching Story URLs from Page.'),3000) + self.restore_cursor() + if url_list: self.add_dialog("\n".join(url_list),merge=d.anthology,anthology_url=url) else: @@ -2216,6 +2222,12 @@ class FanFicFarePlugin(InterfaceAction): return book + def busy_cursor(self): + QApplication.setOverrideCursor(QCursor(Qt.WaitCursor)) + + def restore_cursor(self): + QApplication.restoreOverrideCursor() + def split_text_to_urls(urls): # remove dups while preserving order. dups=set()