1
0
mirror of https://invent.kde.org/network/krfb synced 2024-07-05 09:28:35 +00:00

* use KIcon

* remove obsolete code

svn path=/trunk/KDE/kdenetwork/krfb/; revision=647923
This commit is contained in:
Urs Wolfer 2007-03-29 21:52:57 +00:00
parent ea7be8ba0a
commit f26a93f5a4
2 changed files with 4 additions and 47 deletions

View File

@ -16,32 +16,16 @@
***************************************************************************/
#include "trayicon.h"
#include <qtooltip.h>
//Added by qt3to4:
#include <QHideEvent>
#include <QPixmap>
#include <QMouseEvent>
#include <kstandardaction.h>
#include <kapplication.h>
#include <klocale.h>
#include <kdialog.h>
#include <kglobal.h>
#include <kiconloader.h>
#include <kmenu.h>
#include "manageinvitationsdialog.h"
#include "invitedialog.h"
KPassivePopup2::KPassivePopup2(QWidget *parent) :
KPassivePopup(parent){
}
void KPassivePopup2::hideEvent( QHideEvent *e )
{
KPassivePopup::hideEvent(e);
emit hidden();
}
TrayIcon::TrayIcon(KDialog *d) :
KSystemTrayIcon(),
@ -49,11 +33,7 @@ TrayIcon::TrayIcon(KDialog *d) :
actionCollection(this),
quitting(false)
{
KIconLoader *loader = KIconLoader::global();
trayIconOpen = loader->loadIcon("eyes-open24", K3Icon::User);
trayIconClosed = loader->loadIcon("eyes-closed24", K3Icon::User);
setIcon(trayIconClosed);
setIcon(KIcon("eyes-closed24"));
setToolTip(i18n("Desktop Sharing - connecting"));
@ -95,7 +75,7 @@ void TrayIcon::prepareQuit() {
void TrayIcon::showConnectedMessage(QString host) {
setIcon(trayIconOpen);
setIcon(KIcon("eyes-open24"));
KPassivePopup::message(i18n("Desktop Sharing"),
i18n("The remote user has been authenticated and is now connected."),
trayIconOpen,
@ -108,7 +88,7 @@ void TrayIcon::showDisconnectedMessage() {
return;
setToolTip(i18n("Desktop Sharing - disconnected"));
setIcon(trayIconClosed);
setIcon(KIcon("eyes-closed24"));
KPassivePopup *p = KPassivePopup::message(i18n("Desktop Sharing"),
i18n("The remote user has closed the connection."),
trayIconClosed,
@ -133,7 +113,6 @@ void TrayIcon::activated(QSystemTrayIcon::ActivationReason reason)
void TrayIcon::showManageInvitations()
{
ManageInvitationsDialog invMngDlg(0);
invMngDlg.exec();
}

View File

@ -18,13 +18,6 @@
#ifndef TRAYICON_H
#define TRAYICON_H
#include <qwidget.h>
//Added by qt3to4:
#include <QPixmap>
#include <QHideEvent>
#include <QMouseEvent>
#include <QPixmap>
#include <kaction.h>
#include <ksystemtrayicon.h>
#include <kpassivepopup.h>
#include <KActionCollection>
@ -32,21 +25,6 @@
class KDialog;
class KPassivePopup2 : public KPassivePopup {
Q_OBJECT
public:
KPassivePopup2(QWidget *parent);
signals:
void hidden();
protected:
/**
* Reimplemented to detect hide events.
*/
virtual void hideEvent( QHideEvent *e );
};
/**
* Implements the trayicon.
* @author Tim Jansen