diff options
| author |  Fabio Bas | 2009-08-09 10:50:47 +0000 |
|---|---|---|
| committer | Fabio Bas | 2009-08-09 10:50:47 +0000 |
| commit | ad38ab773f5012a44a5bed60ed7a89981975bed4 (patch) | |
| tree | ed9e807e821dbb22bc28ebf2a97aea36f16a1b72 /src/modules | |
| parent | Updated Ukrainian translation by Oleh Miniv (diff) | |
| download | KVIrc-ad38ab773f5012a44a5bed60ed7a89981975bed4.tar.gz KVIrc-ad38ab773f5012a44a5bed60ed7a89981975bed4.tar.bz2 KVIrc-ad38ab773f5012a44a5bed60ed7a89981975bed4.zip | |
some fixes related to #504
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3404 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/trayicon/libkvitrayicon.cpp | 15 | ||||
| -rw-r--r-- | src/modules/trayicon/libkvitrayicon.h | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp index b7a899960..e4118e095 100644 --- a/src/modules/trayicon/libkvitrayicon.cpp +++ b/src/modules/trayicon/libkvitrayicon.cpp @@ -43,7 +43,6 @@ #include "kvi_ircview.h" #include "kvi_tal_popupmenu.h" -#include <QLabel> #include <QPixmap> #include <QPainter> #include <QTimer> @@ -88,10 +87,10 @@ KviTrayIcon::KviTrayIcon(KviFrame * frm) m_pTip = new KviDynamicToolTip(frm,"dock_tooltip"); m_pAwayPopup = new KviTalPopupMenu(0); - QLabel * l = new QLabel(__tr2qs("<b>KVIrc</b>"),m_pContextPopup); + m_pTitleLabel = new QLabel(__tr2qs("<b>KVIrc</b>"),m_pContextPopup); QPalette p; - l->setStyleSheet("background-color: " + p.color(QPalette::Normal, QPalette::Mid).name()); - m_pContextPopup->insertItem(l); + m_pTitleLabel->setStyleSheet("background-color: " + p.color(QPalette::Normal, QPalette::Mid).name()); + m_pContextPopup->insertItem(m_pTitleLabel); m_pContextPopup->setWindowTitle(__tr2qs("Context")); m_pAwayMenuId = m_pContextPopup->addMenu(m_pAwayPopup); m_pAwayMenuId->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_AWAY))); @@ -115,8 +114,7 @@ KviTrayIcon::KviTrayIcon(KviFrame * frm) connect(m_pContextPopup,SIGNAL(aboutToShow()),this,SLOT(fillContextPopup())); - QIcon icon(*g_pDock1); - setIcon(icon); + setIcon(*g_pDock1); connect(this,SIGNAL(activated ( QSystemTrayIcon::ActivationReason )),this,SLOT(activatedSlot ( QSystemTrayIcon::ActivationReason ))); } @@ -126,6 +124,11 @@ KviTrayIcon::~KviTrayIcon() { m_pFrm->setDockExtension(0); g_pTrayIconList->removeRef(this); + delete m_pAwayPopup; + delete m_pTitleLabel; + delete m_pTip; + delete m_pFlashingTimer; + delete m_pContextPopup; } diff --git a/src/modules/trayicon/libkvitrayicon.h b/src/modules/trayicon/libkvitrayicon.h index 02c076bd4..00d3b94ba 100644 --- a/src/modules/trayicon/libkvitrayicon.h +++ b/src/modules/trayicon/libkvitrayicon.h @@ -30,6 +30,7 @@ #include "kvi_frame.h" #include <QSystemTrayIcon> +#include <QLabel> class QPixmap; class QTimer; @@ -48,6 +49,7 @@ protected: KviDynamicToolTip * m_pTip; KviTalPopupMenu * m_pContextPopup; KviTalPopupMenu * m_pAwayPopup; + QLabel * m_pTitleLabel; QAction* m_pToggleFrame; QAction* m_pAwayMenuId; |