diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2017-04-29 15:56:34 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2017-04-29 15:56:34 +0000 |
| commit | 538f8bb01b872a1c555e3127bc8791579d854290 (patch) | |
| tree | 71c5f1236f01b2d7d3b1c9e375bd78861e6f81b6 /src/plugins/General/statusicon/qmmptrayicon.cpp | |
| parent | 2e6fa0a1453066f1560270466797b2161d7851c4 (diff) | |
| download | qmmp-538f8bb01b872a1c555e3127bc8791579d854290.tar.gz qmmp-538f8bb01b872a1c555e3127bc8791579d854290.tar.bz2 qmmp-538f8bb01b872a1c555e3127bc8791579d854290.zip | |
system tray: refactoring
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7135 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/General/statusicon/qmmptrayicon.cpp')
| -rw-r--r-- | src/plugins/General/statusicon/qmmptrayicon.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/plugins/General/statusicon/qmmptrayicon.cpp b/src/plugins/General/statusicon/qmmptrayicon.cpp index 89e13ce8d..4479323e6 100644 --- a/src/plugins/General/statusicon/qmmptrayicon.cpp +++ b/src/plugins/General/statusicon/qmmptrayicon.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2016 by Ilya Kotov * + * Copyright (C) 2008-2017 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -21,7 +21,7 @@ #include <QEvent> #include <QWheelEvent> #include <QMouseEvent> - +#include <QApplication> #include <qmmp/soundcore.h> #include "qmmptrayicon.h" @@ -32,25 +32,28 @@ QmmpTrayIcon::QmmpTrayIcon(QObject *parent) : QSystemTrayIcon(parent) -{ -#ifdef Q_WS_X11 - m_showNiceToolTip = false; -#endif -} +{} QmmpTrayIcon::~QmmpTrayIcon() { } -#ifdef Q_WS_X11 -void QmmpTrayIcon::showNiceToolTip(bool value) + +void QmmpTrayIcon::setToolTip(const QString &tip) { - m_showNiceToolTip = value; +#ifdef Q_WS_X11 + m_message = tip; + if(m_popupWidget) + showToolTip(); +#else + QSystemTrayIcon::setToolTip(tip); +#endif } +#ifdef Q_WS_X11 bool QmmpTrayIcon::event(QEvent *e) { - if (e->type() == QEvent::Wheel ) + if (e->type() == QEvent::Wheel) { wheelEvent((QWheelEvent *) e); e->accept(); @@ -72,13 +75,10 @@ void QmmpTrayIcon::wheelEvent(QWheelEvent *e) void QmmpTrayIcon::showToolTip() { - if(m_showNiceToolTip) + if(m_popupWidget.isNull()) { - if(m_PopupWidget.isNull()) - { - m_PopupWidget = new StatusIconPopupWidget(); - } - m_PopupWidget->showInfo(geometry().x(),geometry().y()); + m_popupWidget = new StatusIconPopupWidget(); } + m_popupWidget->showInfo(geometry().x(),geometry().y(), m_message); } #endif |