* Quasselfied 2010 by Manuel Nickschas <sputnick@quassel-irc.org> *
* *
* This file 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 Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
+ * it under the terms of the GNU Library General Public License (LGPL) *
+ * as published by the Free Software Foundation; either version 2 of the *
+ * License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* 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., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include "mainwin.h"
#include "statusnotifierwatcher.h"
#include "statusnotifieritemadaptor.h"
+#ifdef Q_OS_WIN64
+__inline int toInt(WId wid)
+{
+ return (int)((__int64)wid);
+}
+
+
+#else
+__inline int toInt(WId wid)
+{
+ return (int)wid;
+}
+
+
+#endif
+
// Marshall the ImageStruct data into a D-BUS argument
const QDBusArgument &operator<<(QDBusArgument &argument, const DBusImageStruct &icon)
{
return argument;
}
+
// Retrieve the ImageStruct data from the D-BUS argument
const QDBusArgument &operator>>(const QDBusArgument &argument, DBusImageStruct &icon)
{
const QDBusArgument &operator<<(QDBusArgument &argument, const DBusImageVector &iconVector)
{
argument.beginArray(qMetaTypeId<DBusImageStruct>());
- for (int i=0; i<iconVector.size(); ++i) {
+ for (int i = 0; i < iconVector.size(); ++i) {
argument << iconVector[i];
}
argument.endArray();
return argument;
}
+
// Retrieve the ImageVector data from the D-BUS argument
const QDBusArgument &operator>>(const QDBusArgument &argument, DBusImageVector &iconVector)
{
argument.beginArray();
iconVector.clear();
- while ( !argument.atEnd() ) {
- DBusImageStruct element;
- argument >> element;
- iconVector.append(element);
+ while (!argument.atEnd()) {
+ DBusImageStruct element;
+ argument >> element;
+ iconVector.append(element);
}
argument.endArray();
-
return argument;
}
+
// Marshall the ToolTipStruct data into a D-BUS argument
const QDBusArgument &operator<<(QDBusArgument &argument, const DBusToolTipStruct &toolTip)
{
return argument;
}
+
// Retrieve the ToolTipStruct data from the D-BUS argument
const QDBusArgument &operator>>(const QDBusArgument &argument, DBusToolTipStruct &toolTip)
{
int StatusNotifierItemDBus::s_serviceCount = 0;
StatusNotifierItemDBus::StatusNotifierItemDBus(StatusNotifierItem *parent)
- : QObject(parent),
+ : QObject(parent),
m_statusNotifierItem(parent),
m_service(QString("org.kde.StatusNotifierItem-%1-%2")
- .arg(QCoreApplication::applicationPid())
- .arg(++s_serviceCount)),
+ .arg(QCoreApplication::applicationPid())
+ .arg(++s_serviceCount)),
m_dbus(QDBusConnection::connectToBus(QDBusConnection::SessionBus, m_service))
{
- new StatusNotifierItemAdaptor(this);
- //qDebug() << "service is" << m_service;
- registerService();
- m_dbus.registerObject("/StatusNotifierItem", this);
+ new StatusNotifierItemAdaptor(this);
+ //qDebug() << "service is" << m_service;
+ registerService();
}
+
StatusNotifierItemDBus::~StatusNotifierItemDBus()
{
unregisterService();
}
+
+QDBusConnection StatusNotifierItemDBus::dbusConnection() const
+{
+ return m_dbus;
+}
+
+
// FIXME: prevent double registrations, also test this on platforms != KDE
//
void StatusNotifierItemDBus::registerService()
{
//qDebug() << "registering to" << m_service;
m_dbus.registerService(m_service);
+ m_dbus.registerObject("/StatusNotifierItem", this);
}
+
// FIXME: see above
void StatusNotifierItemDBus::unregisterService()
{
//qDebug() << "unregistering from" << m_service;
- if(m_dbus.isConnected()) {
+ if (m_dbus.isConnected()) {
+ m_dbus.unregisterObject("/StatusNotifierItem");
m_dbus.unregisterService(m_service);
}
}
+
QString StatusNotifierItemDBus::service() const
{
return m_service;
}
+
//DBUS slots
//Values and calls have been adapted to Quassel
return QString("Communications"); // no need to make this configurable for Quassel
}
+
QString StatusNotifierItemDBus::Title() const
{
return m_statusNotifierItem->title();
}
+
QString StatusNotifierItemDBus::Id() const
{
return QString("QuasselIRC");
}
+
QString StatusNotifierItemDBus::Status() const
{
return m_statusNotifierItem->metaObject()->enumerator(m_statusNotifierItem->metaObject()->indexOfEnumerator("State")).valueToKey(m_statusNotifierItem->state());
}
+
int StatusNotifierItemDBus::WindowId() const
{
- return (int)QtUi::mainWindow()->winId();
+ return toInt(QtUi::mainWindow()->winId());
}
return m_statusNotifierItem->iconName();
}
+
DBusImageVector StatusNotifierItemDBus::IconPixmap() const
{
return DBusImageVector();
}
+
QString StatusNotifierItemDBus::OverlayIconName() const
{
return QString();
}
+
DBusImageVector StatusNotifierItemDBus::OverlayIconPixmap() const
{
return DBusImageVector();
}
+
//Requesting attention icon and movie
QString StatusNotifierItemDBus::AttentionIconName() const
return m_statusNotifierItem->attentionIconName();
}
+
DBusImageVector StatusNotifierItemDBus::AttentionIconPixmap() const
{
return DBusImageVector();
}
+
QString StatusNotifierItemDBus::AttentionMovieName() const
{
return QString();
return toolTip;
}
+
+QString StatusNotifierItemDBus::IconThemePath() const
+{
+ return m_statusNotifierItem->iconThemePath();
+}
+
+
+//Menu
+
+QDBusObjectPath StatusNotifierItemDBus::Menu() const
+{
+ return QDBusObjectPath(m_statusNotifierItem->menuObjectPath());
+}
+
+
//Interaction
void StatusNotifierItemDBus::ContextMenu(int x, int y)
#ifdef HAVE_KDE
m_statusNotifierItem->trayMenu()->setWindowFlags(Qt::Window|Qt::FramelessWindowHint);
#endif
- m_statusNotifierItem->trayMenu()->popup(QPoint(x,y));
+ m_statusNotifierItem->trayMenu()->popup(QPoint(x, y));
#ifdef HAVE_KDE
KWindowSystem::setState(m_statusNotifierItem->trayMenu()->winId(), NET::SkipTaskbar|NET::SkipPager|NET::KeepAbove);
KWindowSystem::setType(m_statusNotifierItem->trayMenu()->winId(), NET::PopupMenu);
KWindowSystem::forceActiveWindow(m_statusNotifierItem->trayMenu()->winId());
#endif
- } else {
+ }
+ else {
m_statusNotifierItem->trayMenu()->hide();
}
}
+
void StatusNotifierItemDBus::Activate(int x, int y)
{
- m_statusNotifierItem->activated(QPoint(x,y));
+ m_statusNotifierItem->activated(QPoint(x, y));
}
+
void StatusNotifierItemDBus::SecondaryActivate(int x, int y)
{
Q_UNUSED(x)
// emit m_statusNotifierItem->secondaryActivateRequested(QPoint(x,y));
}
+
void StatusNotifierItemDBus::Scroll(int delta, const QString &orientation)
{
Q_UNUSED(delta)
projects / quassel.git / blobdiff