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

Merge from trunk

Browse Source
This commit is contained in:
Charles Haley 2012-07-06 18:20:50 +02:00
commit 611cf105a3
3 changed files with 41 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>670</width> <width>670</width>
<height>556</height> <height>663</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -21,26 +21,21 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="0" column="1">
<widget class="QCheckBox" name="opt_use_primary_find_in_search">
<property name="text">
<string>Unaccented characters match accented characters</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="opt_highlight_search_matches"> <widget class="QCheckBox" name="opt_highlight_search_matches">
<property name="text"> <property name="text">
<string>&amp;Highlight search results instead of restricting the book list to the results</string> <string>&amp;Highlight search results instead of restricting the book list to the results</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="opt_use_primary_find_in_search">
<property name="text">
<string>Base characters match accented characters</string>
</property>
<property name="toolTip">
<string>Characters typed in the search box will match their
accented versions, using language rules. For example, in
English, searching for e will match &#233; and &#232;.</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="title"> <property name="title">
<string>What to search by default</string> <string>What to search by default</string>
@ -89,17 +84,7 @@ English, searching for e will match &#233; and &#232;.</string>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="6" column="0" colspan="2">
<widget class="QPushButton" name="clear_history_button">
<property name="toolTip">
<string>Clear search histories from all over calibre. Including the book list, e-book viewer, fetch news dialog, etc.</string>
</property>
<property name="text">
<string>Clear search &amp;histories</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="groupBox_2">
<property name="title"> <property name="title">
<string>Grouped Search Terms</string> <string>Grouped Search Terms</string>
@ -119,12 +104,6 @@ English, searching for e will match &#233; and &#232;.</string>
</item> </item>
<item> <item>
<widget class="QComboBox" name="gst_names"> <widget class="QComboBox" name="gst_names">
<property name="editable">
<bool>true</bool>
</property>
<property name="minimumContentsLength">
<number>10</number>
</property>
<property name="toolTip"> <property name="toolTip">
<string>Contains the names of the currently-defined group search terms. <string>Contains the names of the currently-defined group search terms.
Create a new name by entering it into the empty box, then Create a new name by entering it into the empty box, then
@ -132,6 +111,12 @@ pressing Save. Rename a search term by selecting it then
changing the name and pressing Save. Change the value of changing the name and pressing Save. Change the value of
a search term by changing the value box then pressing Save.</string> a search term by changing the value box then pressing Save.</string>
</property> </property>
<property name="editable">
<bool>true</bool>
</property>
<property name="minimumContentsLength">
<number>10</number>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -213,7 +198,17 @@ to be shown as user categories</string>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="5" column="0" colspan="2">
<widget class="QPushButton" name="clear_history_button">
<property name="toolTip">
<string>Clear search histories from all over calibre. Including the book list, e-book viewer, fetch news dialog, etc.</string>
</property>
<property name="text">
<string>Clear search &amp;histories</string>
</property>
</widget>
</item>
<item row="7" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox22"> <widget class="QGroupBox" name="groupBox22">
<property name="title"> <property name="title">
<string>What to search when searching similar books</string> <string>What to search when searching similar books</string>
@ -223,7 +218,7 @@ to be shown as user categories</string>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>&lt;p&gt;When you search for similar books by right clicking the <string>&lt;p&gt;When you search for similar books by right clicking the
book and selecting "Similar books...", book and selecting &quot;Similar books...&quot;,
calibre constructs a search using the column lookup names specified below. calibre constructs a search using the column lookup names specified below.
By changing the lookup name to a grouped search term you can By changing the lookup name to a grouped search term you can
search multiple columns at once.&lt;/p&gt;</string> search multiple columns at once.&lt;/p&gt;</string>
@ -251,8 +246,7 @@ to be shown as user categories</string>
</widget> </widget>
</item> </item>
<item row="1" column="2"> <item row="1" column="2">
<widget class="QComboBox" name="opt_similar_authors_match_kind"> <widget class="QComboBox" name="opt_similar_authors_match_kind"/>
</widget>
</item> </item>
<item row="1" column="3"> <item row="1" column="3">
<widget class="QLabel" name="label_222"> <widget class="QLabel" name="label_222">
@ -272,8 +266,7 @@ to be shown as user categories</string>
</widget> </widget>
</item> </item>
<item row="1" column="5"> <item row="1" column="5">
<widget class="QComboBox" name="opt_similar_series_match_kind"> <widget class="QComboBox" name="opt_similar_series_match_kind"/>
</widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_223"> <widget class="QLabel" name="label_223">
@ -283,12 +276,10 @@ to be shown as user categories</string>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QComboBox" name="similar_tags_search_key"> <widget class="QComboBox" name="similar_tags_search_key"/>
</widget>
</item> </item>
<item row="2" column="2"> <item row="2" column="2">
<widget class="QComboBox" name="opt_similar_tags_match_kind"> <widget class="QComboBox" name="opt_similar_tags_match_kind"/>
</widget>
</item> </item>
<item row="2" column="3"> <item row="2" column="3">
<widget class="QLabel" name="label_224"> <widget class="QLabel" name="label_224">
@ -298,12 +289,10 @@ to be shown as user categories</string>
</widget> </widget>
</item> </item>
<item row="2" column="4"> <item row="2" column="4">
<widget class="QComboBox" name="similar_publisher_search_key"> <widget class="QComboBox" name="similar_publisher_search_key"/>
</widget>
</item> </item>
<item row="2" column="5"> <item row="2" column="5">
<widget class="QComboBox" name="opt_similar_publisher_match_kind"> <widget class="QComboBox" name="opt_similar_publisher_match_kind"/>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>

2
src/calibre/library/caches.py
View File

@ -118,7 +118,9 @@ class MetadataBackup(Thread): # {{{
# }}} # }}}
### Global utility function for get_match here and in gui2/library.py ### Global utility function for get_match here and in gui2/library.py
# This is a global for performance
pref_use_primary_find_in_search = False pref_use_primary_find_in_search = False
def set_use_primary_find_in_search(toWhat): def set_use_primary_find_in_search(toWhat):

6
src/calibre/utils/config_base.py
View File

@ -424,8 +424,10 @@ def _prefs():
'to limit search columns above.')) 'to limit search columns above.'))
c.add_opt('use_primary_find_in_search', default=True, c.add_opt('use_primary_find_in_search', default=True,
help=_('Characters typed in the search box will match their ' help=_('Characters typed in the search box will match their '
'accented versions, using language rules. For example, in ' 'accented versions, based on the language you have chosen '
' English, searching for e will match é and è.')) 'for the calibre interface. For example, in '
u' English, searching for n will match ñ and n, but if '
'your language is Spanish it will only match n.'))
c.add_opt('migrated', default=False, help='For Internal use. Don\'t modify.') c.add_opt('migrated', default=False, help='For Internal use. Don\'t modify.')
return c return c