From 6b12237e7fb58cbae05d3d2bb1698d9069cb02d0 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 11 Jun 2010 10:53:29 -0600 Subject: [PATCH] Fix widescreen detection --- src/calibre/gui2/__init__.py | 14 ++++++++++---- src/calibre/gui2/init.py | 5 +++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py index cbe9449f1f..3063ef252d 100644 --- a/src/calibre/gui2/__init__.py +++ b/src/calibre/gui2/__init__.py @@ -127,10 +127,16 @@ def available_width(): desktop = QCoreApplication.instance().desktop() return desktop.availableGeometry().width() -try: - is_widescreen = float(available_width())/available_height() > 1.4 -except: - is_widescreen = True +_is_widescreen = None + +def is_widescreen(): + global _is_widescreen + if _is_widescreen is None: + try: + _is_widescreen = float(available_width())/available_height() > 1.4 + except: + _is_widescreen = False + return _is_widescreen def extension(path): return os.path.splitext(path)[1][1:].lower() diff --git a/src/calibre/gui2/init.py b/src/calibre/gui2/init.py index 93f3a7c623..5a039e7bc1 100644 --- a/src/calibre/gui2/init.py +++ b/src/calibre/gui2/init.py @@ -290,14 +290,15 @@ class LibraryWidget(Splitter): # {{{ def __init__(self, parent): orientation = Qt.Vertical if config['gui_layout'] == 'narrow' and \ - not is_widescreen else Qt.Horizontal + not is_widescreen() else Qt.Horizontal #orientation = 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'), I('cover_flow.svg'), orientation=orientation, parent=parent, connect_button=not config['separate_cover_flow'], - side_index=idx, initial_side_size=400, initial_show=False) + side_index=idx, initial_side_size=size, initial_show=False) parent.library_view = BooksView(parent) parent.library_view.setObjectName('library_view') self.addWidget(parent.library_view)