From 27d5a7fab2b1d24ebf634fc9884d6264d5b767e3 Mon Sep 17 00:00:00 2001
From: Ximi1970 <ximi.github@gmail.com>
Date: Mon, 18 Jan 2021 22:13:01 +0100
Subject: [PATCH] Add default tb icon for notifications

---
 app/SysTray-X/SysTray-X-app/preferences.h     |   3 +-
 app/SysTray-X/SysTray-X-app/preferences.ui    | 255 ++++++++++--------
 .../SysTray-X-app/preferencesdialog.cpp       |   1 +
 app/SysTray-X/SysTray-X-app/systrayxicon.cpp  |   6 +
 .../SysTray-X-app/systrayxstatusnotifier.cpp  |   6 +
 webext/options.html                           |   8 +
 6 files changed, 162 insertions(+), 117 deletions(-)

diff --git a/app/SysTray-X/SysTray-X-app/preferences.h b/app/SysTray-X/SysTray-X-app/preferences.h
index bc7a7d6..8a7f370 100644
--- a/app/SysTray-X/SysTray-X-app/preferences.h
+++ b/app/SysTray-X/SysTray-X-app/preferences.h
@@ -54,7 +54,8 @@ class Preferences : public QObject
             PREF_BLANK_ICON = 0,
             PREF_NEWMAIL_ICON,
             PREF_CUSTOM_ICON,
-            PREF_NO_ICON
+            PREF_NO_ICON,
+            PREF_TB_ICON
         };
 
         /*
diff --git a/app/SysTray-X/SysTray-X-app/preferences.ui b/app/SysTray-X/SysTray-X-app/preferences.ui
index 9e9441a..ec99ba9 100644
--- a/app/SysTray-X/SysTray-X-app/preferences.ui
+++ b/app/SysTray-X/SysTray-X-app/preferences.ui
@@ -19,7 +19,7 @@
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
-    <layout class="QVBoxLayout" name="verticalLayout_19">
+    <layout class="QVBoxLayout" name="verticalLayout_2">
      <item>
       <widget class="QGroupBox" name="defaultIconGroupBox">
        <property name="title">
@@ -111,132 +111,155 @@
        <property name="title">
         <string>Mail notification icon</string>
        </property>
-       <layout class="QVBoxLayout" name="verticalLayout_2">
+       <layout class="QVBoxLayout" name="verticalLayout">
         <item>
-         <layout class="QVBoxLayout" name="verticalLayout">
+         <layout class="QHBoxLayout" name="horizontalLayout_3">
+          <property name="sizeConstraint">
+           <enum>QLayout::SetFixedSize</enum>
+          </property>
           <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_3">
-            <property name="sizeConstraint">
-             <enum>QLayout::SetFixedSize</enum>
+           <widget class="QRadioButton" name="blankRadioButton">
+            <property name="text">
+             <string>Blank icon</string>
             </property>
-            <item>
-             <widget class="QRadioButton" name="blankRadioButton">
-              <property name="text">
-               <string>Blank icon</string>
-              </property>
-              <property name="checked">
-               <bool>true</bool>
-              </property>
-              <attribute name="buttonGroup">
-               <string notr="true">iconTypeGroup</string>
-              </attribute>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer_2">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+            <attribute name="buttonGroup">
+             <string notr="true">iconTypeGroup</string>
+            </attribute>
+           </widget>
           </item>
           <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_2">
-            <property name="sizeConstraint">
-             <enum>QLayout::SetFixedSize</enum>
+           <spacer name="horizontalSpacer_2">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
             </property>
-            <item>
-             <widget class="QRadioButton" name="newMailButton">
-              <property name="text">
-               <string>New mail icon</string>
-              </property>
-              <attribute name="buttonGroup">
-               <string notr="true">iconTypeGroup</string>
-              </attribute>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <property name="sizeConstraint">
+           <enum>QLayout::SetFixedSize</enum>
+          </property>
+          <item>
+           <widget class="QRadioButton" name="newMailButton">
+            <property name="text">
+             <string>New mail icon</string>
+            </property>
+            <attribute name="buttonGroup">
+             <string notr="true">iconTypeGroup</string>
+            </attribute>
+           </widget>
           </item>
           <item>
-           <layout class="QHBoxLayout" name="horizontalLayout">
-            <property name="sizeConstraint">
-             <enum>QLayout::SetMaximumSize</enum>
+           <spacer name="horizontalSpacer">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
             </property>
-            <item>
-             <widget class="QRadioButton" name="customRadioButton">
-              <property name="text">
-               <string>Custom icon</string>
-              </property>
-              <attribute name="buttonGroup">
-               <string notr="true">iconTypeGroup</string>
-              </attribute>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="imageLabel">
-              <property name="text">
-               <string/>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="chooseCustomButton">
-              <property name="text">
-               <string>Choose</string>
-              </property>
-              <property name="flat">
-               <bool>false</bool>
-              </property>
-             </widget>
-            </item>
-           </layout>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout">
+          <property name="sizeConstraint">
+           <enum>QLayout::SetMaximumSize</enum>
+          </property>
+          <item>
+           <widget class="QRadioButton" name="customRadioButton">
+            <property name="text">
+             <string>Custom icon</string>
+            </property>
+            <attribute name="buttonGroup">
+             <string notr="true">iconTypeGroup</string>
+            </attribute>
+           </widget>
           </item>
           <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_8">
-            <item>
-             <widget class="QRadioButton" name="noIconRadioButton">
-              <property name="text">
-               <string>No icon</string>
-              </property>
-              <attribute name="buttonGroup">
-               <string notr="true">iconTypeGroup</string>
-              </attribute>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer_3">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
+           <widget class="QLabel" name="imageLabel">
+            <property name="text">
+             <string/>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="chooseCustomButton">
+            <property name="text">
+             <string>Choose</string>
+            </property>
+            <property name="flat">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_8">
+          <item>
+           <widget class="QRadioButton" name="noIconRadioButton">
+            <property name="text">
+             <string>No icon</string>
+            </property>
+            <attribute name="buttonGroup">
+             <string notr="true">iconTypeGroup</string>
+            </attribute>
+           </widget>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer_3">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_11">
+          <item>
+           <widget class="QRadioButton" name="tbIconRadioButton">
+            <property name="text">
+             <string>Default Thunderbird</string>
+            </property>
+            <attribute name="buttonGroup">
+             <string notr="true">iconTypeGroup</string>
+            </attribute>
+           </widget>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer_5">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
           </item>
          </layout>
         </item>
diff --git a/app/SysTray-X/SysTray-X-app/preferencesdialog.cpp b/app/SysTray-X/SysTray-X-app/preferencesdialog.cpp
index 5ed0da1..af37783 100644
--- a/app/SysTray-X/SysTray-X-app/preferencesdialog.cpp
+++ b/app/SysTray-X/SysTray-X-app/preferencesdialog.cpp
@@ -66,6 +66,7 @@ PreferencesDialog::PreferencesDialog( SysTrayXLink *link, Preferences *pref, QWi
     m_ui->iconTypeGroup->setId( m_ui->newMailButton, Preferences::PREF_NEWMAIL_ICON );
     m_ui->iconTypeGroup->setId( m_ui->customRadioButton, Preferences::PREF_CUSTOM_ICON );
     m_ui->iconTypeGroup->setId( m_ui->noIconRadioButton, Preferences::PREF_NO_ICON );
+    m_ui->iconTypeGroup->setId( m_ui->tbIconRadioButton, Preferences::PREF_TB_ICON );
 
     /*
      *  Set count type button Ids
diff --git a/app/SysTray-X/SysTray-X-app/systrayxicon.cpp b/app/SysTray-X/SysTray-X-app/systrayxicon.cpp
index d7005c6..7bbe949 100644
--- a/app/SysTray-X/SysTray-X-app/systrayxicon.cpp
+++ b/app/SysTray-X/SysTray-X-app/systrayxicon.cpp
@@ -340,6 +340,12 @@ void    SysTrayXIcon::renderIcon()
                 pixmap = lookthrough;
                 break;
             }
+
+            case Preferences::PREF_TB_ICON:
+            {
+                pixmap = QPixmap( ":/files/icons/Thunderbird.png" );
+                break;
+            }
         }
     }
     else
diff --git a/app/SysTray-X/SysTray-X-app/systrayxstatusnotifier.cpp b/app/SysTray-X/SysTray-X-app/systrayxstatusnotifier.cpp
index 5195eb4..f27ee08 100644
--- a/app/SysTray-X/SysTray-X-app/systrayxstatusnotifier.cpp
+++ b/app/SysTray-X/SysTray-X-app/systrayxstatusnotifier.cpp
@@ -374,6 +374,12 @@ void    SysTrayXStatusNotifier::renderIcon()
                 pixmap = lookthrough;
                 break;
             }
+
+            case Preferences::PREF_TB_ICON:
+            {
+                pixmap = QPixmap( ":/files/icons/Thunderbird.png" );
+                break;
+            }
         }
     }
     else
diff --git a/webext/options.html b/webext/options.html
index 09e115a..0a1cffb 100644
--- a/webext/options.html
+++ b/webext/options.html
@@ -278,6 +278,14 @@
               >
             </td>
           </tr>
+          <tr>
+            <td>
+              <input type="radio" name="iconType" id="iconTb" value="4" />
+              <label for="iconTb" id="iconTbLabel"
+                >__MSG_icons_default_tb__</label
+              >
+            </td>
+          </tr>
         </table>
 
         <table id="numberprops">