From cfd7c80afd4d68ab90fc6430ed3c5e9126e7dc28 Mon Sep 17 00:00:00 2001
From: Ximi1970 <ximi.github@gmail.com>
Date: Wed, 27 May 2020 11:35:10 +0200
Subject: [PATCH] Add no icon preference

---
 app/SysTray-X/preferences.h         |  3 ++-
 app/SysTray-X/preferences.ui        | 37 +++++++++++++++++++++++++----
 app/SysTray-X/preferencesdialog.cpp |  1 +
 app/SysTray-X/systrayxicon.cpp      | 10 ++++++++
 webext/options.html                 | 13 +++++++++-
 5 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/app/SysTray-X/preferences.h b/app/SysTray-X/preferences.h
index 4a22c82..3a01305 100644
--- a/app/SysTray-X/preferences.h
+++ b/app/SysTray-X/preferences.h
@@ -42,7 +42,8 @@ class Preferences : public QObject
         enum IconType {
             PREF_BLANK_ICON = 0,
             PREF_NEWMAIL_ICON,
-            PREF_CUSTOM_ICON
+            PREF_CUSTOM_ICON,
+            PREF_NO_ICON
         };
 
         /*
diff --git a/app/SysTray-X/preferences.ui b/app/SysTray-X/preferences.ui
index 191fa56..b92f9f3 100644
--- a/app/SysTray-X/preferences.ui
+++ b/app/SysTray-X/preferences.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>495</width>
-    <height>540</height>
+    <width>525</width>
+    <height>600</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -275,6 +275,33 @@
             </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>
          </layout>
         </item>
        </layout>
@@ -457,9 +484,9 @@
   </connection>
  </connections>
  <buttongroups>
-  <buttongroup name="defaultIconTypeGroup"/>
-  <buttongroup name="minimizeTypeGroup"/>
-  <buttongroup name="iconTypeGroup"/>
   <buttongroup name="countTypeGroup"/>
+  <buttongroup name="minimizeTypeGroup"/>
+  <buttongroup name="defaultIconTypeGroup"/>
+  <buttongroup name="iconTypeGroup"/>
  </buttongroups>
 </ui>
diff --git a/app/SysTray-X/preferencesdialog.cpp b/app/SysTray-X/preferencesdialog.cpp
index 32ea313..4c48b39 100644
--- a/app/SysTray-X/preferencesdialog.cpp
+++ b/app/SysTray-X/preferencesdialog.cpp
@@ -50,6 +50,7 @@ PreferencesDialog::PreferencesDialog( SysTrayXLink *link, Preferences *pref, QWi
     m_ui->iconTypeGroup->setId( m_ui->blankRadioButton, Preferences::PREF_BLANK_ICON );
     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 );
 
     /*
      *  Set count type button Ids
diff --git a/app/SysTray-X/systrayxicon.cpp b/app/SysTray-X/systrayxicon.cpp
index c704bf1..eed50e6 100644
--- a/app/SysTray-X/systrayxicon.cpp
+++ b/app/SysTray-X/systrayxicon.cpp
@@ -234,6 +234,8 @@ void    SysTrayXIcon::renderIcon()
 {
     QPixmap pixmap;
 
+    m_unread_mail = 9;
+
     if( m_unread_mail > 0 )
     {
         switch( m_icon_type )
@@ -256,6 +258,14 @@ void    SysTrayXIcon::renderIcon()
                 pixmap.loadFromData( m_icon_data );
                 break;
             }
+
+            case Preferences::PREF_NO_ICON:
+            {
+                QPixmap lookthrough( 256, 256 );
+                lookthrough.fill( Qt::transparent );
+                pixmap = lookthrough;
+                break;
+            }
         }
     }
     else
diff --git a/webext/options.html b/webext/options.html
index 83c67a5..89ff355 100644
--- a/webext/options.html
+++ b/webext/options.html
@@ -163,6 +163,9 @@
               &emsp;
             </td>
           </tr>
+          <tr>
+            <td><input type="radio" name="iconType" value="3" /> No icon</td>
+          </tr>
         </table>
 
         <table id="numberprops">
@@ -195,7 +198,15 @@
           <tr>
             <td>
               <label for="numberSize">Number size:</label>
-              <input type="number" name="numberSize" value="0" min="1" max="999" step="1" size="3" />
+              <input
+                type="number"
+                name="numberSize"
+                value="0"
+                min="1"
+                max="999"
+                step="1"
+                size="3"
+              />
             </td>
           </tr>
         </table>