From 5da4c44b1850eef508e05004576c13768157cee7 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 1 Dec 2023 19:48:39 +0530 Subject: [PATCH] Remove pointless guards. CoverFlow is never None --- src/calibre/gui2/cover_flow.py | 35 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/src/calibre/gui2/cover_flow.py b/src/calibre/gui2/cover_flow.py index 6074f4b506..3c39ab9840 100644 --- a/src/calibre/gui2/cover_flow.py +++ b/src/calibre/gui2/cover_flow.py @@ -348,7 +348,6 @@ class CoverFlowMixin: self.toggle_auto_scroll() def init_cover_flow_mixin(self): - self.cover_flow = None self.cf_last_updated_at = None self.cover_flow_syncing_enabled = False self.cover_flow_sync_flag = True @@ -365,14 +364,12 @@ class CoverFlowMixin: self.cb_splitter.button.clicked.connect(self.toggle_cover_browser) self.cb_splitter.button.set_state_to_show() self.cb_splitter.action_toggle.triggered.connect(self.toggle_cover_browser) - if CoverFlow is not None: - self.cover_flow.stop.connect(self.hide_cover_browser) + self.cover_flow.stop.connect(self.hide_cover_browser) self.cover_flow.setVisible(False) else: self.separate_cover_browser = False self.cb_splitter.insertWidget(self.cb_splitter.side_index, self.cover_flow) - if CoverFlow is not None: - self.cover_flow.stop.connect(self.cb_splitter.hide_side_pane) + self.cover_flow.stop.connect(self.cb_splitter.hide_side_pane) self.cb_splitter.button.toggled.connect(self.cover_browser_toggled, type=Qt.ConnectionType.QueuedConnection) def update_cover_flow_subtitle_font(self): @@ -400,26 +397,24 @@ class CoverFlowMixin: def cover_browser_shown(self): self.cover_flow.setFocus(Qt.FocusReason.OtherFocusReason) - if CoverFlow is not None: - if self.db_images.ignore_image_requests: - self.db_images.ignore_image_requests = False - self.db_images.dataChanged.emit() - self.cover_flow.setCurrentSlide(self.library_view.currentIndex().row()) - self.cover_flow_syncing_enabled = True - QTimer.singleShot(500, self.cover_flow_do_sync) + if self.db_images.ignore_image_requests: + self.db_images.ignore_image_requests = False + self.db_images.dataChanged.emit() + self.cover_flow.setCurrentSlide(self.library_view.currentIndex().row()) + self.cover_flow_syncing_enabled = True + QTimer.singleShot(500, self.cover_flow_do_sync) self.library_view.setCurrentIndex( self.library_view.currentIndex()) self.library_view.scroll_to_row(self.library_view.currentIndex().row()) def cover_browser_hidden(self): - if CoverFlow is not None: - self.cover_flow_syncing_enabled = False - idx = self.library_view.model().index(self.cover_flow.currentSlide(), 0) - if idx.isValid(): - sm = self.library_view.selectionModel() - sm.select(idx, QItemSelectionModel.SelectionFlag.ClearAndSelect|QItemSelectionModel.SelectionFlag.Rows) - self.library_view.setCurrentIndex(idx) - self.library_view.scroll_to_row(idx.row()) + self.cover_flow_syncing_enabled = False + idx = self.library_view.model().index(self.cover_flow.currentSlide(), 0) + if idx.isValid(): + sm = self.library_view.selectionModel() + sm.select(idx, QItemSelectionModel.SelectionFlag.ClearAndSelect|QItemSelectionModel.SelectionFlag.Rows) + self.library_view.setCurrentIndex(idx) + self.library_view.scroll_to_row(idx.row()) def show_cover_browser(self): d = CBDialog(self, self.cover_flow)