Merge from trunk

src/calibre/gui2/__init__.py

@@ -100,7 +100,7 @@ def _config():
     c.add_opt('tag_browser_hidden_categories', default=set(),
             help=_('tag browser categories not to display'))
     c.add_opt('gui_layout', choices=['wide', 'narrow'],
-            help=_('The layout of the user interface'), default='narrow')
+            help=_('The layout of the user interface'), default='wide')
     c.add_opt('show_avg_rating', default=True,
             help=_('Show the average rating per item indication in the tag browser'))
     return ConfigProxy(c)

src/calibre/gui2/book_details.py

@@ -8,73 +8,18 @@ __docformat__ = 'restructuredtext en'
 import os, collections
 
 from PyQt4.Qt import QLabel, QPixmap, QSize, QWidget, Qt, pyqtSignal, \
-    QVBoxLayout, QScrollArea
+    QVBoxLayout, QScrollArea, QPropertyAnimation, QEasingCurve, \
+    QSizePolicy, QPainter, QRect, pyqtProperty
 
 from calibre import fit_image, prepare_string_for_xml
 from calibre.gui2.widgets import IMAGE_EXTENSIONS
 from calibre.ebooks import BOOK_EXTENSIONS
 from calibre.constants import preferred_encoding
+from calibre.library.comments import comments_to_html
 
-class CoverView(QLabel):
+# render_rows(data) {{{
-
-    def __init__(self, parent=None):
-        QLabel.__init__(self, parent)
-        self.default_pixmap = QPixmap(I('book.svg'))
-        self.max_width, self.max_height = 120, 120
-        self.setScaledContents(True)
-        self.setPixmap(self.default_pixmap)
-
-        def do_layout(self):
-            pixmap = self.pixmap()
-            pwidth, pheight = pixmap.width(), pixmap.height()
-            width, height = fit_image(pwidth, pheight,
-                                              self.max_width, self.max_height)[1:]
-            self.setMaximumWidth(width)
-            try:
-                aspect_ratio = pwidth/float(pheight)
-            except ZeroDivisionError:
-                aspect_ratio = 1
-            mh = min(self.max_height, int(width/aspect_ratio))
-            self.setMaximumHeight(mh)
-
-        def setPixmap(self, pixmap):
-            QLabel.setPixmap(self, pixmap)
-            self.do_layout()
-
-
-        def sizeHint(self):
-            return QSize(self.maximumWidth(), self.maximumHeight())
-
-        def relayout(self, parent_size):
-            self.max_height = int(parent_size.height()/3.)
-            self.max_width = parent_size.width()
-            self.do_layout()
-
-        def show_data(self, data):
-            if data.has_key('cover'):
-                self.setPixmap(QPixmap.fromImage(data.pop('cover')))
-            else:
-                self.setPixmap(self.default_pixmap)
-
-class BookInfo(QScrollArea):
-
-    def __init__(self, parent=None):
-        QScrollArea.__init__(self, parent)
-        self.setWidgetResizable(True)
-        self.label = QLabel()
-        self.label.setWordWrap(True)
-        self.setWidget(self.label)
-
-    def show_data(self, data):
-        self.label.setText('')
-        self.data = data.copy()
-        rows = render_rows(self.data)
-        rows = u'\n'.join([u'<tr><td valign="top"><b>%s:</b></td><td valign="top">%s</td></tr>'%(k,t) for
-            k, t in rows])
-        self.label.setText(u'<table>%s</table>'%rows)
-
 WEIGHTS = collections.defaultdict(lambda : 100)
-WEIGHTS[_('Path')] = 0
+WEIGHTS[_('Path')] = 5
 WEIGHTS[_('Formats')] = 1
 WEIGHTS[_('Collections')] = 2
 WEIGHTS[_('Series')] = 3
@@ -86,7 +31,7 @@ def render_rows(data):
     rows = []
     for key in keys:
         txt = data[key]
-        if key in ('id', _('Comments')) or not txt or not txt.strip() or \
+        if key in ('id', _('Comments')) or not hasattr(txt, 'strip') or not txt.strip() or \
                 txt == 'None':
             continue
         if isinstance(key, str):
@@ -98,7 +43,8 @@ def render_rows(data):
         if 'id' in data:
             if key == _('Path'):
                 txt = '...'+os.sep+os.sep.join(txt.split(os.sep)[-2:])
-                txt = u'<a href="path:%s">%s</a>'%(data['id'], txt)
+                txt = u'<a href="path:%s">%s</a>'%(data['id'],
+                        _('Click to open'))
             if key == _('Formats') and txt and txt != _('None'):
                 fmts = [x.strip() for x in txt.split(',')]
                 fmts = [u'<a href="format:%s:%s">%s</a>' % (data['id'], x, x) for x
@@ -107,10 +53,148 @@ def render_rows(data):
         rows.append((key, txt))
     return rows
 
+# }}}
+
+class CoverView(QWidget): # {{{
+
+
+    def __init__(self, parent=None):
+        QWidget.__init__(self, parent)
+        self.setMaximumSize(QSize(120, 120))
+        self.setMinimumSize(QSize(120, 1))
+        self._current_pixmap_size = self.maximumSize()
+
+        self.animation = QPropertyAnimation(self, 'current_pixmap_size', self)
+        self.animation.setEasingCurve(QEasingCurve(QEasingCurve.OutExpo))
+        self.animation.setDuration(1000)
+        self.animation.setStartValue(QSize(0, 0))
+        self.animation.valueChanged.connect(self.value_changed)
+
+        self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+
+        self.default_pixmap = QPixmap(I('book.svg'))
+        self.pixmap = self.default_pixmap
+        self.pwidth = self.pheight = None
+        self.data = {}
+
+        self.do_layout()
+
+    def value_changed(self, val):
+        self.update()
+
+    def setCurrentPixmapSize(self, val):
+        self._current_pixmap_size = val
+
+    def do_layout(self):
+        pixmap = self.pixmap
+        pwidth, pheight = pixmap.width(), pixmap.height()
+        self.pwidth, self.pheight = fit_image(pwidth, pheight,
+                            self.rect().width(), self.rect().height())[1:]
+        self.current_pixmap_size = QSize(self.pwidth, self.pheight)
+        self.animation.setEndValue(self.current_pixmap_size)
+
+    def relayout(self, parent_size):
+        self.setMaximumSize(parent_size.width(),
+            min(int(parent_size.height()/2.),int(4/3. * parent_size.width())+1))
+        self.resize(self.maximumSize())
+        self.animation.stop()
+        self.do_layout()
+
+    def sizeHint(self):
+        return self.maximumSize()
+
+    def show_data(self, data):
+        self.animation.stop()
+        if data.get('id', None) == self.data.get('id', None):
+            return
+        self.data = {'id':data.get('id', None)}
+        if data.has_key('cover'):
+            self.pixmap = QPixmap.fromImage(data.pop('cover'))
+            if self.pixmap.isNull():
+                self.pixmap = self.default_pixmap
+        else:
+            self.pixmap = self.default_pixmap
+        self.do_layout()
+        self.update()
+        self.animation.start()
+
+    def paintEvent(self, event):
+        canvas_size = self.rect()
+        width = self.current_pixmap_size.width()
+        extrax = canvas_size.width() - width
+        if extrax < 0: extrax = 0
+        x = int(extrax/2.)
+        height = self.current_pixmap_size.height()
+        extray = canvas_size.height() - height
+        if extray < 0: extray = 0
+        y = int(extray/2.)
+        target = QRect(x, y, width, height)
+        p = QPainter(self)
+        p.setRenderHints(QPainter.Antialiasing | QPainter.SmoothPixmapTransform)
+        p.drawPixmap(target, self.pixmap.scaled(target.size(),
+            Qt.KeepAspectRatio, Qt.SmoothTransformation))
+        p.end()
+
+    current_pixmap_size = pyqtProperty('QSize',
+            fget=lambda self: self._current_pixmap_size,
+            fset=setCurrentPixmapSize
+            )
+
+
+    # }}}
+
+class Label(QLabel):
+
+    mr = pyqtSignal(object)
+    link_clicked = pyqtSignal(object)
+
+    def __init__(self):
+        QLabel.__init__(self)
+        self.setText('')
+        self.setWordWrap(True)
+        self.linkActivated.connect(self.link_activated)
+        self._link_clicked = False
+        self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+
+    def link_activated(self, link):
+        self._link_clicked = True
+        link = unicode(link)
+        self.link_clicked.emit(link)
+
+    def mouseReleaseEvent(self, ev):
+        QLabel.mouseReleaseEvent(self, ev)
+        if not self._link_clicked:
+            self.mr.emit(ev)
+        self._link_clicked = False
+
+class BookInfo(QScrollArea):
+
+    def __init__(self, parent=None):
+        QScrollArea.__init__(self, parent)
+        self.setWidgetResizable(True)
+        self.label = Label()
+        self.setWidget(self.label)
+        self.link_clicked = self.label.link_clicked
+        self.mr = self.label.mr
+        self.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
+
+    def show_data(self, data):
+        self.label.setText('')
+        rows = render_rows(data)
+        rows = u'\n'.join([u'<tr><td valign="top"><b>%s:</b></td><td valign="top">%s</td></tr>'%(k,t) for
+            k, t in rows])
+        if _('Comments') in data and data[_('Comments')]:
+            comments = comments_to_html(data[_('Comments')])
+            rows += u'<tr><td colspan="2">%s</td></tr>'%comments
+
+        self.label.setText(u'<table>%s</table>'%rows)
+
 class BookDetails(QWidget):
 
     resized = pyqtSignal(object)
     show_book_info = pyqtSignal()
+    open_containing_folder = pyqtSignal(int)
+    view_specific_format = pyqtSignal(int, object)
 
     # Drag 'n drop {{{
     DROPABBLE_EXTENSIONS = IMAGE_EXTENSIONS+BOOK_EXTENSIONS
@@ -151,21 +235,37 @@ class BookDetails(QWidget):
 
         self.setLayout(self._layout)
         self.cover_view = CoverView(self)
-        self.cover_view.relayout()
+        self.cover_view.relayout(self.size())
         self.resized.connect(self.cover_view.relayout, type=Qt.QueuedConnection)
-        self._layout.addWidget(self.cover_view)
+        self._layout.addWidget(self.cover_view, alignment=Qt.AlignHCenter)
+        self.book_info = BookInfo(self)
+        self._layout.addWidget(self.book_info)
+        self.book_info.link_clicked.connect(self._link_clicked)
+        self.book_info.mr.connect(self.mouseReleaseEvent)
+        self.setMinimumSize(QSize(190, 200))
+        self.setCursor(Qt.PointingHandCursor)
 
+    def _link_clicked(self, link):
+        typ, _, val = link.partition(':')
+        if typ == 'path':
+            self.open_containing_folder.emit(int(val))
+        if typ == 'format':
+            id_, fmt = val.split(':')
+            self.view_specific_format.emit(int(id_), fmt)
+
+    def mouseReleaseEvent(self, ev):
+        ev.accept()
+        self.show_book_info.emit()
 
     def resizeEvent(self, ev):
         self.resized.emit(self.size())
 
     def show_data(self, data):
         self.cover_view.show_data(data)
+        self.book_info.show_data(data)
 
     def reset_info(self):
         self.show_data({})
 
-    def mouseReleaseEvent(self, ev):
-        self.show_book_info.emit()
 
 

src/calibre/gui2/dialogs/config/__init__.py

@@ -485,6 +485,14 @@ class ConfigDialog(ResizableDialog, Ui_Dialog):
         self.show_avg_rating.setChecked(config['show_avg_rating'])
         self.show_splash_screen.setChecked(gprefs.get('show_splash_screen',
             True))
+        li = None
+        for i, z in enumerate([('wide', _('Wide')),
+            ('narrow', _('Narrow'))]):
+            x, y = z
+            self.opt_gui_layout.addItem(y, QVariant(x))
+            if x == config['gui_layout']:
+                li = i
+        self.opt_gui_layout.setCurrentIndex(li)
 
     def check_port_value(self, *args):
         port = self.port.value()
@@ -866,6 +874,8 @@ class ConfigDialog(ResizableDialog, Ui_Dialog):
             if self.viewer.item(i).checkState() == Qt.Checked:
                 fmts.append(str(self.viewer.item(i).text()))
         config['internally_viewed_formats'] = fmts
+        val = self.opt_gui_layout.itemData(self.opt_gui_layout.currentIndex()).toString()
+        config['gui_layout'] = unicode(val)
 
         if not path or not os.path.exists(path) or not os.path.isdir(path):
             d = error_dialog(self, _('Invalid database location'),

src/calibre/gui2/dialogs/config/config.ui

@@ -89,8 +89,8 @@
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>608</width>
+          <width>604</width>
-          <height>683</height>
+          <height>679</height>
          </rect>
         </property>
         <layout class="QGridLayout" name="gridLayout_7">
@@ -332,7 +332,7 @@
            </widget>
            <widget class="QWidget" name="page">
             <layout class="QGridLayout" name="gridLayout_8">
-             <item row="0" column="0">
+             <item row="1" column="0">
               <widget class="QCheckBox" name="roman_numerals">
                <property name="text">
                 <string>Use &amp;Roman numerals for series number</string>
@@ -342,38 +342,38 @@
                </property>
               </widget>
              </item>
-             <item row="1" column="0">
+             <item row="2" column="0">
               <widget class="QCheckBox" name="systray_icon">
                <property name="text">
                 <string>Enable system &amp;tray icon (needs restart)</string>
                </property>
               </widget>
              </item>
-             <item row="1" column="1">
+             <item row="2" column="1">
               <widget class="QCheckBox" name="systray_notifications">
                <property name="text">
                 <string>Show &amp;notifications in system tray</string>
                </property>
               </widget>
              </item>
-             <item row="2" column="0" colspan="2">
+             <item row="3" column="0" colspan="2">
               <widget class="QCheckBox" name="show_splash_screen">
                <property name="text">
                 <string>Show &amp;splash screen at startup</string>
                </property>
               </widget>
              </item>
-             <item row="3" column="0" colspan="2">
+             <item row="4" column="0" colspan="2">
               <widget class="QCheckBox" name="separate_cover_flow">
                <property name="text">
                 <string>Show cover &amp;browser in a separate window (needs restart)</string>
                </property>
               </widget>
              </item>
-             <item row="4" column="0">
+             <item row="5" column="0">
               <widget class="QCheckBox" name="search_as_you_type">
                <property name="text">
-                <string>Search as &amp;you type</string>
+                <string>Search as you type</string>
                </property>
                <property name="checked">
                 <bool>true</bool>
@@ -635,6 +635,26 @@
                </item>
               </layout>
              </item>
+             <item row="0" column="0">
+              <widget class="QLabel" name="label_17">
+               <property name="text">
+                <string>User Interface &amp;layout (needs restart):</string>
+               </property>
+               <property name="buddy">
+                <cstring>opt_gui_layout</cstring>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QComboBox" name="opt_gui_layout">
+               <property name="maximumSize">
+                <size>
+                 <width>250</width>
+                 <height>16777215</height>
+                </size>
+               </property>
+              </widget>
+             </item>
             </layout>
            </widget>
            <widget class="QWidget" name="page_6">

src/calibre/gui2/init.py

@@ -17,6 +17,8 @@ from calibre.gui2 import config, is_widescreen
 from calibre.gui2.library.views import BooksView, DeviceBooksView
 from calibre.gui2.widgets import Splitter
 from calibre.gui2.tag_view import TagBrowserWidget
+from calibre.gui2.status import StatusBar, HStatusBar
+from calibre.gui2.book_details import BookDetails
 
 _keep_refs = []
 
@@ -290,9 +292,9 @@ class LibraryViewMixin(object): # {{{
 class LibraryWidget(Splitter): # {{{
 
     def __init__(self, parent):
-        orientation = Qt.Vertical if config['gui_layout'] == 'narrow' and \
+        orientation = Qt.Vertical
-                not is_widescreen() else Qt.Horizontal
+        if config['gui_layout'] == 'narrow':
-        #orientation = Qt.Vertical
+            orientation = Qt.Horizontal if is_widescreen() else Qt.Vertical
         idx = 0 if orientation == Qt.Vertical else 1
         size = 300 if orientation == Qt.Vertical else 550
         Splitter.__init__(self, 'cover_browser_splitter', _('Cover Browser'),
@@ -360,7 +362,6 @@ class LayoutMixin(object): # {{{
         self.setWindowTitle(__appname__)
 
         if config['gui_layout'] == 'narrow':
-            from calibre.gui2.status import StatusBar
             self.status_bar = self.book_details = StatusBar(self)
             self.stack = Stack(self)
             self.bd_splitter = Splitter('book_details_splitter',
@@ -375,8 +376,28 @@ class LayoutMixin(object): # {{{
             l.addWidget(self.sidebar)
             self.bd_splitter.addWidget(self._layout_mem[0])
             self.bd_splitter.addWidget(self.status_bar)
-            self.bd_splitter.setCollapsible((self.bd_splitter.side_index+1)%2, False)
+            self.bd_splitter.setCollapsible(self.bd_splitter.other_index, False)
             self.centralwidget.layout().addWidget(self.bd_splitter)
+        else:
+            self.status_bar = HStatusBar(self)
+            self.setStatusBar(self.status_bar)
+            self.bd_splitter = Splitter('book_details_splitter',
+                    _('Book Details'), I('book.svg'), initial_side_size=200,
+                    orientation=Qt.Horizontal, parent=self, side_index=1)
+            self.stack = Stack(self)
+            self.bd_splitter.addWidget(self.stack)
+            self.book_details = BookDetails(self)
+            self.bd_splitter.addWidget(self.book_details)
+            self.bd_splitter.setCollapsible(self.bd_splitter.other_index, False)
+            self.bd_splitter.setSizePolicy(QSizePolicy(QSizePolicy.Expanding,
+                QSizePolicy.Expanding))
+            self.centralwidget.layout().addWidget(self.bd_splitter)
+
+            for x in ('cb', 'tb', 'bd'):
+                button = getattr(self, x+'_splitter').button
+                button.setIconSize(QSize(22, 22))
+                self.status_bar.addPermanentWidget(button)
+            self.status_bar.addPermanentWidget(self.jobs_button)
 
     def finalize_layout(self):
         m = self.library_view.model()

src/calibre/gui2/jobs.py

@@ -274,11 +274,15 @@ class JobsButton(QFrame):
 
     def __init__(self, horizontal=False, size=48, parent=None):
         QFrame.__init__(self, parent)
+        if horizontal:
+            size = 24
         self.pi = ProgressIndicator(self, size)
         self._jobs = QLabel('<b>'+_('Jobs:')+' 0')
+        self._jobs.mouseReleaseEvent = self.mouseReleaseEvent
 
         if horizontal:
             self.setLayout(QHBoxLayout())
+            self.layout().setDirection(self.layout().RightToLeft)
         else:
             self.setLayout(QVBoxLayout())
             self._jobs.setAlignment(Qt.AlignHCenter|Qt.AlignBottom)

src/calibre/gui2/pictureflow/pictureflow.cpp

@@ -554,7 +554,7 @@ void PictureFlowPrivate::resize(int w, int h)
   if (h < 10) h = 10;
   slideHeight = int(float(h)/REFLECTION_FACTOR);
   slideWidth = int(float(slideHeight) * 2/3.);
-  fontSize = MAX(int(h/20.), 12);
+  fontSize = MAX(int(h/15.), 12);
   recalc(w, h);
   resetSlides();
   triggerRender();

src/calibre/gui2/status.py

@@ -49,7 +49,7 @@ class BookInfoDisplay(QWidget):
         event.acceptProposedAction()
 
 
-    class BookCoverDisplay(QLabel):
+    class BookCoverDisplay(QLabel): # {{{
 
         def __init__(self, coverpath=I('book.svg')):
             QLabel.__init__(self)
@@ -90,6 +90,7 @@ class BookInfoDisplay(QWidget):
             self.statusbar_height = statusbar_size.height()
             self.do_layout()
 
+        # }}}
 
     class BookDataDisplay(QLabel):
 
@@ -151,7 +152,7 @@ class BookInfoDisplay(QWidget):
             k, t in rows])
         if _('Comments') in self.data:
             comments = comments_to_html(self.data[_('Comments')])
-            comments = '<b>Comments:</b>'+comments
+            comments = ('<b>%s:</b>'%_('Comments'))+comments
         left_pane = u'<table>%s</table>'%rows
         right_pane = u'<div>%s</div>'%comments
         self.book_data.setText(u'<table><tr><td valign="top" '
@@ -196,6 +197,9 @@ class BookDetailsInterface(object):
     def show_data(self, data):
         raise NotImplementedError()
 
+class HStatusBar(QStatusBar, StatusBarInterface):
+    pass
+
 class StatusBar(QStatusBar, StatusBarInterface, BookDetailsInterface):
 
     files_dropped = pyqtSignal(object, object)

src/calibre/gui2/ui.py

@@ -126,7 +126,8 @@ class Main(MainWindow, Ui_MainWindow, DeviceMixin, ToolbarMixin, # {{{
         # Jobs Button {{{
         self.job_manager = JobManager()
         self.jobs_dialog = JobsDialog(self, self.job_manager)
-        self.jobs_button = JobsButton()
+        self.jobs_button = JobsButton(horizontal=config['gui_layout'] !=
+                'narrow')
         self.jobs_button.initialize(self.jobs_dialog, self.job_manager)
         # }}}
 

src/calibre/gui2/widgets.py

@@ -1110,6 +1110,8 @@ class Splitter(QSplitter):
     def show_side_pane(self):
         if self.count() < 2 or not self.is_side_index_hidden:
             return
+        if self.desired_side_size == 0:
+            self.desired_side_size = self.initial_side_size
         self.apply_state((True, self.desired_side_size))
 
     def hide_side_pane(self):