From badb777c7b6bf74bff2548cd13f231480c14b4d7 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 24 Sep 2011 08:47:52 -0600 Subject: [PATCH 1/7] Fix #858139 (Cnet update) --- recipes/cnetnews.recipe | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes/cnetnews.recipe b/recipes/cnetnews.recipe index 26d5992fa1..1fa681ed30 100644 --- a/recipes/cnetnews.recipe +++ b/recipes/cnetnews.recipe @@ -2,6 +2,11 @@ __license__ = 'GPL v3' __copyright__ = '2009, Darko Miletic ' ''' +Changelog: +2011-09-24 +Changed cover (drMerry) +''' +''' news.cnet.com ''' @@ -9,7 +14,7 @@ from calibre.web.feeds.news import BasicNewsRecipe class CnetNews(BasicNewsRecipe): title = 'CNET News' - __author__ = 'Darko Miletic' + __author__ = 'Darko Miletic updated by DrMerry.' description = 'Tech news and business reports by CNET News. Focused on information technology, core topics include computers, hardware, software, networking, and Internet media.' publisher = 'CNET' category = 'news, IT, USA' From fa405ab3d0e59672366c201fdd2f747e31a35c1b Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 24 Sep 2011 08:55:21 -0600 Subject: [PATCH 2/7] Fix #858141 (xkcd update) --- recipes/xkcd.recipe | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/recipes/xkcd.recipe b/recipes/xkcd.recipe index ad0d420deb..ce63b0a99a 100644 --- a/recipes/xkcd.recipe +++ b/recipes/xkcd.recipe @@ -1,6 +1,10 @@ __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal ' - +''' +Changelog: +2011-09-24 +Changed cover (drMerry) +''' ''' Fetch xkcd. ''' @@ -9,9 +13,10 @@ import time, re from calibre.web.feeds.news import BasicNewsRecipe class XkcdCom(BasicNewsRecipe): + cover_url = 'http://imgs.xkcd.com/s/9be30a7.png' title = 'xkcd' description = 'A webcomic of romance and math humor.' - __author__ = 'Martin Pitt' + __author__ = 'Martin Pitt updated by DrMerry.' language = 'en' use_embedded_content = False From 34111f5c5733e15cc4bd4ff11ff66efa507c2260 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 24 Sep 2011 09:14:28 -0600 Subject: [PATCH 3/7] Updated Kurier --- recipes/kurier.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/kurier.recipe b/recipes/kurier.recipe index 7c9e1e2256..21674f953f 100644 --- a/recipes/kurier.recipe +++ b/recipes/kurier.recipe @@ -29,7 +29,7 @@ class Kurier(BasicNewsRecipe): , 'language' : language } - remove_tags = [dict(attrs={'class':['contenttabs','drucken','versenden','leserbrief','kommentieren','addthis_button']})] + remove_tags = [dict(attrs={'class':['functionsleiste','functions','social_positionierung','contenttabs','drucken','versenden','leserbrief','kommentieren','addthis_button']})] keep_only_tags = [dict(attrs={'id':'content'})] remove_tags_after = dict(attrs={'id':'author'}) remove_attributes = ['width','height'] From d1584dd84c7cdc656f6c8e22bf9ffb5c8c26d2a8 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 24 Sep 2011 09:38:57 -0600 Subject: [PATCH 4/7] Sign on San Diego by Jay Kindle --- recipes/sign_on_sd.recipe | 53 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 recipes/sign_on_sd.recipe diff --git a/recipes/sign_on_sd.recipe b/recipes/sign_on_sd.recipe new file mode 100644 index 0000000000..2f21352634 --- /dev/null +++ b/recipes/sign_on_sd.recipe @@ -0,0 +1,53 @@ +from calibre.web.feeds.news import BasicNewsRecipe + +class AdvancedUserRecipe1315899507(BasicNewsRecipe): + title = u'Sign On San Diego' + __author__ = 'Jay Kindle' + description = 'Local news stories from The San Diego Union-Tribune; breaking news, business and technology, local and national sports coverage, entertainment news and reviews.' + publisher = 'Tribune Company' + category = 'news, politics, USA, San Diego, California, world' + oldest_article = 2 + max_articles_per_feed = 200 + timefmt = ' [%b %d, %Y]' + no_stylesheets = True + encoding = 'utf8' + use_embedded_content = False + language = 'en' + auto_cleanup = True + remove_empty_feeds = True + publication_type = 'newspaper' + masthead_url = 'http://media.signonsandiego.com/e2/sosd/images/sosd_logo.png' + + feeds = [ + (u'Latest News', u'http://www.signonsandiego.com/rss/headlines/'), + (u'Local News', u'http://www.signonsandiego.com/rss/headlines/metro/'), + (u'Business', u'http://www.signonsandiego.com/rss/headlines/business/'), + (u'Politics', u'http://www.signonsandiego.com/rss/headlines/local/politics/'), + (u'Border & Immigration', u'http://www.signonsandiego.com/rss/headlines/border/'), + (u'Courts', u'http://www.signonsandiego.com/rss/headlines/courts/'), + (u'Education', u'http://www.signonsandiego.com/news/education/'), + (u'Sports', u'http://www.signonsandiego.com/rss/headlines/sports/'), + (u'Chargers', u'http://www.signonsandiego.com/rss/headlines/sports/chargers/'), + (u'Padres', u'http://www.signonsandiego.com/rss/headlines/sports/padres/'), + (u'NFL', u'http://www.signonsandiego.com/rss/headlines/sports/nfl/'), + (u'NBA', u'http://www.signonsandiego.com/rss/headlines/sports/nba/'), + (u'Nick Canepa', u'http://www.signonsandiego.com/rss/authors/nick-canepa/'), + (u'Tim Sullivan', u'http://www.signonsandiego.com/rss/authors/tim-sullivan/'), + (u'Ruben Navarrette', u'http://www.signonsandiego.com/rss/authors/ruben-navarrette/'), + (u'Diane Bell', u'http://www.signonsandiego.com/rss/authors/diane-bell/'), + (u'Smart Living', u'http://www.signonsandiego.com/rss/headlines/smart-living/'), + (u'Photos', u'http://www.signonsandiego.com/rss/photos/'), + (u'Arts', u'http://www.signonsandiego.com/rss/headlines/night-and-day/theater-arts/'), + (u'Books', u'http://www.signonsandiego.com/rss/headlines/lifestyle/books/'), + (u'Currents-Passages', u'http://www.signonsandiego.com/rss/headlines/lifestyle/currents/passages/'), + (u'Currents-Weekend', u'http://www.signonsandiego.com/news/rss2/daily/currentsweekend.xml'), + (u'Dialog', u'http://www.signonsandiego.com/news/rss2/daily/dialog.xml'), + (u'Home', u'http://www.signonsandiego.com/rss/headlines/home/'), + (u'Homescape', u'http://www.signonsandiego.com/rss/headlines/lifestyle/homescape/'), + (u'Night & Day', u'http://www.signonsandiego.com/news/rss2/daily/nightday.xml'), + (u'Opinion', u'http://www.signonsandiego.com/rss/headlines/opinion/'), + (u'Quest', u'http://www.signonsandiego.com/news/rss2/daily/quest.xml'), + (u'Travel', u'http://www.signonsandiego.com/news/rss2/daily/travel.xml'), + (u'Wheels', u'http://www.signonsandiego.com/news/rss2/daily/wheels.xml') + ] + From 9cd3dc1364a82e8999c06326f0c083e917823e5a Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 24 Sep 2011 09:43:34 -0600 Subject: [PATCH 5/7] Republica by Manish Bhattarai --- recipes/ekantipur.recipe | 40 +++++++++++++++++++++------------------- recipes/republica.recipe | 14 ++++++++++++++ 2 files changed, 35 insertions(+), 19 deletions(-) create mode 100644 recipes/republica.recipe diff --git a/recipes/ekantipur.recipe b/recipes/ekantipur.recipe index 8a4be7a3ff..e04d1fa507 100644 --- a/recipes/ekantipur.recipe +++ b/recipes/ekantipur.recipe @@ -1,19 +1,21 @@ - -from calibre.web.feeds.news import BasicNewsRecipe - -class AdvancedUserRecipe1314326622(BasicNewsRecipe): - title = u'Ekantipur' - __author__ = 'fab4.ilam' - language = 'en_NP' - oldest_article = 7 - max_articles_per_feed = 25 - masthead_url = 'http://kantipur.com.np/images/ekantipur_01.jpg' - remove_empty_feeds = True - remove_tags_before = dict(id='main-content') - remove_tags_after = dict(id='view-comments') - remove_tags = [dict(attrs={'class':['ratings', 'news-tool', 'comment', 'post-ur-comment','asideBox','commentsbox','related-sidebar-row related-news']}), - dict(id=['sidebar','news-detail-img', 'footer-wrapper']), - dict(name=['script'])] - - feeds = [(u'Top Stories', u'http://www.ekantipur.com/en/rss/top-stories/'), (u'National', u'http://www.ekantipur.com/en/rss/national/1'), (u'Capital', u'http://www.ekantipur.com/en/rss/capital/7'), (u'Business', u'http://www.ekantipur.com/en/rss/business/3'), (u'World', u'http://www.ekantipur.com/en/rss/world/5'), (u'Sports', u'http://www.ekantipur.com/en/rss/sports/4'), (u'Mixed Bag', u'http://www.ekantipur.com/en/rss/mixed-bag/14'), (u'Health & Living', u'http://www.ekantipur.com/en/rss/health-and-living/19'), (u'Entertainment', u'http://www.ekantipur.com/en/rss/entertainment/6')] - + +from calibre.web.feeds.news import BasicNewsRecipe + +class AdvancedUserRecipe1314326622(BasicNewsRecipe): + title = u'Ekantipur' + __author__ = 'Manish Bhattarai' + description = 'News from the No.1 News Portal In Nepal' + language = 'en_NP' + oldest_article = 7 + max_articles_per_feed = 25 + masthead_url = 'http://kantipur.com.np/images/ekantipur_01.jpg' + remove_empty_feeds = True + remove_tags_before = dict(id='main-content') + remove_tags_after = dict(id='view-comments') + remove_tags = [dict(attrs={'class':['ratings', 'news-tool', 'comment', 'post-ur-comment','asideBox','commentsbox','related-sidebar-row related-news']}), + dict(id=['sidebar','news-detail-img', 'footer-wrapper']), + dict(name=['script'])] + + feeds = [(u'Top Stories', u'http://www.ekantipur.com/en/rss/top-stories/'), (u'National', u'http://www.ekantipur.com/en/rss/national/1'), (u'Capital', u'http://www.ekantipur.com/en/rss/capital/7'), (u'Business', u'http://www.ekantipur.com/en/rss/business/3'), (u'World', u'http://www.ekantipur.com/en/rss/world/5'), (u'Sports', u'http://www.ekantipur.com/en/rss/sports/4'), (u'Mixed Bag', u'http://www.ekantipur.com/en/rss/mixed-bag/14'), (u'Health & Living', u'http://www.ekantipur.com/en/rss/health-and-living/19'), (u'Entertainment', u'http://www.ekantipur.com/en/rss/entertainment/6')] + + diff --git a/recipes/republica.recipe b/recipes/republica.recipe new file mode 100644 index 0000000000..6eec9c0881 --- /dev/null +++ b/recipes/republica.recipe @@ -0,0 +1,14 @@ +from calibre.web.feeds.news import BasicNewsRecipe + +class AdvancedUserRecipe1316862613(BasicNewsRecipe): + title = u'Republica' + __author__ = 'Manish Bhattarai' + description = 'News from the Republica' + language = 'en_NP' + masthead_url = 'http://blog.nyayahealth.org/wp-content/uploads/2011/03/myrepublica1.gif' + oldest_article = 1 + max_articles_per_feed = 100 + auto_cleanup = True + cover_url = 'http://www.myrepublica.com/repub_front.jpg' + feeds = [(u'Political Affairs', u'http://www.myrepublica.com/portal/news_rss.php?news_category_id=14'), (u'Business & Economy', u'http://www.myrepublica.com/portal/news_rss.php?news_category_id=15'), (u'International', u'http://www.myrepublica.com/portal/news_rss.php?news_category_id=21'), (u'Social Issues', u'http://www.myrepublica.com/portal/news_rss.php?news_category_id=16'), (u'Sports', u'http://www.myrepublica.com/portal/news_rss.php?news_category_id=18'), (u'Lifestyle', u'http://www.myrepublica.com/portal/news_rss.php?news_category_id=17')] + From 7c42d5d8a9d6dbd40f40f19adf59958d9268a146 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 24 Sep 2011 09:45:24 -0600 Subject: [PATCH 6/7] ... --- src/calibre/gui2/init.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/gui2/init.py b/src/calibre/gui2/init.py index 4458104a3a..7e9e6b4867 100644 --- a/src/calibre/gui2/init.py +++ b/src/calibre/gui2/init.py @@ -240,7 +240,7 @@ class LayoutMixin(object): # {{{ # }}} self.status_bar = StatusBar(self) - for x in ('cb', 'tb', 'bd'): + for x in ('tb', 'cb', 'bd'): button = getattr(self, x+'_splitter').button button.setIconSize(QSize(24, 24)) if isosx: From e4d2e8048a331ef85e2beca06b104402b3d88abc Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 24 Sep 2011 09:48:18 -0600 Subject: [PATCH 7/7] ... --- src/calibre/gui2/init.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/init.py b/src/calibre/gui2/init.py index 7e9e6b4867..1700a9aced 100644 --- a/src/calibre/gui2/init.py +++ b/src/calibre/gui2/init.py @@ -223,7 +223,8 @@ class LayoutMixin(object): # {{{ self.bd_splitter.addWidget(self.book_details) self.bd_splitter.setCollapsible(self.bd_splitter.other_index, False) self.centralwidget.layout().addWidget(self.bd_splitter) - # }}} + button_order = ('tb', 'bd', 'cb') + # }}} else: # wide {{{ self.bd_splitter = Splitter('book_details_splitter', _('Book Details'), I('book.png'), initial_side_size=200, @@ -237,10 +238,11 @@ class LayoutMixin(object): # {{{ self.bd_splitter.setSizePolicy(QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)) self.centralwidget.layout().addWidget(self.bd_splitter) + button_order = ('tb', 'cb', 'bd') # }}} self.status_bar = StatusBar(self) - for x in ('tb', 'cb', 'bd'): + for x in button_order: button = getattr(self, x+'_splitter').button button.setIconSize(QSize(24, 24)) if isosx: