diff --git a/src/calibre/gui2/dialogs/jobs.py b/src/calibre/gui2/dialogs/jobs.py index ced7f2ee10..8e22f4c43c 100644 --- a/src/calibre/gui2/dialogs/jobs.py +++ b/src/calibre/gui2/dialogs/jobs.py @@ -36,11 +36,11 @@ class JobsDialog(QDialog, Ui_JobsDialog): self.model = model self.setWindowModality(Qt.NonModal) self.setWindowTitle(__appname__ + _(' - Jobs')) - QObject.connect(self.jobs_view.model(), SIGNAL('modelReset()'), + QObject.connect(self.jobs_view.model(), SIGNAL('modelReset()'), self.jobs_view.resizeColumnsToContents) QObject.connect(self.kill_button, SIGNAL('clicked()'), self.kill_job) - QObject.connect(self, SIGNAL('kill_job(int, PyQt_PyObject)'), + QObject.connect(self, SIGNAL('kill_job(int, PyQt_PyObject)'), self.jobs_view.model().kill_job) self.pb_delegate = ProgressBarDelegate(self) self.jobs_view.setItemDelegateForColumn(2, self.pb_delegate) @@ -53,7 +53,7 @@ class JobsDialog(QDialog, Ui_JobsDialog): model = self.model for row, job in enumerate(model.jobs): if job.is_running: - self.jobs_view.dataChanged(model.index(row, 3), model.index(row, 3)) + self.jobs_view.dataChanged(model.index(row, 3), model.index(row, 3)) def kill_job(self): for index in self.jobs_view.selectedIndexes(): diff --git a/src/calibre/gui2/images/news/sciencedaily.png b/src/calibre/gui2/images/news/sciencedaily.png new file mode 100644 index 0000000000..ab2e1b0483 Binary files /dev/null and b/src/calibre/gui2/images/news/sciencedaily.png differ diff --git a/src/calibre/web/feeds/recipes/__init__.py b/src/calibre/web/feeds/recipes/__init__.py index 44981f10db..830a1b635d 100644 --- a/src/calibre/web/feeds/recipes/__init__.py +++ b/src/calibre/web/feeds/recipes/__init__.py @@ -18,7 +18,7 @@ recipe_modules = [ 'nytimes_sub', 'security_watch', 'cyberpresse', 'st_petersburg_times', 'clarin', 'financial_times', 'heise', 'le_monde', 'harpers', 'science_aas', 'science_news', 'the_nation', 'lrb', 'harpers_full', 'liberation', - 'linux_magazine', 'telegraph_uk', 'utne', + 'linux_magazine', 'telegraph_uk', 'utne', 'sciencedaily' ] import re, imp, inspect, time, os diff --git a/src/calibre/web/feeds/recipes/sciencedaily.py b/src/calibre/web/feeds/recipes/sciencedaily.py new file mode 100644 index 0000000000..2b26de79c8 --- /dev/null +++ b/src/calibre/web/feeds/recipes/sciencedaily.py @@ -0,0 +1,32 @@ +#!/usr/bin/env python + +__license__ = 'GPL v3' +__copyright__ = '2008, Darko Miletic ' +''' +sciencedaily.com +''' +from calibre.web.feeds.news import BasicNewsRecipe + +class ScienceDaily(BasicNewsRecipe): + title = u'ScienceDaily' + __author__ = u'Darko Miletic' + description = u"Breaking science news and articles on global warming, extrasolar planets, stem cells, bird flu, autism, nanotechnology, dinosaurs, evolution -- the latest discoveries in astronomy, anthropology, biology, chemistry, climate & environment, computers, engineering, health & medicine, math, physics, psychology, technology, and more -- from the world's leading universities and research organizations." + oldest_article = 7 + max_articles_per_feed = 100 + no_stylesheets = True + use_embedded_content = False + + cover_url = 'http://www.sciencedaily.com/images/logo.gif' + + keep_only_tags = [ + dict(name='h1', attrs={'class':'story'}) + ,dict(name='div', attrs={'id':'story'}) + ] + + remove_tags_after = dict(name='div', attrs={'id':'citationbox'}) + remove_tags = [ + dict(name='div', attrs={'id':'seealso'}) + ,dict(name='div', attrs={'id':'citationbox'}) + ] + + feeds = [(u"ScienceDaily", u'http://www.sciencedaily.com/newsfeed.xml')]