projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve systray notifications
[quassel.git]
/
src
/
qtui
/
qtui.h
diff --git
a/src/qtui/qtui.h
b/src/qtui/qtui.h
index
d170ae3
..
cdee4e7
100644
(file)
--- a/
src/qtui/qtui.h
+++ b/
src/qtui/qtui.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
8
by the Quassel Project *
+ * Copyright (C) 2005-0
9
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-21,9
+21,10
@@
#ifndef QTUI_H
#define QTUI_H
#ifndef QTUI_H
#define QTUI_H
-#include "
quasse
lui.h"
+#include "
graphica
lui.h"
#include "abstractnotificationbackend.h"
#include "abstractnotificationbackend.h"
+#include "mainwin.h"
class ActionCollection;
class MainWin;
class ActionCollection;
class MainWin;
@@
-35,7
+36,7
@@
class QtUiStyle;
/** This is basically a wrapper around MainWin, which is necessary because we cannot derive MainWin
* from both QMainWindow and AbstractUi (because of multiple inheritance of QObject).
*/
/** This is basically a wrapper around MainWin, which is necessary because we cannot derive MainWin
* from both QMainWindow and AbstractUi (because of multiple inheritance of QObject).
*/
-class QtUi : public
Abstract
Ui {
+class QtUi : public
Graphical
Ui {
Q_OBJECT
public:
Q_OBJECT
public:
@@
-45,43
+46,47
@@
public:
MessageModel *createMessageModel(QObject *parent);
AbstractMessageProcessor *createMessageProcessor(QObject *parent);
MessageModel *createMessageModel(QObject *parent);
AbstractMessageProcessor *createMessageProcessor(QObject *parent);
+ inline static QtUi *instance();
inline static QtUiStyle *style();
inline static MainWin *mainWindow();
inline static QtUiStyle *style();
inline static MainWin *mainWindow();
- //! Access
the global ActionCollection
.
- /** Th
is ActionCollection is associated with the main window, i.e. it contains
global
+ //! Access
global ActionCollections
.
+ /** Th
ese ActionCollections are associated with the main window, i.e. they contain
global
* actions (and thus, shortcuts). Widgets providing application-wide shortcuts should
* actions (and thus, shortcuts). Widgets providing application-wide shortcuts should
- * create appropriate Action objects using QtUi::actionCollection()->add\<Action\>().
+ * create appropriate Action objects using QtUi::actionCollection(cat)->add\<Action\>().
+ * @param category The category (default: "General")
*/
*/
-
inline static ActionCollection *actionCollection(
);
+
static ActionCollection *actionCollection(const QString &category = "General"
);
/* Notifications */
static void registerNotificationBackend(AbstractNotificationBackend *);
static void unregisterNotificationBackend(AbstractNotificationBackend *);
static void unregisterAllNotificationBackends();
/* Notifications */
static void registerNotificationBackend(AbstractNotificationBackend *);
static void unregisterNotificationBackend(AbstractNotificationBackend *);
static void unregisterAllNotificationBackends();
- static const Q
Se
t<AbstractNotificationBackend *> ¬ificationBackends();
+ static const Q
Lis
t<AbstractNotificationBackend *> ¬ificationBackends();
static uint invokeNotification(BufferId bufId, const QString &sender, const QString &text);
static void closeNotification(uint notificationId);
static uint invokeNotification(BufferId bufId, const QString &sender, const QString &text);
static void closeNotification(uint notificationId);
- static void closeNotifications(BufferId bufferId);
+ static void closeNotifications(BufferId bufferId
= BufferId()
);
static const QList<AbstractNotificationBackend::Notification> &activeNotifications();
public slots:
static const QList<AbstractNotificationBackend::Notification> &activeNotifications();
public slots:
- void init();
+ v
irtual v
oid init();
protected slots:
void connectedToCore();
void disconnectedFromCore();
protected slots:
void connectedToCore();
void disconnectedFromCore();
+ void notificationActivated(uint notificationId);
private:
private:
- static MainWin *_mainWin;
- static ActionCollection *_actionCollection;
+ static QPointer<QtUi> _instance;
+ static QPointer<MainWin> _mainWin;
+ static QHash<QString, ActionCollection *> _actionCollections;
static QtUiStyle *_style;
static QtUiStyle *_style;
- static Q
Se
t<AbstractNotificationBackend *> _notificationBackends;
+ static Q
Lis
t<AbstractNotificationBackend *> _notificationBackends;
static QList<AbstractNotificationBackend::Notification> _notifications;
};
static QList<AbstractNotificationBackend::Notification> _notifications;
};
-
ActionCollection *QtUi::actionCollection() { return _actionCollection
; }
+
QtUi *QtUi::instance() { return _instance ? _instance.data() : new QtUi()
; }
QtUiStyle *QtUi::style() { return _style; }
MainWin *QtUi::mainWindow() { return _mainWin; }
QtUiStyle *QtUi::style() { return _style; }
MainWin *QtUi::mainWindow() { return _mainWin; }