mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Merge from trunk
This commit is contained in:
commit
d9f911c241
@ -24,30 +24,29 @@ class TabuRo(BasicNewsRecipe):
|
|||||||
cover_url = 'http://www.tabu.ro/img/tabu-logo2.png'
|
cover_url = 'http://www.tabu.ro/img/tabu-logo2.png'
|
||||||
|
|
||||||
conversion_options = {
|
conversion_options = {
|
||||||
'comments' : description
|
'comments' : description
|
||||||
,'tags' : category
|
,'tags' : category
|
||||||
,'language' : language
|
,'language' : language
|
||||||
,'publisher' : publisher
|
,'publisher' : publisher
|
||||||
}
|
}
|
||||||
|
|
||||||
keep_only_tags = [
|
keep_only_tags = [
|
||||||
dict(name='div', attrs={'id':'Article'}),
|
dict(name='h2', attrs={'class':'articol_titlu'}),
|
||||||
]
|
dict(name='div', attrs={'class':'poza_articol_featured'}),
|
||||||
|
dict(name='div', attrs={'class':'articol_text'})
|
||||||
|
]
|
||||||
|
|
||||||
remove_tags = [
|
remove_tags = [
|
||||||
dict(name='div', attrs={'id':['advertisementArticle']}),
|
dict(name='div', attrs={'class':'asemanatoare'})
|
||||||
dict(name='div', attrs={'class':'voting_number'}),
|
|
||||||
dict(name='div', attrs={'id':'number_votes'}),
|
|
||||||
dict(name='div', attrs={'id':'rating_one'}),
|
|
||||||
dict(name='div', attrs={'class':'float: right;'})
|
|
||||||
]
|
]
|
||||||
|
|
||||||
remove_tags_after = [
|
remove_tags_after = [
|
||||||
dict(name='div', attrs={'id':'comments'}),
|
dict(name='div', attrs={'id':'comments'}),
|
||||||
]
|
dict(name='div', attrs={'class':'asemanatoare'})
|
||||||
|
]
|
||||||
|
|
||||||
feeds = [
|
feeds = [
|
||||||
(u'Feeds', u'http://www.tabu.ro/rss_all.xml')
|
(u'Feeds', u'http://www.tabu.ro/feed/')
|
||||||
]
|
]
|
||||||
|
|
||||||
def preprocess_html(self, soup):
|
def preprocess_html(self, soup):
|
||||||
|
@ -247,6 +247,11 @@ class LayoutMixin(object): # {{{
|
|||||||
for x in ('cb', 'tb', 'bd'):
|
for x in ('cb', 'tb', 'bd'):
|
||||||
button = getattr(self, x+'_splitter').button
|
button = getattr(self, x+'_splitter').button
|
||||||
button.setIconSize(QSize(24, 24))
|
button.setIconSize(QSize(24, 24))
|
||||||
|
if isosx:
|
||||||
|
button.setStyleSheet('''
|
||||||
|
QToolButton { background: none; border:none; padding: 0px; }
|
||||||
|
QToolButton:checked { background: rgba(0, 0, 0, 25%); }
|
||||||
|
''')
|
||||||
self.status_bar.addPermanentWidget(button)
|
self.status_bar.addPermanentWidget(button)
|
||||||
self.status_bar.addPermanentWidget(self.jobs_button)
|
self.status_bar.addPermanentWidget(self.jobs_button)
|
||||||
self.setStatusBar(self.status_bar)
|
self.setStatusBar(self.status_bar)
|
||||||
|
@ -408,6 +408,7 @@ class ToolBar(BaseToolBar): # {{{
|
|||||||
self.d_widget.layout().addWidget(self.donate_button)
|
self.d_widget.layout().addWidget(self.donate_button)
|
||||||
if isosx:
|
if isosx:
|
||||||
self.d_widget.setStyleSheet('QWidget, QToolButton {background-color: none; border: none; }')
|
self.d_widget.setStyleSheet('QWidget, QToolButton {background-color: none; border: none; }')
|
||||||
|
self.d_widget.layout().addWidget(QLabel(u'\u00a0'))
|
||||||
bar.addWidget(self.d_widget)
|
bar.addWidget(self.d_widget)
|
||||||
self.showing_donate = True
|
self.showing_donate = True
|
||||||
elif what in self.gui.iactions:
|
elif what in self.gui.iactions:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user