diff --git a/app/SysTray-X/SysTray-X-app/SysTray-X.qrc b/app/SysTray-X/SysTray-X-app/SysTray-X.qrc
index b704796..6abe2c9 100644
--- a/app/SysTray-X/SysTray-X-app/SysTray-X.qrc
+++ b/app/SysTray-X/SysTray-X-app/SysTray-X.qrc
@@ -29,5 +29,6 @@
languages/SysTray-X.zh-CN.qm
languages/SysTray-X.zh-TW.qm
files/icons/blank-icon-dark.png
+ files/icons/Thunderbird115.png
diff --git a/app/SysTray-X/SysTray-X-app/files/icons/Thunderbird115.png b/app/SysTray-X/SysTray-X-app/files/icons/Thunderbird115.png
new file mode 100644
index 0000000..ccc26b2
Binary files /dev/null and b/app/SysTray-X/SysTray-X-app/files/icons/Thunderbird115.png differ
diff --git a/app/SysTray-X/SysTray-X-app/systrayxicon.cpp b/app/SysTray-X/SysTray-X-app/systrayxicon.cpp
index 7bbe949..1d59353 100644
--- a/app/SysTray-X/SysTray-X-app/systrayxicon.cpp
+++ b/app/SysTray-X/SysTray-X-app/systrayxicon.cpp
@@ -20,7 +20,7 @@
* Constructor
*/
SysTrayXIcon::SysTrayXIcon( SysTrayXLink* link, Preferences* pref, QObject* parent )
- : QSystemTrayIcon( QIcon( ":/files/icons/Thunderbird.png" ), parent )
+ : QSystemTrayIcon( parent )
{
/*
* Initialize
@@ -343,7 +343,16 @@ void SysTrayXIcon::renderIcon()
case Preferences::PREF_TB_ICON:
{
- pixmap = QPixmap( ":/files/icons/Thunderbird.png" );
+ QString version = m_pref->getBrowserVersion();
+
+ if( version.section( '.', 0, 0 ).toInt() < 115 )
+ {
+ pixmap = QPixmap( ":/files/icons/Thunderbird.png" );
+ }
+ else
+ {
+ pixmap = QPixmap( ":/files/icons/Thunderbird115.png" );
+ }
break;
}
}
@@ -354,7 +363,16 @@ void SysTrayXIcon::renderIcon()
{
case Preferences::PREF_DEFAULT_ICON_DEFAULT:
{
- pixmap = QPixmap( ":/files/icons/Thunderbird.png" );
+ QString version = m_pref->getBrowserVersion();
+
+ if( version.section( '.', 0, 0 ).toInt() < 115 )
+ {
+ pixmap = QPixmap( ":/files/icons/Thunderbird.png" );
+ }
+ else
+ {
+ pixmap = QPixmap( ":/files/icons/Thunderbird115.png" );
+ }
break;
}
diff --git a/app/SysTray-X/SysTray-X-app/systrayxstatusnotifier.cpp b/app/SysTray-X/SysTray-X-app/systrayxstatusnotifier.cpp
index f27ee08..f1894d5 100644
--- a/app/SysTray-X/SysTray-X-app/systrayxstatusnotifier.cpp
+++ b/app/SysTray-X/SysTray-X-app/systrayxstatusnotifier.cpp
@@ -47,7 +47,17 @@ SysTrayXStatusNotifier::SysTrayXStatusNotifier( SysTrayXLink* link, Preferences*
*/
setCategory( KStatusNotifierItem::ApplicationStatus );
- setIconByPixmap( QIcon( QPixmap( ":/files/icons/Thunderbird.png") ) );
+ QString version = m_pref->getBrowserVersion();
+
+ if( version.section( '.', 0, 0 ).toInt() < 115 )
+ {
+ setIconByPixmap( QIcon( QPixmap( ":/files/icons/Thunderbird.png") ) );
+ }
+ else
+ {
+ setIconByPixmap( QIcon( QPixmap( ":/files/icons/Thunderbird115.png") ) );
+ }
+
setTitle("SysTray-X");
setStatus( KStatusNotifierItem::ItemStatus::Passive );
@@ -377,7 +387,16 @@ void SysTrayXStatusNotifier::renderIcon()
case Preferences::PREF_TB_ICON:
{
- pixmap = QPixmap( ":/files/icons/Thunderbird.png" );
+ QString version = m_pref->getBrowserVersion();
+
+ if( version.section( '.', 0, 0 ).toInt() < 115 )
+ {
+ pixmap = QPixmap( ":/files/icons/Thunderbird.png" );
+ }
+ else
+ {
+ pixmap = QPixmap( ":/files/icons/Thunderbird115.png" );
+ }
break;
}
}
@@ -388,7 +407,16 @@ void SysTrayXStatusNotifier::renderIcon()
{
case Preferences::PREF_DEFAULT_ICON_DEFAULT:
{
- pixmap = QPixmap( ":/files/icons/Thunderbird.png" );
+ QString version = m_pref->getBrowserVersion();
+
+ if( version.section( '.', 0, 0 ).toInt() < 115 )
+ {
+ pixmap = QPixmap( ":/files/icons/Thunderbird.png" );
+ }
+ else
+ {
+ pixmap = QPixmap( ":/files/icons/Thunderbird115.png" );
+ }
break;
}
diff --git a/webext/icons/Thunderbird115.png b/webext/icons/Thunderbird115.png
new file mode 100644
index 0000000..ccc26b2
Binary files /dev/null and b/webext/icons/Thunderbird115.png differ
diff --git a/webext/js/defaults.js b/webext/js/defaults.js
index f2056e3..6bad602 100644
--- a/webext/js/defaults.js
+++ b/webext/js/defaults.js
@@ -124,8 +124,15 @@ async function getDefaultIcon() {
);
// Convert image to storage param
+ var defaultIconPath;
+ if (SysTrayX.Info.browserInfo.majorVersion < 115) {
+ defaultIconPath = "icons/Thunderbird.png";
+ } else {
+ defaultIconPath = "icons/Thunderbird115.png";
+ }
+
const { defaultIconMimeUrl, defaultIconBase64Url } = await toDataURL(
- "icons/Thunderbird.png"
+ defaultIconPath
).then((dataUrl) => {
const data = dataUrl.split(":").pop().split(",");
return {
diff --git a/webext/options.js b/webext/options.js
index 6c2228b..d48f262 100644
--- a/webext/options.js
+++ b/webext/options.js
@@ -1182,6 +1182,13 @@ async function start() {
document.getElementById("counttype").style.display = "none";
}
+ // Set the right default icon
+ if (SysTrayX.Info.browserInfo.majorVersion < 115) {
+ document.getElementById("defaultCustomIconImage").setAttribute("src","icons/Thunderbird.png");
+ } else {
+ document.getElementById("defaultCustomIconImage").setAttribute("src","icons/Thunderbird115.png");
+ }
+
if (SysTrayX.Info.platformInfo.os !== "linux") {
document.getElementById("kdeintegration").style.display = "none";
}