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

Fix #1700266 [[Request] Move Advenced search button into Search box](https://bugs.launchpad.net/calibre/+bug/1700266)

Browse Source
This commit is contained in:
Kovid Goyal 2017-07-04 10:54:56 +05:30
parent 52c3fce521
commit 9d6cca4ebd
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/calibre/gui2/store/config/chooser/chooser_widget.py
View File

@ -6,7 +6,7 @@ __license__ = 'GPL 3'
__copyright__ = '2011, John Schember <john@nachtimwald.com>' __copyright__ = '2011, John Schember <john@nachtimwald.com>'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
from PyQt5.Qt import (QWidget, QIcon, QDialog, QComboBox) from PyQt5.Qt import QWidget, QIcon, QDialog, QComboBox, QLineEdit
from calibre.gui2.store.config.chooser.adv_search_builder import AdvSearchBuilderDialog from calibre.gui2.store.config.chooser.adv_search_builder import AdvSearchBuilderDialog
from calibre.gui2.store.config.chooser.chooser_widget_ui import Ui_Form from calibre.gui2.store.config.chooser.chooser_widget_ui import Ui_Form
@ -21,11 +21,10 @@ class StoreChooserWidget(QWidget, Ui_Form):
self.query.initialize('store_config_chooser_query') self.query.initialize('store_config_chooser_query')
self.query.setSizeAdjustPolicy(QComboBox.AdjustToMinimumContentsLengthWithIcon) self.query.setSizeAdjustPolicy(QComboBox.AdjustToMinimumContentsLengthWithIcon)
self.query.setMinimumContentsLength(25) self.query.setMinimumContentsLength(25)
self.adv_search_action = ac = self.query.lineEdit().addAction(QIcon(I('gear.png')), QLineEdit.LeadingPosition)
self.adv_search_builder.setIcon(QIcon(I('search.png'))) ac.triggered.connect(self.build_adv_search)
ac.setToolTip(_('Advanced search'))
self.search.clicked.connect(self.do_search) self.search.clicked.connect(self.do_search)
self.adv_search_builder.clicked.connect(self.build_adv_search)
self.enable_all.clicked.connect(self.results_view.model().enable_all) self.enable_all.clicked.connect(self.results_view.model().enable_all)
self.enable_none.clicked.connect(self.results_view.model().enable_none) self.enable_none.clicked.connect(self.results_view.model().enable_none)
self.enable_invert.clicked.connect(self.results_view.model().enable_invert) self.enable_invert.clicked.connect(self.results_view.model().enable_invert)

7
src/calibre/gui2/store/config/chooser/chooser_widget.ui
View File

@ -23,13 +23,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QToolButton" name="adv_search_builder">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item> <item>
<widget class="HistoryLineEdit" name="query"> <widget class="HistoryLineEdit" name="query">
<property name="sizePolicy"> <property name="sizePolicy">