From 708917e8cd369ddcab37356448bb1cba680ff471 Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Fri, 1 Jul 2011 16:10:47 +0100
Subject: [PATCH] Add more to the tool tip for the new html composite column
 subtype

---
 .../gui2/preferences/create_custom_column.py      | 15 +++++++++++++++
 .../gui2/preferences/create_custom_column.ui      |  3 ---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/preferences/create_custom_column.py b/src/calibre/gui2/preferences/create_custom_column.py
index 9238ab3039..b57447bba7 100644
--- a/src/calibre/gui2/preferences/create_custom_column.py
+++ b/src/calibre/gui2/preferences/create_custom_column.py
@@ -143,6 +143,21 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn):
 
         all_colors = [unicode(s) for s in list(QColor.colorNames())]
         self.enum_colors_label.setToolTip('<p>' + ', '.join(all_colors) + '</p>')
+
+        self.composite_contains_html.setToolTip('<p>' +
+                _('If checked, this column will be displayed as HTML in '
+                  'book details and the content server. This can be used to '
+                  'construct links with the template language. For example, '
+                  'the template '
+                  '<pre>&lt;big&gt;&lt;b&gt;{title}&lt;/b&gt;&lt;/big&gt;'
+                  '{series:| [|}{series_index:| [|]]}</pre>'
+                  'will create a field displaying the title in bold large '
+                  'characters, along with the series, for example <br>"<big><b>'
+                  'An Oblique Approach</b></big> [Belisarius [1]]". The template '
+                  '<pre>&lt;a href="http://www.beam-ebooks.de/ebook/{identifiers'
+                  ':select(beam)}"&gt;Beam book&lt;/a&gt;</pre> '
+                  'will generate a link to the book on the Beam ebooks site.')
+                        + '</p>')
         self.exec_()
 
     def shortcut_activated(self, url):
diff --git a/src/calibre/gui2/preferences/create_custom_column.ui b/src/calibre/gui2/preferences/create_custom_column.ui
index e6729e9657..54fae6a150 100644
--- a/src/calibre/gui2/preferences/create_custom_column.ui
+++ b/src/calibre/gui2/preferences/create_custom_column.ui
@@ -296,9 +296,6 @@ and end with &lt;code&gt;}&lt;/code&gt; You can have text before and after the f
          </item>
          <item>
           <widget class="QCheckBox" name="composite_contains_html">
-           <property name="toolTip">
-            <string>If checked, this column will be displayed as HTML in book details and the content server</string>
-           </property>
            <property name="text">
             <string>Show as HTML in book details</string>
            </property>