Nemcio/SysTray-X
1
0
Fork 0
mirror of https://github.com/Ximi1970/systray-x.git synced 2026-05-07 10:15:27 +02:00
Code Issues Packages Projects Releases Activity

Cleanup

Browse Source
This commit is contained in:
Ximi1970
2020-05-30 16:45:23 +02:00
parent c0e925da7c
commit 3f8043e184
3 changed files with 34 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
app/SysTray-X/systrayx.cpp
View File

@@ -43,9 +43,6 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent )
*/
m_win_ctrl = new WindowCtrl( m_preferences );
connect( m_win_ctrl, &WindowCtrl::signalShow, this, &SysTrayX::slotShow );
connect( m_win_ctrl, &WindowCtrl::signalHide, this, &SysTrayX::slotHide );
#ifdef QT_NO_DEBUG
if( !m_win_ctrl->thunderbirdStart() )
@@ -72,14 +69,8 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent )
* Setup tray icon
*/
createMenu();
showTrayIcon();
#ifdef FF_NEET
createTrayIcon();
m_tray_icon->show();
#endif
/*
* Setup debug window
*/
@@ -92,7 +83,9 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent )
* Connect debug link signals
*/
connect( m_link, &SysTrayXLink::signalUnreadMail, m_debug, &DebugWidget::slotUnreadMail );
connect( m_link, &SysTrayXLink::signalUnreadMail, this, &SysTrayX::slotUnreadMail );
// connect( m_link, &SysTrayXLink::signalUnreadMail, this, &SysTrayX::slotUnreadMail );
// connect( m_win_ctrl, &WindowCtrl::signalShow, this, &SysTrayX::slotShow );
// connect( m_win_ctrl, &WindowCtrl::signalHide, this, &SysTrayX::slotHide );
connect( this, &SysTrayX::signalConsole, m_debug, &DebugWidget::slotConsole );
connect( m_preferences, &Preferences::signalConsole, m_debug, &DebugWidget::slotConsole );
@@ -107,16 +100,6 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent )
/*
* Connect preferences signals
*/
#ifdef FF_NEET
connect( m_preferences, &Preferences::signalDefaultIconTypeChange, m_tray_icon, &SysTrayXIcon::slotDefaultIconTypeChange );
connect( m_preferences, &Preferences::signalDefaultIconDataChange, m_tray_icon, &SysTrayXIcon::slotDefaultIconDataChange );
connect( m_preferences, &Preferences::signalIconTypeChange, m_tray_icon, &SysTrayXIcon::slotIconTypeChange );
connect( m_preferences, &Preferences::signalIconDataChange, m_tray_icon, &SysTrayXIcon::slotIconDataChange );
connect( m_preferences, &Preferences::signalShowNumberChange, m_tray_icon, &SysTrayXIcon::slotShowNumberChange );
connect( m_preferences, &Preferences::signalNumberColorChange, m_tray_icon, &SysTrayXIcon::slotNumberColorChange );
connect( m_preferences, &Preferences::signalNumberSizeChange, m_tray_icon, &SysTrayXIcon::slotNumberSizeChange );
#endif
connect( m_preferences, &Preferences::signalMinimizeTypeChange, m_win_ctrl, &WindowCtrl::slotMinimizeTypeChange );
connect( m_preferences, &Preferences::signalStartMinimizedChange, m_win_ctrl, &WindowCtrl::slotStartMinimizedChange );
@@ -151,21 +134,11 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent )
/*
* Connect link signals
*/
#ifdef FF_NEET
connect( m_link, &SysTrayXLink::signalUnreadMail, m_tray_icon, &SysTrayXIcon::slotSetUnreadMail );
#endif
connect( m_link, &SysTrayXLink::signalAddOnShutdown, this, &SysTrayX::slotAddOnShutdown );
connect( m_link, &SysTrayXLink::signalWindowState, m_win_ctrl, &WindowCtrl::slotWindowState );
connect( m_link, &SysTrayXLink::signalTitle, m_win_ctrl, &WindowCtrl::slotWindowTitle );
connect( m_link, &SysTrayXLink::signalVersion, this, &SysTrayX::slotVersion );
/*
* Connect system tray signals
*/
#ifdef FF_NEET
connect( m_tray_icon, &SysTrayXIcon::signalShowHide, m_win_ctrl, &WindowCtrl::slotShowHide );
#endif
/*
* SysTrayX
*/
@@ -226,38 +199,6 @@ void SysTrayX::createMenu()
}
/*
* Create the system tray icon
*/
void SysTrayX::createTrayIcon()
{
/*
* Setup menu actions
*/
createMenu();
/*
* Create system tray icon
*/
m_tray_icon = new SysTrayXIcon( m_link, m_preferences );
m_tray_icon->setContextMenu( m_tray_icon_menu );
/*
* Set default icon
*/
m_tray_icon->setDefaultIconMime( m_preferences->getDefaultIconMime() );
m_tray_icon->setDefaultIconData( m_preferences->getDefaultIconData() );
m_tray_icon->setDefaultIconType( m_preferences->getDefaultIconType() );
/*
* Set icon
*/
m_tray_icon->setIconMime( m_preferences->getIconMime() );
m_tray_icon->setIconData( m_preferences->getIconData() );
m_tray_icon->setIconType( m_preferences->getIconType() );
}
/*
* Show / create tray icon
*/
@@ -344,26 +285,44 @@ void SysTrayX::hideTrayIcon()
}
/*
* Handle icon show signal
*/
void SysTrayX::slotShow()
{
showTrayIcon();
}
/*
* Handle icon hide signal
*/
void SysTrayX::slotHide()
{
hideTrayIcon();
}
/*
* Hndle the unread mail signal
*/
void SysTrayX::slotUnreadMail( int unread_mail )
{
if( unread_mail > 0 )
if( m_preferences->getDefaultIconType() == Preferences::PREF_DEFAULT_ICON_HIDE )
{
showTrayIcon();
if( unread_mail > 0 )
{
showTrayIcon();
}
else
{
hideTrayIcon();
}
}
else
{
hideTrayIcon();
showTrayIcon();
}
}

14
app/SysTray-X/systrayx.h
View File

@@ -52,20 +52,20 @@ class SysTrayX : public QObject
*/
void getPreferences();
/**
* @brief createTrayIcon. Create the system tray icon.
*/
void createTrayIcon();
/**
* @brief createActions. Create the menu actions.
*/
void createMenu();
/**
* @brief showTrayIcon. Create and show the icon.
*/
void showTrayIcon();
void hideTrayIcon();
/**
* @brief hideTrayIcon. Hide and destroy the icon.
*/
void hideTrayIcon();
signals:

6
app/SysTray-X/windowctrl.cpp
View File

@@ -68,7 +68,7 @@ void WindowCtrl::slotWindowTest1()
// Do something.
emit signalShow();
// emit signalShow();
// emit signalConsole( QString( "Found Ppid: %1" ).arg( getPpid() ) );
// emit signalConsole( QString( "Found XID: %1" ).arg( getWinId() ) );
@@ -91,7 +91,7 @@ void WindowCtrl::slotWindowTest2()
// Do something.
emit signalHide();
// emit signalHide();
// hideWindow( getWinId(), true );
@@ -110,7 +110,7 @@ void WindowCtrl::slotWindowTest3()
emit signalConsole("Test 3 started");
// Do something.
hideWindow( getWinId(), false );
// hideWindow( getWinId(), false );
// emit signalConsole( QString( "Pid %1" ).arg( m_pid ) );
// emit signalConsole( QString( "Ppid %1" ).arg( m_ppid ) );