Merge from trunk

resources/recipes/nejm.recipe

@@ -26,13 +26,13 @@ class NYTimes(BasicNewsRecipe):
     #TO LOGIN
     def get_browser(self):
         br = BasicNewsRecipe.get_browser()
-        br.open('http://content.nejm.org/cgi/login?uri=/')
-        br.select_form(nr=0)
-        br['username'] = self.username
-        br['code'] = self.password
+        br.open('http://www.nejm.org/action/showLogin?uri=http://www.nejm.org/')
+        br.select_form(name='frmLogin')
+        br['login'] = self.username
+        br['password'] = self.password
         response = br.submit()
         raw = response.read()
-        if '<strong>Welcome' not in raw:
+        if '>Sign Out<' not in raw:
             raise Exception('Login failed. Check your username and password')
         return br
 

src/calibre/gui2/library/views.py

@@ -9,7 +9,7 @@ import os
 from functools import partial
 
 from PyQt4.Qt import QTableView, Qt, QAbstractItemView, QMenu, pyqtSignal, \
-    QModelIndex
+    QModelIndex, QIcon
 
 from calibre.gui2.library.delegates import RatingDelegate, PubDateDelegate, \
     TextDelegate, DateDelegate, TagsDelegate, CcTextDelegate, \
@@ -172,6 +172,7 @@ class BooksView(QTableView): # {{{
 
             if self.can_add_columns:
                 self.column_header_context_menu.addAction(
+                        QIcon(I('column.png')),
                         _('Add your own columns'),
                         partial(self.column_header_context_handler,
                             action='addcustcol', column=col))