From 7ae8ad6dde6f1729f21cb5ea0aa3e331c89ddb4c Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Sat, 23 Jul 2022 17:16:55 +0100
Subject: [PATCH] Add a tooltip explaining that you can create a compound icon
 by separating the file names with a colon.

---
 src/calibre/gui2/dialogs/template_dialog.py |  1 +
 src/calibre/gui2/dialogs/template_dialog.ui | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/dialogs/template_dialog.py b/src/calibre/gui2/dialogs/template_dialog.py
index 0cab0d6ddc..d8c5ed7068 100644
--- a/src/calibre/gui2/dialogs/template_dialog.py
+++ b/src/calibre/gui2/dialogs/template_dialog.py
@@ -276,6 +276,7 @@ class TemplateDialog(QDialog, Ui_TemplateDialog):
             self.colored_field.setCurrentIndex(self.colored_field.findData(color_field))
         elif self.iconing or self.embleming:
             self.icon_layout.setVisible(True)
+            self.icon_select_layout.setContentsMargins(0, 0, 0, 0)
             if self.embleming:
                 self.icon_kind_label.setVisible(False)
                 self.icon_kind.setVisible(False)
diff --git a/src/calibre/gui2/dialogs/template_dialog.ui b/src/calibre/gui2/dialogs/template_dialog.ui
index 2c3eb4b9f2..5f5ac361d1 100644
--- a/src/calibre/gui2/dialogs/template_dialog.ui
+++ b/src/calibre/gui2/dialogs/template_dialog.ui
@@ -76,7 +76,7 @@
         <widget class="QWidget" name="icon_layout">
          <layout class="QGridLayout">
           <item row="0" column="0" colspan="2">
-           <layout class="QHBoxLayout">
+           <layout class="QHBoxLayout" name="icon_kind_layout">
             <item>
              <widget class="QLabel" name="icon_kind_label">
               <property name="text">
@@ -110,15 +110,21 @@
              <string>Copy an icon file name to the clipboard:</string>
             </property>
             <property name="buddy">
-             <cstring>color_name</cstring>
+             <cstring>icon_files</cstring>
             </property>
            </widget>
           </item>
           <item row="2" column="1">
            <widget class="QWidget">
-            <layout class="QHBoxLayout">
+            <layout class="QHBoxLayout" name="icon_select_layout">
              <item>
               <widget class="QComboBox" name="icon_files">
+               <property name="toolTip">
+                <string>&lt;p&gt;The template must return the name of the icon file
+                to display. If you wish to display multiple icons, separate the
+                individual icon file names with a ':' (colon). They will all be
+                displayed on the column&lt;/p&gt;</string>
+               </property>
               </widget>
              </item>
              <item>