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: Saved searches dialog: Make the option to control where to search a little more prominent

Browse Source
This commit is contained in:
Kovid Goyal 2014-04-07 09:21:18 +05:30
parent 3047b30f23
commit 625e3935ed
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,7 @@ from collections import OrderedDict
from PyQt4.Qt import ( from PyQt4.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, QPushButton, pyqtSignal, QComboBox, QCheckBox, QSizePolicy, QVBoxLayout, QFont,
QLineEdit, QToolButton, QListView, QFrame, QApplication, QStyledItemDelegate, QLineEdit, QToolButton, QListView, QFrame, QApplication, QStyledItemDelegate,
QAbstractListModel, QVariant, QFormLayout, QModelIndex, QMenu, QItemSelection) QAbstractListModel, QVariant, QFormLayout, QModelIndex, QMenu, QItemSelection)
@ -65,7 +65,7 @@ class HistoryLineEdit(HistoryLineEdit2):
class WhereBox(QComboBox): class WhereBox(QComboBox):
def __init__(self, parent): def __init__(self, parent, emphasize=False):
QComboBox.__init__(self) QComboBox.__init__(self)
self.addItems([_('Current file'), _('All text files'), _('All style files'), _('Selected files'), _('Marked text')]) self.addItems([_('Current file'), _('All text files'), _('All style files'), _('Selected files'), _('Marked text')])
self.setToolTip('<style>dd {margin-bottom: 1.5ex}</style>' + _( self.setToolTip('<style>dd {margin-bottom: 1.5ex}</style>' + _(
@ -83,6 +83,7 @@ class WhereBox(QComboBox):
<dt><b>Marked text</b></dt> <dt><b>Marked text</b></dt>
<dd>Search only within the marked text in the currently opened file. You can mark text using the Search menu.</dd> <dd>Search only within the marked text in the currently opened file. You can mark text using the Search menu.</dd>
</dl>''')) </dl>'''))
self.emphasize = emphasize
@dynamic_property @dynamic_property
def where(self): def where(self):
@ -93,6 +94,17 @@ class WhereBox(QComboBox):
self.setCurrentIndex({v:k for k, v in wm.iteritems()}[val]) self.setCurrentIndex({v:k for k, v in wm.iteritems()}[val])
return property(fget=fget, fset=fset) return property(fget=fget, fset=fset)
def paintEvent(self, ev):
# We do it like this so that the popup uses a normal font
if self.emphasize:
ofont = self.font()
f = QFont(ofont)
f.setBold(True), f.setItalic(True)
self.setFont(f)
QComboBox.paintEvent(self, ev)
if self.emphasize:
self.setFont(ofont)
class DirectionBox(QComboBox): class DirectionBox(QComboBox):
def __init__(self, parent): def __init__(self, parent):
@ -609,7 +621,7 @@ class SavedSearches(Dialog):
d.setFrameStyle(QFrame.HLine) d.setFrameStyle(QFrame.HLine)
v.addWidget(d) v.addWidget(d)
self.where_box = wb = WhereBox(self) self.where_box = wb = WhereBox(self, emphasize=True)
self.where = SearchWidget.DEFAULT_STATE['where'] self.where = SearchWidget.DEFAULT_STATE['where']
v.addWidget(wb) v.addWidget(wb)
self.direction_box = db = DirectionBox(self) self.direction_box = db = DirectionBox(self)