Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from trunk

Browse Source
This commit is contained in:
Charles Haley 2011-09-24 17:53:49 +02:00
commit 7e6d4fd68b
7 changed files with 106 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
recipes/cnetnews.recipe
View File

@ -2,6 +2,11 @@
__license__ = 'GPL v3'
__copyright__ = '2009, Darko Miletic <darko.miletic at gmail.com>'
'''
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'

4
recipes/ekantipur.recipe
View File

@ -3,7 +3,8 @@ from calibre.web.feeds.news import BasicNewsRecipe
class AdvancedUserRecipe1314326622(BasicNewsRecipe):
title = u'Ekantipur'
__author__ = 'fab4.ilam'
__author__ = 'Manish Bhattarai'
description = 'News from the No.1 News Portal In Nepal'
language = 'en_NP'
oldest_article = 7
max_articles_per_feed = 25
@ -17,3 +18,4 @@ class AdvancedUserRecipe1314326622(BasicNewsRecipe):
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')]

2
recipes/kurier.recipe
View File

@ -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']

14
recipes/republica.recipe Normal file
View File

@ -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')]

53
recipes/sign_on_sd.recipe Normal file
View File

@ -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')
]

9
recipes/xkcd.recipe
View File

@ -1,6 +1,10 @@
__license__ = 'GPL v3'
__copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
'''
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

4
src/calibre/gui2/init.py
View File

@ -223,6 +223,7 @@ 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',
@ -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 ('cb', 'tb', 'bd'):
for x in button_order:
button = getattr(self, x+'_splitter').button
button.setIconSize(QSize(24, 24))
if isosx: