projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix trayicon-tooltip for linux
[quassel.git]
/
src
/
qtui
/
qtui.h
diff --git
a/src/qtui/qtui.h
b/src/qtui/qtui.h
index
8b223af
..
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,7
+24,6
@@
#include "graphicalui.h"
#include "abstractnotificationbackend.h"
#include "graphicalui.h"
#include "abstractnotificationbackend.h"
-#include "mainwin.h"
#include "qtuistyle.h"
class MainWin;
#include "qtuistyle.h"
class MainWin;
@@
-49,6
+48,8
@@
public:
inline static QtUiStyle *style();
inline static MainWin *mainWindow();
inline static QtUiStyle *style();
inline static MainWin *mainWindow();
+ static bool haveSystemTray();
+
/* Notifications */
static void registerNotificationBackend(AbstractNotificationBackend *);
/* Notifications */
static void registerNotificationBackend(AbstractNotificationBackend *);
@@
-68,14
+69,23
@@
protected slots:
void disconnectedFromCore();
void notificationActivated(uint notificationId);
void disconnectedFromCore();
void notificationActivated(uint notificationId);
+protected:
+ virtual void minimizeRestore(bool show);
+ virtual bool isHidingMainWidgetAllowed() const;
+
+private slots:
+ void useSystemTrayChanged(const QVariant &);
+
private:
private:
- static Q
Pointer<QtUi>
_instance;
- static
QPointer<MainWin>
_mainWin;
+ static Q
tUi *
_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(); }
+QtUi *QtUi::instance() { return _instance ? _instance : new QtUi(); }
QtUiStyle *QtUi::style() { return qobject_cast<QtUiStyle*>(uiStyle()); }
MainWin *QtUi::mainWindow() { return _mainWin; }
QtUiStyle *QtUi::style() { return qobject_cast<QtUiStyle*>(uiStyle()); }
MainWin *QtUi::mainWindow() { return _mainWin; }