From 46a5105fb4b1d92905743dfdd59450dfd37578fb Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Tue, 15 Feb 2011 18:26:21 +0000
Subject: [PATCH] Alter tooltips and help docs for grouped search terms to (one
 hopes) make it clearer.

---
 src/calibre/gui2/preferences/search.py | 30 +++++++++++++++-----------
 src/calibre/gui2/preferences/search.ui | 18 +++++++++++++---
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/calibre/gui2/preferences/search.py b/src/calibre/gui2/preferences/search.py
index 4f108d7cbc..db93cbd525 100644
--- a/src/calibre/gui2/preferences/search.py
+++ b/src/calibre/gui2/preferences/search.py
@@ -36,22 +36,26 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
     "search term <code>allseries</code> with the value "
     "<code>series, #myseries, #myseries2</code>, then "
     "the query <code>allseries:adhoc</code> will find 'adhoc' in any of the "
-    "columns 'series', '#myseries', and '#myseries2'.<p> Enter the name of the "
+    "columns <code>series</code>, <code>#myseries</code>, and "
+    "<code>#myseries2</code>.<p> Enter the name of the "
     "grouped search term in the drop-down box, enter the list of columns "
     "to search in the value box, then push the Save button. "
-    "<p>Note: Search terms are forced to lower case; 'MySearch' "
-    "and 'mysearch' are the same term."
-    "<p>You can have your grouped search term show up as a user category in "
-    " the Tag Browser. Just add the grouped search term name to the user "
-    "category box. You can add multiple terms separated by commas. "
-    "The user category will be "
+    "<p>Note: Search terms are forced to lower case; <code>MySearch</code> "
+    "and <code>mysearch</code> are the same term."
+    "<p>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 "
+    "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 "
-    "search term. <p>This permits you to see easily all the category items that "
-    "are in the fields contained in the grouped search term. Using the above "
-    "'myseries' example, the automatically-generated user category would contain "
-    "all the series mentioned in 'series', '#myseries1', and '#myseries2'. This "
-    "can be useful to check for duplicates or to find which column contains "
-    "a particular item."))
+    "search term. <p>Automatic user categories permit you to see easily "
+    "all the category items that "
+    "are in the columns contained in the grouped search term. Using the above "
+    "<code>allseries</code> example, the automatically-generated user category "
+    "will contain all the series mentioned in <code>series</code>, "
+    "<code>#myseries</code>, and <code>#myseries2</code>. This "
+    "can be useful to check for duplicates, to find which column contains "
+    "a particular item, or to have hierarchical categories (categories "
+    "that contain categories)."))
         self.gst = db.prefs.get('grouped_search_terms', {})
         self.orig_gst_keys = self.gst.keys()
 
diff --git a/src/calibre/gui2/preferences/search.ui b/src/calibre/gui2/preferences/search.ui
index 3466b53a24..3f5b43bbb6 100644
--- a/src/calibre/gui2/preferences/search.ui
+++ b/src/calibre/gui2/preferences/search.ui
@@ -98,7 +98,7 @@
         <item>
          <widget class="QLabel" name="la10">
           <property name="text">
-           <string>&amp;Grouped search terms:</string>
+           <string>&amp;Names:</string>
           </property>
           <property name="buddy">
            <cstring>gst_names</cstring>
@@ -113,6 +113,13 @@
           <property name="minimumContentsLength">
            <number>10</number>
           </property>
+          <property name="toolTip">
+           <string>Contains the names of the currently-defined group search terms.
+Create a new name by entering it into the empty box, then
+pressing Save. Rename a search term by selecting it then
+changing the name and pressing Save. Change the value of
+a search term by changing the value box then pressing Save.</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -161,7 +168,7 @@ of a search term by changing the value box then pressing Save.</string>
         <item>
          <widget class="QLabel" name="l11">
           <property name="text">
-           <string>Make &amp;user categories:</string>
+           <string>Make &amp;user categories from:</string>
           </property>
           <property name="buddy">
            <cstring>opt_grouped_search_make_user_categories</cstring>
@@ -169,7 +176,12 @@ of a search term by changing the value box then pressing Save.</string>
          </widget>
         </item>
         <item>
-         <widget class="MultiCompleteLineEdit" name="opt_grouped_search_make_user_categories"/>
+         <widget class="MultiCompleteLineEdit" name="opt_grouped_search_make_user_categories">
+          <property name="toolTip">
+           <string>Enter the names of any grouped search terms you wish
+to be shown as user categories</string>
+          </property>
+         </widget>
         </item>
        </layout>
       </item>