Merge from trunk

recipes/tabu.recipe

@@ -24,30 +24,29 @@ class TabuRo(BasicNewsRecipe):
     cover_url             = 'http://www.tabu.ro/img/tabu-logo2.png'
 
     conversion_options = {
-                                     'comments'   : description
-                                  ,'tags'       : category
-                                 ,'language'   : language
-                      ,'publisher'  : publisher
-                                 }
+                                 'comments'   : description
+                                ,'tags'       : category
+                                ,'language'   : language
+                                ,'publisher'  : publisher
+                         }
 
     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 = [
-            dict(name='div', attrs={'id':['advertisementArticle']}),
-                        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;'})
+            dict(name='div', attrs={'class':'asemanatoare'})
                            ]
 
     remove_tags_after = [
                       dict(name='div', attrs={'id':'comments'}),
-           ]
+                      dict(name='div', attrs={'class':'asemanatoare'})
+                        ]
 
     feeds          = [
-        (u'Feeds', u'http://www.tabu.ro/rss_all.xml')
+                        (u'Feeds', u'http://www.tabu.ro/feed/')
                      ]
 
     def preprocess_html(self, soup):

src/calibre/gui2/init.py

@@ -247,6 +247,11 @@ class LayoutMixin(object): # {{{
         for x in ('cb', 'tb', 'bd'):
             button = getattr(self, x+'_splitter').button
             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(self.jobs_button)
         self.setStatusBar(self.status_bar)

src/calibre/gui2/layout.py

@@ -408,6 +408,7 @@ class ToolBar(BaseToolBar): # {{{
                     self.d_widget.layout().addWidget(self.donate_button)
                     if isosx:
                         self.d_widget.setStyleSheet('QWidget, QToolButton {background-color: none; border: none; }')
+                        self.d_widget.layout().addWidget(QLabel(u'\u00a0'))
                     bar.addWidget(self.d_widget)
                     self.showing_donate = True
                 elif what in self.gui.iactions: