added a "hide" menu entry in the system tray icon menu

This commit is contained in:
Volker Fischer 2011-05-21 12:33:11 +00:00
parent 9949c4886a
commit 5811f3d10e
2 changed files with 704 additions and 699 deletions

File diff suppressed because it is too large Load diff

View file

@ -1,103 +1,104 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2011 * Copyright (c) 2004-2011
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer
* *
****************************************************************************** ******************************************************************************
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software * the terms of the GNU General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option) any later * Foundation; either version 2 of the License, or (at your option) any later
* version. * version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details. * details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc., * this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
\******************************************************************************/ \******************************************************************************/
#include <qlabel.h> #include <qlabel.h>
#include <qlistview.h> #include <qlistview.h>
#include <qtimer.h> #include <qtimer.h>
#include <qpixmap.h> #include <qpixmap.h>
#include <qthread.h> #include <qthread.h>
#include <qslider.h> #include <qslider.h>
#include <qmenubar.h> #include <qmenubar.h>
#include <qlayout.h> #include <qlayout.h>
#include <qsystemtrayicon.h> #include <qsystemtrayicon.h>
#include <qsettings.h> #include <qsettings.h>
#include "global.h" #include "global.h"
#include "server.h" #include "server.h"
#include "multicolorled.h" #include "multicolorled.h"
#ifdef _WIN32 #ifdef _WIN32
# include "../windows/moc/llconserverdlgbase.h" # include "../windows/moc/llconserverdlgbase.h"
#else #else
# ifdef _IS_QMAKE_CONFIG # ifdef _IS_QMAKE_CONFIG
# include "ui_llconserverdlgbase.h" # include "ui_llconserverdlgbase.h"
# else # else
# include "moc/llconserverdlgbase.h" # include "moc/llconserverdlgbase.h"
# endif # endif
#endif #endif
/* Definitions ****************************************************************/ /* Definitions ****************************************************************/
// update time for GUI controls // update time for GUI controls
#define GUI_CONTRL_UPDATE_TIME 1000 // ms #define GUI_CONTRL_UPDATE_TIME 1000 // ms
/* Classes ********************************************************************/ /* Classes ********************************************************************/
class CLlconServerDlg : public QDialog, private Ui_CLlconServerDlgBase class CLlconServerDlg : public QDialog, private Ui_CLlconServerDlgBase
{ {
Q_OBJECT Q_OBJECT
public: public:
CLlconServerDlg ( CServer* pNServP, CLlconServerDlg ( CServer* pNServP,
const bool bStartMinimized, const bool bStartMinimized,
QWidget* parent = 0, QWidget* parent = 0,
Qt::WindowFlags f = 0 ); Qt::WindowFlags f = 0 );
protected: protected:
virtual void customEvent ( QEvent* pEvent ); virtual void customEvent ( QEvent* pEvent );
virtual void changeEvent ( QEvent* pEvent ); virtual void changeEvent ( QEvent* pEvent );
virtual void closeEvent ( QCloseEvent* Event ); virtual void closeEvent ( QCloseEvent* Event );
void UpdateGUIDependencies(); void UpdateGUIDependencies();
void UpdateSystemTrayIcon ( const bool bIsActive ); void UpdateSystemTrayIcon ( const bool bIsActive );
void ShowWindowInForeground() { showNormal(); raise(); } void ShowWindowInForeground() { showNormal(); raise(); }
void ModifyAutoStartEntry ( const bool bDoAutoStart ); void ModifyAutoStartEntry ( const bool bDoAutoStart );
QTimer Timer; QTimer Timer;
CServer* pServer; CServer* pServer;
CVector<CServerListViewItem*> vecpListViewItems; CVector<CServerListViewItem*> vecpListViewItems;
QMutex ListViewMutex; QMutex ListViewMutex;
QMenuBar* pMenu; QMenuBar* pMenu;
bool bSystemTrayIconAvaialbe; bool bSystemTrayIconAvaialbe;
QSystemTrayIcon SystemTrayIcon; QSystemTrayIcon SystemTrayIcon;
QPixmap BitmapSystemTrayInactive; QPixmap BitmapSystemTrayInactive;
QPixmap BitmapSystemTrayActive; QPixmap BitmapSystemTrayActive;
QMenu* pSystemTrayIconMenu; QMenu* pSystemTrayIconMenu;
public slots: public slots:
void OnRegisterServerStateChanged ( int value ); void OnRegisterServerStateChanged ( int value );
void OnDefaultCentralServerStateChanged ( int value ); void OnDefaultCentralServerStateChanged ( int value );
void OnStartOnOSStartStateChanged ( int value ); void OnStartOnOSStartStateChanged ( int value );
void OnCentralServerAddressEditingFinished(); void OnCentralServerAddressEditingFinished();
void OnServerNameTextChanged ( const QString& strNewName ); void OnServerNameTextChanged ( const QString& strNewName );
void OnLocationCityTextChanged ( const QString& strNewCity ); void OnLocationCityTextChanged ( const QString& strNewCity );
void OnLocationCountryActivated ( int iCntryListItem ); void OnLocationCountryActivated ( int iCntryListItem );
void OnTimer(); void OnTimer();
void OnServerStarted() { UpdateSystemTrayIcon ( true ); } void OnServerStarted() { UpdateSystemTrayIcon ( true ); }
void OnServerStopped() { UpdateSystemTrayIcon ( false ); } void OnServerStopped() { UpdateSystemTrayIcon ( false ); }
void OnSysTrayMenuOpen() { ShowWindowInForeground(); } void OnSysTrayMenuOpen() { ShowWindowInForeground(); }
void OnSysTrayMenuExit() { close(); } void OnSysTrayMenuHide() { hide(); }
void OnSysTrayActivated ( QSystemTrayIcon::ActivationReason ActReason ); void OnSysTrayMenuExit() { close(); }
}; void OnSysTrayActivated ( QSystemTrayIcon::ActivationReason ActReason );
};