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

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

Browse Source 
Fix #1876840 [[Enhancement - Quickview] Minimize Quickview](https://bugs.launchpad.net/calibre/+bug/1876840)
This commit is contained in:
Kovid Goyal 2020-05-06 07:11:37 +05:30
commit 876623ab2e
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/calibre/gui2/actions/show_quickview.py
View File

@ -104,8 +104,8 @@ class ShowQuickviewAction(InterfaceAction):
default_keys=('Shift+S',), action=self.search_action, default_keys=('Shift+S',), action=self.search_action,
group=self.action_spec[0]) group=self.action_spec[0])
self.search_action.triggered.connect(self.search_quickview) self.search_action.triggered.connect(self.search_quickview)
self.search_action.changed.connect(self.set_search_shortcut) self.search_action.changed.connect(self.set_search_shortcut_tooltip)
self.menuless_qaction.changed.connect(self.set_search_shortcut) self.menuless_qaction.changed.connect(self.set_search_shortcut_tooltip)
self.qv_button = QuickviewButton(self.gui, self) self.qv_button = QuickviewButton(self.gui, self)
@ -136,17 +136,17 @@ class ShowQuickviewAction(InterfaceAction):
return return
self.qv_button.set_state_to_hide() self.qv_button.set_state_to_hide()
index = self.gui.library_view.currentIndex() index = self.gui.library_view.currentIndex()
self.current_instance = Quickview(self.gui, index) self.current_instance = Quickview(self.gui, index, self.qaction.shortcut())
self.current_instance.reopen_after_dock_change.connect(self.open_quickview) self.current_instance.reopen_after_dock_change.connect(self.open_quickview)
self.set_search_shortcut() self.set_search_shortcut_tooltip()
self.current_instance.show() self.current_instance.show()
self.current_instance.quickview_closed.connect(self.qv_button.set_state_to_show) self.current_instance.quickview_closed.connect(self.qv_button.set_state_to_show)
def set_search_shortcut(self): def set_search_shortcut_tooltip(self):
if self.current_instance and not self.current_instance.is_closed: if self.current_instance and not self.current_instance.is_closed:
self.current_instance.addAction(self.focus_bl_action) self.current_instance.addAction(self.focus_bl_action)
self.current_instance.set_shortcuts(self.search_action.shortcut().toString(), self.current_instance.set_search_shortcut_tooltip(self.search_action.shortcut().toString())
self.menuless_qaction.shortcut().toString())
def open_quickview(self): def open_quickview(self):
''' '''

28
src/calibre/gui2/dialogs/quickview.py
View File

@ -11,7 +11,8 @@ from functools import partial
from PyQt5.Qt import ( from PyQt5.Qt import (
Qt, QDialog, QAbstractItemView, QTableWidgetItem, QIcon, QListWidgetItem, Qt, QDialog, QAbstractItemView, QTableWidgetItem, QIcon, QListWidgetItem,
QCoreApplication, QEvent, QObject, QApplication, pyqtSignal, QByteArray, QMenu) QCoreApplication, QEvent, QObject, QApplication, pyqtSignal, QByteArray, QMenu,
QShortcut)
from calibre.customize.ui import find_plugin from calibre.customize.ui import find_plugin
from calibre.gui2 import gprefs from calibre.gui2 import gprefs
@ -134,7 +135,7 @@ class Quickview(QDialog, Ui_Quickview):
tab_pressed_signal = pyqtSignal(object, object) tab_pressed_signal = pyqtSignal(object, object)
quickview_closed = pyqtSignal() quickview_closed = pyqtSignal()
def __init__(self, gui, row): def __init__(self, gui, row, toggle_shortcut):
self.is_pane = gprefs.get('quickview_is_pane', False) self.is_pane = gprefs.get('quickview_is_pane', False)
if not self.is_pane: if not self.is_pane:
@ -149,6 +150,8 @@ class Quickview(QDialog, Ui_Quickview):
if self.is_pane: if self.is_pane:
self.main_grid_layout.setContentsMargins(0, 0, 0, 0) self.main_grid_layout.setContentsMargins(0, 0, 0, 0)
else:
self.setWindowIcon(self.windowIcon())
self.books_table_column_widths = None self.books_table_column_widths = None
try: try:
@ -161,13 +164,6 @@ class Quickview(QDialog, Ui_Quickview):
except: except:
pass pass
if not self.is_pane:
# Remove the help button from the window title bar
icon = self.windowIcon()
self.setWindowFlags(self.windowFlags()&(~Qt.WindowContextHelpButtonHint))
self.setWindowFlags(self.windowFlags()|Qt.WindowStaysOnTopHint)
self.setWindowIcon(icon)
self.view = gui.library_view self.view = gui.library_view
self.db = self.view.model().db self.db = self.view.model().db
self.gui = gui self.gui = gui
@ -270,6 +266,17 @@ class Quickview(QDialog, Ui_Quickview):
self.books_table.setContextMenuPolicy(Qt.CustomContextMenu) self.books_table.setContextMenuPolicy(Qt.CustomContextMenu)
self.books_table.customContextMenuRequested.connect(self.show_context_menu) self.books_table.customContextMenuRequested.connect(self.show_context_menu)
# Add the quickview toggle as a shortcut for the close button
# Don't add it if it identical to the current &X shortcut because that
# breaks &X
if (not self.is_pane and toggle_shortcut and
self.close_button.shortcut() != toggle_shortcut):
toggle_sc = QShortcut(toggle_shortcut, self.close_button)
toggle_sc.activated.connect(lambda: self.close_button_clicked())
toggle_sc.setEnabled(True)
self.close_button.setToolTip(_('Alternate shortcut: ') +
toggle_shortcut.toString())
def show_context_menu(self, point): def show_context_menu(self, point):
index = self.books_table.indexAt(point) index = self.books_table.indexAt(point)
item = self.books_table.item(index.row(), 0) item = self.books_table.item(index.row(), 0)
@ -312,10 +319,9 @@ class Quickview(QDialog, Ui_Quickview):
self.search_button.setEnabled(False) self.search_button.setEnabled(False)
self.last_search = txt self.last_search = txt
def set_shortcuts(self, search_sc, qv_sc): def set_search_shortcut_tooltip(self, search_sc):
if self.is_pane: if self.is_pane:
self.search_button.setToolTip(self.search_button_tooltip + ' (' + search_sc + ')') self.search_button.setToolTip(self.search_button_tooltip + ' (' + search_sc + ')')
self.close_button.setToolTip(self.close_button_tooltip.format(qv_sc))
def focus_entered(self, obj): def focus_entered(self, obj):
if obj == self.books_table: if obj == self.books_table: