From 4bf9807467c61e0d4012d852b77cf7ddcaf9e322 Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Sat, 21 Oct 2023 17:16:54 +0200 Subject: [PATCH] Fix icon init --- app/SysTray-X/SysTray-X-app/systrayxicon.cpp | 2 ++ .../SysTray-X-app/systrayxstatusnotifier.cpp | 13 ++----------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/app/SysTray-X/SysTray-X-app/systrayxicon.cpp b/app/SysTray-X/SysTray-X-app/systrayxicon.cpp index f98ca4b..409247a 100644 --- a/app/SysTray-X/SysTray-X-app/systrayxicon.cpp +++ b/app/SysTray-X/SysTray-X-app/systrayxicon.cpp @@ -46,6 +46,8 @@ SysTrayXIcon::SysTrayXIcon( SysTrayXLink* link, Preferences* pref, QObject* pare setToolTip( tr( "SysTray-X: Thunderbird add-on companion app" ) ); + renderBase(); + connect( this, &QSystemTrayIcon::activated, this, &SysTrayXIcon::slotIconActivated ); } diff --git a/app/SysTray-X/SysTray-X-app/systrayxstatusnotifier.cpp b/app/SysTray-X/SysTray-X-app/systrayxstatusnotifier.cpp index 221a409..c194bc0 100644 --- a/app/SysTray-X/SysTray-X-app/systrayxstatusnotifier.cpp +++ b/app/SysTray-X/SysTray-X-app/systrayxstatusnotifier.cpp @@ -54,17 +54,6 @@ SysTrayXStatusNotifier::SysTrayXStatusNotifier( SysTrayXLink* link, Preferences* */ setCategory( KStatusNotifierItem::ApplicationStatus ); - 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" ); setToolTipTitle( "SysTray-X" ); @@ -76,6 +65,8 @@ SysTrayXStatusNotifier::SysTrayXStatusNotifier( SysTrayXLink* link, Preferences* // setStatus(KStatusNotifierItem::ItemStatus::Active); // setStatus(KStatusNotifierItem::ItemStatus::NeedsAttention); + renderBase(); + connect( this, &KStatusNotifierItem::activateRequested, this, &SysTrayXStatusNotifier::slotActivateRequested ); connect( this, &KStatusNotifierItem::secondaryActivateRequested, this, &SysTrayXStatusNotifier::slotSecondaryActivateRequested ); }