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 #1735815 [Grouped search preferences enhancement](https://bugs.launchpad.net/calibre/+bug/1735815)
This commit is contained in:
Kovid Goyal 2017-12-10 14:12:33 +05:30
commit d99064cb58
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/gui2/preferences/search.py
View File

@ -76,6 +76,12 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
self.gst_value.update_items_cache(fl)
self.fill_gst_box(select=None)
self.user_category_layout.setContentsMargins(0, 30, 0, 0)
self.gst_names.lineEdit().setPlaceholderText(
_('Enter new or select existing name'))
self.gst_value.lineEdit().setPlaceholderText(
_('Enter list of column lookup names to search'))
self.category_fields = fl
ml = [(_('Match any'), 'match_any'), (_('Match all'), 'match_all')]
r('similar_authors_match_kind', db.prefs, choices=ml)

51
src/calibre/gui2/preferences/search.ui
View File

@ -154,8 +154,8 @@
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<layout class="QHBoxLayout" name="l12">
<item>
<layout class="QGridLayout" name="l12">
<item row="0" column="0">
<widget class="QLabel" name="la10">
<property name="text">
<string>&amp;Names:</string>
@ -165,7 +165,7 @@
</property>
</widget>
</item>
<item>
<item row="0" column="1">
<widget class="QComboBox" name="gst_names">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@ -188,7 +188,7 @@ a search term by changing the value box then pressing Save.</string>
</property>
</widget>
</item>
<item>
<item row="0" column="2">
<widget class="QToolButton" name="gst_delete_button">
<property name="toolTip">
<string>Delete the current search term</string>
@ -202,21 +202,40 @@ a search term by changing the value box then pressing Save.</string>
</property>
</widget>
</item>
<item>
<widget class="EditWithComplete" name="gst_value"/>
</item>
<item>
<widget class="QToolButton" name="gst_save_button">
<property name="toolTip">
<string>Save the current search term. You can rename a search term by
changing the name then pressing Save. You can change the value
of a search term by changing the value box then pressing Save.</string>
</property>
<item row="1" column="0">
<widget class="QLabel" name="la112">
<property name="text">
<string>&amp;Save</string>
<string>&amp;Value:</string>
</property>
<property name="buddy">
<cstring>gst_value</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="EditWithComplete" name="gst_value">
<property name="toolTip">
<string>Enter a comma-separated list of lookup names of the columns
to include in the grouped search term</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="3">
<layout class="QHBoxLayout">
<item>
<widget class="QToolButton" name="gst_save_button">
<property name="toolTip">
<string>Save the current search term. You can rename a search term by
changing the name then pressing Save. You can change the value
of a search term by changing the value box then pressing Save.</string>
</property>
<property name="text">
<string>&amp;Save</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item row="0" column="1" rowspan="3">
@ -230,7 +249,7 @@ of a search term by changing the value box then pressing Save.</string>
</widget>
</item>
<item row="1" column="0">
<layout class="QHBoxLayout">
<layout class="QHBoxLayout" name="user_category_layout">
<item>
<widget class="QLabel" name="l11">
<property name="text">