From 436eead4d6ccea26e8b08d5fa9569c6de4bbd8b5 Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Mon, 25 May 2020 20:39:13 +0200 Subject: [PATCH] Connect show / hide to test buttons --- app/SysTray-X/systrayx.cpp | 14 ++++++++++++++ app/SysTray-X/systrayx.h | 3 +++ app/SysTray-X/windowctrl.cpp | 10 ++++++++-- app/SysTray-X/windowctrl.h | 5 +++++ 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/app/SysTray-X/systrayx.cpp b/app/SysTray-X/systrayx.cpp index 4576dff..aa1fe13 100644 --- a/app/SysTray-X/systrayx.cpp +++ b/app/SysTray-X/systrayx.cpp @@ -43,6 +43,9 @@ 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() ) @@ -336,6 +339,17 @@ void SysTrayX::hideTrayIcon() } +void SysTrayX::slotShow() +{ + showTrayIcon(); +} + +void SysTrayX::slotHide() +{ + hideTrayIcon(); +} + + void SysTrayX::slotUnreadMail( int unread_mail ) { if( unread_mail > 0 ) diff --git a/app/SysTray-X/systrayx.h b/app/SysTray-X/systrayx.h index 9434c8f..bdc48a6 100644 --- a/app/SysTray-X/systrayx.h +++ b/app/SysTray-X/systrayx.h @@ -90,6 +90,9 @@ class SysTrayX : public QObject private slots: + void slotShow(); + void slotHide(); + /** * @brief slotUnreadMail. Handle unread mail signal. * diff --git a/app/SysTray-X/windowctrl.cpp b/app/SysTray-X/windowctrl.cpp index 2b5313b..bf65c77 100644 --- a/app/SysTray-X/windowctrl.cpp +++ b/app/SysTray-X/windowctrl.cpp @@ -67,6 +67,9 @@ void WindowCtrl::slotWindowTest1() emit signalConsole("Test 1 started"); // Do something. + + emit signalShow(); + // emit signalConsole( QString( "Found Ppid: %1" ).arg( getPpid() ) ); // emit signalConsole( QString( "Found XID: %1" ).arg( getWinId() ) ); @@ -86,8 +89,11 @@ void WindowCtrl::slotWindowTest2() { emit signalConsole("Test 2 started"); - // Do something. - hideWindow( getWinId(), true ); + // Do something. + + emit signalHide(); + +// hideWindow( getWinId(), true ); // findWindow( m_ppid ); // emit signalConsole( QString( "Hwnd ppid: %1" ).arg( getWinIds()[0] ) ); diff --git a/app/SysTray-X/windowctrl.h b/app/SysTray-X/windowctrl.h index de89bc1..c74f4f8 100644 --- a/app/SysTray-X/windowctrl.h +++ b/app/SysTray-X/windowctrl.h @@ -47,6 +47,11 @@ class WindowCtrl : public QObject */ bool thunderbirdStart() const; + signals: + + void signalShow(); + void signalHide(); + public slots: /**