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

Edit Book: Fix Saved searches panel not working well with very long search/replace expressions

Browse Source
This commit is contained in:
Kovid Goyal 2015-05-29 21:15:32 +05:30
parent bacca244ea
commit fb815c0bdb
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/calibre/gui2/tweak_book/search.py
View File

@ -14,7 +14,7 @@ from PyQt5.Qt import (
QWidget, QToolBar, Qt, QHBoxLayout, QSize, QIcon, QGridLayout, QLabel, QTimer, QWidget, QToolBar, Qt, QHBoxLayout, QSize, QIcon, QGridLayout, QLabel, QTimer,
QPushButton, pyqtSignal, QComboBox, QCheckBox, QSizePolicy, QVBoxLayout, QFont, QPushButton, pyqtSignal, QComboBox, QCheckBox, QSizePolicy, QVBoxLayout, QFont,
QLineEdit, QToolButton, QListView, QFrame, QApplication, QStyledItemDelegate, QLineEdit, QToolButton, QListView, QFrame, QApplication, QStyledItemDelegate,
QAbstractListModel, QModelIndex, QMenu, QItemSelection, QStackedLayout) QAbstractListModel, QModelIndex, QMenu, QItemSelection, QStackedLayout, QScrollArea)
import regex import regex
@ -491,6 +491,17 @@ class SearchPanel(QWidget): # {{{
return QWidget.keyPressEvent(self, ev) return QWidget.keyPressEvent(self, ev)
# }}} # }}}
class SearchDescription(QScrollArea):
def __init__(self, parent):
QScrollArea.__init__(self, parent)
self.label = QLabel(' \n \n ')
self.setWidget(self.label)
self.setWidgetResizable(True)
self.label.setTextFormat(Qt.PlainText)
self.label.setWordWrap(True)
self.set_text = self.label.setText
class SearchesModel(QAbstractListModel): class SearchesModel(QAbstractListModel):
def __init__(self, parent): def __init__(self, parent):
@ -867,10 +878,9 @@ class SavedSearches(QWidget):
d.setFrameStyle(QFrame.HLine) d.setFrameStyle(QFrame.HLine)
v.addWidget(d) v.addWidget(d)
self.description = d = QLabel(' \n \n ') self.description = d = SearchDescription(self)
d.setTextFormat(Qt.PlainText)
d.setWordWrap(True)
mw.v.addWidget(d) mw.v.addWidget(d)
mw.v.setStretch(0, 10)
self.ib = b = pb(_('&Import'), _('Import saved searches')) self.ib = b = pb(_('&Import'), _('Import saved searches'))
b.clicked.connect(self.import_searches) b.clicked.connect(self.import_searches)
@ -1056,7 +1066,7 @@ class SavedSearches(QWidget):
self.edit_search_widget.search_name.setFocus(Qt.OtherFocusReason) self.edit_search_widget.search_name.setFocus(Qt.OtherFocusReason)
def show_details(self): def show_details(self):
self.description.setText(' \n \n ') self.description.set_text(' \n \n ')
i = self.searches.currentIndex() i = self.searches.currentIndex()
if i.isValid(): if i.isValid():
try: try:
@ -1069,7 +1079,7 @@ class SavedSearches(QWidget):
ts = _('(Case sensitive: {0} Dot All: {1})').format(cs, da) ts = _('(Case sensitive: {0} Dot All: {1})').format(cs, da)
else: else:
ts = _('(Case sensitive: {0} [Normal search])').format(cs) ts = _('(Case sensitive: {0} [Normal search])').format(cs)
self.description.setText(_('{2} {3}\nFind: {0}\nReplace: {1}').format( self.description.set_text(_('{2} {3}\nFind: {0}\nReplace: {1}').format(
search.get('find', ''), search.get('replace', ''), search.get('name', ''), ts)) search.get('find', ''), search.get('replace', ''), search.get('name', ''), ts))
def import_searches(self): def import_searches(self):