diff --git a/Changelog.yaml b/Changelog.yaml index 8a4205ec9d..74bacf7a2b 100644 --- a/Changelog.yaml +++ b/Changelog.yaml @@ -688,7 +688,7 @@ - title: "Fix a regression that broke the icon theme creation tool in the previous release" tickets: [1643228] - - title: "Fix insert character dialog not reflowing characters on resize. Also only allow the search bar in the dialog to get input focus" + - title: "Fix insert character dialog not reflowing characters on resize. Also only allow the Search bar in the dialog to get input focus" improved recipes: - Dilbert @@ -1583,7 +1583,7 @@ date: 2016-02-12 new features: - - title: "Add an action to the context menu for the search bar to paste and instantly execute the search" + - title: "Add an action to the context menu for the Search bar to paste and instantly execute the search" tickets: [1541286] - title: "When adding multiple books from a single directory, added the books in order of the last modified time of the book files" diff --git a/manual/diff.rst b/manual/diff.rst index 480a0f9dde..51efa92f96 100644 --- a/manual/diff.rst +++ b/manual/diff.rst @@ -46,7 +46,7 @@ effects, as it can cause invalid markup to be altered to make it valid. You can also change the number of lines of context shown around differences via the :guilabel:`Options` button. -You can search for any text in the differences via the search bar at the +You can search for any text in the differences via the Search bar at the bottom. You will need to specify which panel to search, the :guilabel:`Left` or the :guilabel:`Right`. diff --git a/manual/gui.rst b/manual/gui.rst index 3d56958cc4..c063976e43 100644 --- a/manual/gui.rst +++ b/manual/gui.rst @@ -313,7 +313,7 @@ The Search & Sort section allows you to perform several powerful actions on your * You can sort them by title, author, date, rating, etc. by clicking on the column titles. You can also sub-sort, i.e. sort on multiple columns. For example, if you click on the title column and then the author column, the book will be sorted by author and then all the entries for the same author will be sorted by title. - * You can search for a particular book or set of books using the search bar. More on that below. + * You can search for a particular book or set of books using the Search bar. More on that below. * You can quickly and conveniently edit metadata by selecting the entry you want changed in the list and pressing the :kbd:`E` key. @@ -329,7 +329,7 @@ The Search & Sort section allows you to perform several powerful actions on your The search interface --------------------- -You can search all the metadata by entering search terms in the search bar. Searches are case insensitive. For example:: +You can search all the metadata by entering search terms in the Search bar. Searches are case insensitive. For example:: Asimov Foundation format:lrf @@ -397,7 +397,7 @@ custom series column named ``#my_series``, you would use the search name ``#my_s Series indices are numbers, so you can use the relational operators described above. The special field ``search`` is used for saved searches. So if you save a search with the name -"My spouse's books" you can enter ``search:"My spouse's books"`` in the search bar to reuse the saved +"My spouse's books" you can enter ``search:"My spouse's books"`` in the Search bar to reuse the saved search. More about saving searches below. You can search for the absence or presence of a field using the special "true" and "false" values. For example:: @@ -440,7 +440,7 @@ Identifiers (e.g., isbn, doi, lccn etc) also use an extended syntax. First, note Saving searches ----------------- -calibre allows you to save a frequently used search under a special name and then reuse that search with a single click. To do this, create your search either by typing it in the search bar or using the Tag browser. Then type the name you would like to give to the search in the Saved Searches box next to the search bar. Click the plus icon next to the saved searches box to save the search. +calibre allows you to save a frequently used search under a special name and then reuse that search with a single click. To do this, create your search either by typing it in the Search bar or using the Tag browser. Then type the name you would like to give to the search in the Saved Searches box next to the Search bar. Click the plus icon next to the saved searches box to save the search. Now you can access your saved search in the Tag browser under "Searches". A single click will allow you to reuse any arbitrarily complex search easily, without needing to re-create it. diff --git a/manual/regexp.rst b/manual/regexp.rst index a13313b2d2..b6b124de00 100644 --- a/manual/regexp.rst +++ b/manual/regexp.rst @@ -29,7 +29,7 @@ What on earth *is* a regular expression? A regular expression is a way to describe sets of strings. A single regular expression can *match* a number of different strings. This is what makes regular expression so powerful -- they are a concise way of describing a potentially large number of variations. -.. note:: I'm using string here in the sense it is used in programming languages: a string of one or more characters, characters including actual characters, numbers, punctuation and so-called whitespace (linebreaks, tabulators etc.). Please note that generally, uppercase and lowercase characters are not considered the same, thus "a" being a different character from "A" and so forth. In calibre, regular expressions are case insensitive in the search bar, but not in the conversion options. There's a way to make every regular expression case insensitive, but we'll discuss that later. It gets complicated because regular expressions allow for variations in the strings it matches, so one expression can match multiple strings, which is why people bother using them at all. More on that in a bit. +.. note:: I'm using string here in the sense it is used in programming languages: a string of one or more characters, characters including actual characters, numbers, punctuation and so-called whitespace (linebreaks, tabulators etc.). Please note that generally, uppercase and lowercase characters are not considered the same, thus "a" being a different character from "A" and so forth. In calibre, regular expressions are case insensitive in the Search bar, but not in the conversion options. There's a way to make every regular expression case insensitive, but we'll discuss that later. It gets complicated because regular expressions allow for variations in the strings it matches, so one expression can match multiple strings, which is why people bother using them at all. More on that in a bit. Care to explain? -------------------- diff --git a/manual/virtual_libraries.rst b/manual/virtual_libraries.rst index 766c32c3aa..51f378bdb7 100644 --- a/manual/virtual_libraries.rst +++ b/manual/virtual_libraries.rst @@ -27,7 +27,7 @@ Creating Virtual libraries :class: float-left-img |vlb| To use a virtual library click the :guilabel:`Virtual library` button located -to the left of the search bar and select the :guilabel:`Create Virtual library` +to the left of the Search bar and select the :guilabel:`Create Virtual library` option. As a first example, let's create a virtual library that shows us only the books by a particular author. Click the :guilabel:`Authors` link as shown in the image below and choose the author you want to use and click OK. @@ -47,7 +47,7 @@ You can switch back to the full library at any time by once again clicking the Virtual libraries are based on *searches*. You can use any search as the basis of a virtual library. The virtual library will contain only the books matched by that search. First, type in the search you want to use -in the search bar or build a search using the :guilabel:`Tag browser`. +in the Search bar or build a search using the :guilabel:`Tag browser`. When you are happy with the returned results, click the Virtual library button, choose :guilabel:`Create library` and enter a name for the new virtual library. The virtual library will then be created based on the search diff --git a/resources/default_tweaks.py b/resources/default_tweaks.py index a143ea75e7..5133aa0c34 100644 --- a/resources/default_tweaks.py +++ b/resources/default_tweaks.py @@ -554,8 +554,8 @@ content_server_thumbnail_compression_quality = 75 # cover_drop_exclude = {'tiff', 'webp'} cover_drop_exclude = () -#: Show the Saved searches box in the search bar +#: Show the Saved searches box in the Search bar # In newer version of calibre, only a button that allows you to add a new Saved -# search is shown in the search bar. If you would like to have the old +# search is shown in the Search bar. If you would like to have the old # Saved searches box with its two buttons back, set this tweak to True. show_saved_search_box = False diff --git a/src/calibre/gui2/preferences/search.py b/src/calibre/gui2/preferences/search.py index c91110dc00..50c0eee10c 100644 --- a/src/calibre/gui2/preferences/search.py +++ b/src/calibre/gui2/preferences/search.py @@ -49,7 +49,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): "

Note: Search terms are forced to lower case; MySearch " "and mysearch are the same term." "

You can have your grouped search term show up as User categories in " - " the Tag browser. Just add the grouped search term names to the Make user " + " the Tag browser. Just add the grouped search term names to the Make User " "categories from box. You can add multiple terms separated by commas. " "The new User category will be automatically " "populated with all the items in the categories included in the grouped " diff --git a/src/calibre/gui2/preferences/search.ui b/src/calibre/gui2/preferences/search.ui index 3080216809..fce0d988e5 100644 --- a/src/calibre/gui2/preferences/search.ui +++ b/src/calibre/gui2/preferences/search.ui @@ -323,10 +323,10 @@ to be shown as user categories - <p>This option will cause a small button to appear next to the search bar. Clicking the button will toggle between showing only the search results and showing all books with the search results highlighted. + <p>This option will cause a small button to appear next to the Search bar. Clicking the button will toggle between showing only the search results and showing all books with the search results highlighted. - Show a &quick toggle button to switch between highlighting and restricting results next to the searchbar + Show a &quick toggle button to switch between highlighting and restricting results next to the Search bar diff --git a/src/pyj/read_book/search.pyj b/src/pyj/read_book/search.pyj index a03eefab4f..a36957bd95 100644 --- a/src/pyj/read_book/search.pyj +++ b/src/pyj/read_book/search.pyj @@ -32,7 +32,7 @@ class SearchOverlay: prev_button.addEventListener('click', def(ev): self.find_previous();) # We cannot use simple link for the close button as it causes the # button to remain red when the search panel is re-opened - close_button = E.div(style='cursor:pointer', svgicon('close'), title=_('Close search bar')) + close_button = E.div(style='cursor:pointer', svgicon('close'), title=_('Close Search bar')) close_button.addEventListener('click', def(ev): window.setTimeout(self.hide, 0);) c.appendChild(E.div( svgicon('search'), '\xa0',