projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make Quassel work with Qt 4.5 again
[quassel.git]
/
src
/
qtui
/
qtui.h
diff --git
a/src/qtui/qtui.h
b/src/qtui/qtui.h
index
1e2144c
..
44c4741
100644
(file)
--- a/
src/qtui/qtui.h
+++ b/
src/qtui/qtui.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-
09 by the Quassel Project
*
+ * Copyright (C) 2005-
2010 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 *
@@
-24,12
+24,11
@@
#include "graphicalui.h"
#include "abstractnotificationbackend.h"
#include "graphicalui.h"
#include "abstractnotificationbackend.h"
-#include "
mainwin
.h"
+#include "
qtuistyle
.h"
class MainWin;
class MessageModel;
class QtUiMessageProcessor;
class MainWin;
class MessageModel;
class QtUiMessageProcessor;
-class QtUiStyle;
//! This class encapsulates Quassel's Qt-based GUI.
/** This is basically a wrapper around MainWin, which is necessary because we cannot derive MainWin
//! This class encapsulates Quassel's Qt-based GUI.
/** This is basically a wrapper around MainWin, which is necessary because we cannot derive MainWin
@@
-49,6
+48,7
@@
public:
inline static QtUiStyle *style();
inline static MainWin *mainWindow();
inline static QtUiStyle *style();
inline static MainWin *mainWindow();
+ static bool haveSystemTray();
/* Notifications */
/* Notifications */
@@
-56,7
+56,7
@@
public:
static void unregisterNotificationBackend(AbstractNotificationBackend *);
static void unregisterAllNotificationBackends();
static const QList<AbstractNotificationBackend *> ¬ificationBackends();
static void unregisterNotificationBackend(AbstractNotificationBackend *);
static void unregisterAllNotificationBackends();
static const QList<AbstractNotificationBackend *> ¬ificationBackends();
- static uint invokeNotification(BufferId bufId, const QString &sender, const QString &text);
+ static uint invokeNotification(BufferId bufId,
AbstractNotificationBackend::NotificationType type,
const QString &sender, const QString &text);
static void closeNotification(uint notificationId);
static void closeNotifications(BufferId bufferId = BufferId());
static const QList<AbstractNotificationBackend::Notification> &activeNotifications();
static void closeNotification(uint notificationId);
static void closeNotifications(BufferId bufferId = BufferId());
static const QList<AbstractNotificationBackend::Notification> &activeNotifications();
@@
-67,18
+67,26
@@
public slots:
protected slots:
void connectedToCore();
void disconnectedFromCore();
protected slots:
void connectedToCore();
void disconnectedFromCore();
- void notificationActivated();
+ void notificationActivated(uint notificationId);
+
+protected:
+ virtual void minimizeRestore(bool show);
+ virtual bool isHidingMainWidgetAllowed() const;
+
+private slots:
+ void useSystemTrayChanged(const QVariant &);
private:
private:
- static QPointer<QtUi> _instance;
- static QPointer<MainWin> _mainWin;
- static QtUiStyle *_style;
+ static QtUi *_instance;
+ static MainWin *_mainWin;
static QList<AbstractNotificationBackend *> _notificationBackends;
static QList<AbstractNotificationBackend::Notification> _notifications;
static QList<AbstractNotificationBackend *> _notificationBackends;
static QList<AbstractNotificationBackend::Notification> _notifications;
+
+ bool _useSystemTray;
};
};
-QtUi *QtUi::instance() { return _instance ? _instance
.data()
: new QtUi(); }
-QtUiStyle *QtUi::style() { return
_style
; }
+QtUi *QtUi::instance() { return _instance ? _instance : new QtUi(); }
+QtUiStyle *QtUi::style() { return
qobject_cast<QtUiStyle*>(uiStyle())
; }
MainWin *QtUi::mainWindow() { return _mainWin; }
#endif
MainWin *QtUi::mainWindow() { return _mainWin; }
#endif