tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed KStatusNotifier from telephonyplugin

Browse source
This commit is contained in:
Albert Vaca 2013-08-16 01:01:05 +02:00
parent 04e1705697
commit d4632b31cc
2 changed files with 1 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
daemon/plugins/telephony/telephonyplugin.cpp
View file

@ -29,17 +29,12 @@ K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_telephony", "kdeconnect_tel
TelephonyPlugin::TelephonyPlugin(QObject *parent, const QVariantList &args)
: KdeConnectPlugin(parent, args)
{
trayIcon = new KStatusNotifierItem(parent);
trayIcon->setIconByName("pda");
trayIcon->setTitle("KdeConnect");
connect(trayIcon,SIGNAL(activateRequested(bool,QPoint)),this,SLOT(showPendingNotifications()));
}
KNotification* TelephonyPlugin::createNotification(const NetworkPackage& np)
{
QString id = QString::number(np.id());
QString npType = np.get<QString>("notificationType");
QString title, content, type, icon;
@ -75,56 +70,16 @@ KNotification* TelephonyPlugin::createNotification(const NetworkPackage& np)
qDebug() << "Creating notification with type:" << type;
if (transient) {
trayIcon->setStatus(KStatusNotifierItem::Active);
KNotification* notification = new KNotification(type);
notification->setPixmap(KIcon(icon).pixmap(48, 48));
notification->setComponentData(KComponentData("kdeconnect", "kdeconnect"));
notification->setTitle(title);
notification->setText(content);
pendingNotifications.insert(id, notification);
}
KNotification* notification = new KNotification(type); //, KNotification::Persistent
notification->setPixmap(KIcon(icon).pixmap(48, 48));
notification->setComponentData(KComponentData("kdeconnect", "kdeconnect"));
notification->setTitle(title);
notification->setText(content);
notification->setProperty("id",id);
connect(notification,SIGNAL(activated()),this,SLOT(notificationAttended()));
connect(notification,SIGNAL(closed()),this,SLOT(notificationAttended()));
return notification;
}
void TelephonyPlugin::notificationAttended()
{
KNotification* normalNotification = (KNotification*)sender();
QString id = normalNotification->property("id").toString();
if (pendingNotifications.contains(id)) {
delete pendingNotifications[id];
pendingNotifications.remove(id);
if (pendingNotifications.isEmpty()) {
trayIcon->setStatus(KStatusNotifierItem::Passive);
}
}
}
void TelephonyPlugin::showPendingNotifications()
{
trayIcon->setStatus(KStatusNotifierItem::Passive);
Q_FOREACH (KNotification* notification, pendingNotifications) {
notification->sendEvent();
}
pendingNotifications.clear();
}
bool TelephonyPlugin::receivePackage(const NetworkPackage& np)
{

4
daemon/plugins/telephony/telephonyplugin.h
View file

@ -37,13 +37,9 @@ public:
public Q_SLOTS:
virtual bool receivePackage(const NetworkPackage& np);
void showPendingNotifications();
void notificationAttended();
private:
KNotification* createNotification(const NetworkPackage& np);
KStatusNotifierItem* trayIcon;
QHash<QString, KNotification*> pendingNotifications;
};