Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/cbhaley/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2024-01-08 20:29:18 +05:30
commit 143cf3eb1d
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calibre/gui2/central.py
View File

@ -330,6 +330,7 @@ class CentralContainer(QWidget):
self.narrow_desires = NarrowDesires() self.narrow_desires = NarrowDesires()
self.wide_is_visible = Visibility() self.wide_is_visible = Visibility()
self.narrow_is_visible = Visibility() self.narrow_is_visible = Visibility()
self._last_cb_position = self.gui = None
super().__init__(parent) super().__init__(parent)
self.action_toggle_layout = QAction(self) self.action_toggle_layout = QAction(self)
self.action_toggle_layout.triggered.connect(self.toggle_layout) self.action_toggle_layout.triggered.connect(self.toggle_layout)
@ -365,8 +366,6 @@ class CentralContainer(QWidget):
self.top_handle = h(Qt.Orientation.Horizontal) self.top_handle = h(Qt.Orientation.Horizontal)
self.bottom_handle = h(Qt.Orientation.Horizontal) self.bottom_handle = h(Qt.Orientation.Horizontal)
_last_cb_position = gui = None
@property @property
def narrow_cb_on_top(self): def narrow_cb_on_top(self):
p = self._last_cb_position = gprefs['cover_browser_narrow_view_position'] p = self._last_cb_position = gprefs['cover_browser_narrow_view_position']

9
src/calibre/gui2/preferences/look_feel.py
View File

@ -1049,10 +1049,11 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
self.update_color_palette_state() self.update_color_palette_state()
self.opt_gui_layout.setCurrentIndex(0 if self.gui.layout_container.is_wide else 1) self.opt_gui_layout.setCurrentIndex(0 if self.gui.layout_container.is_wide else 1)
set_help_tips(self.opt_cover_browser_narrow_view_position, _( set_help_tips(self.opt_cover_browser_narrow_view_position, _(
'This option controls the position of the cover browser when using the Narrow user interface layout.' 'This option controls the position of the cover browser when using the Narrow user '
' "Automatic" will place the cover browser on top or on the right of the book list depending on the' 'interface layout. "Automatic" will place the cover browser on top or on the right '
' aspect ratio of the calibre window. "On top" places it over the book list, and "On right" places' 'of the book list depending on the aspect ratio of the calibre window. "On top" '
' it to the right of the book list. This option cannot be changed when using the Wide user interface layout.')) 'places it over the book list, and "On right" places it to the right of the book '
'list. This option has no effect when using the Wide user interface layout.'))
def open_cg_cache(self): def open_cg_cache(self):
open_local_file(self.gui.grid_view.thumbnail_cache.location) open_local_file(self.gui.grid_view.thumbnail_cache.location)