use helpspoiler everywhere

martinrotter · Mar 16, 2022 · 0c10e8f · 0c10e8f
1 parent 0b71248
commit 0c10e8f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 27 deletions.
diff --git a/src/librssguard/gui/settings/settingsbrowsermail.cpp b/src/librssguard/gui/settings/settingsbrowsermail.cpp
@@ -21,9 +21,17 @@ SettingsBrowserMail::SettingsBrowserMail(Settings* settings, QWidget* parent)
 
   m_ui->m_tabBrowserProxy->addTab(m_proxyDetails, tr("Network proxy"));
 
-  GuiUtilities::setLabelAsNotice(*m_ui->label, false);
-  GuiUtilities::setLabelAsNotice(*m_ui->m_lblExternalEmailInfo, false);
-  GuiUtilities::setLabelAsNotice(*m_ui->m_lblToolInfo, false);
+  m_ui->m_lblExternalBrowserInfo->setHelpText(tr("Note that \"%1\" (without quotation marks) "
+                                                 "is placeholder for URL of selected message."),
+                                              false);
+
+  m_ui->m_lblExternalEmailInfo->setHelpText(tr("Placeholders:\n"
+                                               " • %1 - title of selected message,\n"
+                                               " • %2 - body of selected message."),
+                                            false);
+
+  m_ui->m_lblToolInfo->setHelpText(tr("On this page, you can setup a list of external tools which can open URLs."),
+                                   false);
 
   m_ui->m_btnAddTool->setIcon(qApp->icons()->fromTheme(QSL("list-add")));
   m_ui->m_btnEditTool->setIcon(qApp->icons()->fromTheme(QSL("document-edit")));

diff --git a/src/librssguard/gui/settings/settingsbrowsermail.ui b/src/librssguard/gui/settings/settingsbrowsermail.ui
@@ -130,14 +130,7 @@
            </widget>
           </item>
           <item row="3" column="0" colspan="2">
-           <widget class="QLabel" name="label">
-            <property name="text">
-             <string>Note that &quot;%1&quot; (without quotation marks) is placeholder for URL of selected message.</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignCenter</set>
-            </property>
-           </widget>
+           <widget class="HelpSpoiler" name="m_lblExternalBrowserInfo" native="true"/>
           </item>
          </layout>
         </widget>
@@ -253,17 +246,8 @@
             </item>
            </widget>
           </item>
-          <item row="3" column="1">
-           <widget class="QLabel" name="m_lblExternalEmailInfo">
-            <property name="text">
-             <string>Placeholders:
- • %1 - title of selected message,
- • %2 - body of selected message.</string>
-            </property>
-            <property name="indent">
-             <number>20</number>
-            </property>
-           </widget>
+          <item row="3" column="0" colspan="2">
+           <widget class="HelpSpoiler" name="m_lblExternalEmailInfo" native="true"/>
           </item>
          </layout>
         </widget>
@@ -347,11 +331,7 @@
         </spacer>
        </item>
        <item row="0" column="0" colspan="2">
-        <widget class="QLabel" name="m_lblToolInfo">
-         <property name="text">
-          <string>On this page, you can setup a list of external tools which can open URLs.</string>
-         </property>
-        </widget>
+        <widget class="HelpSpoiler" name="m_lblToolInfo" native="true"/>
        </item>
       </layout>
      </widget>
@@ -365,6 +345,12 @@
    <extends>QLineEdit</extends>
    <header>baselineedit.h</header>
   </customwidget>
+  <customwidget>
+   <class>HelpSpoiler</class>
+   <extends>QWidget</extends>
+   <header>helpspoiler.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>m_tabBrowserProxy</tabstop>