projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OK, disabled warnings for the moment :)
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
0559b4e
..
d4b8ab1
100644
(file)
--- a/
src/qtui/mainwin.h
+++ b/
src/qtui/mainwin.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
7 by the Quassel IRC Team
*
+ * Copyright (C) 2005-0
8 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 *
@@
-26,6
+26,8
@@
#include "qtui.h"
#include "bufferviewfilter.h"
#include "qtui.h"
#include "bufferviewfilter.h"
+#include <QSystemTrayIcon>
+
class ServerListDlg;
class CoreConnectDlg;
class Buffer;
class ServerListDlg;
class CoreConnectDlg;
class Buffer;
@@
-33,7
+35,6
@@
class SettingsDlg;
class QtUi;
class Message;
class NickListWidget;
class QtUi;
class Message;
class NickListWidget;
-
class DebugConsole;
//!\brief The main window of Quassel's QtUi.
class DebugConsole;
//!\brief The main window of Quassel's QtUi.
@@
-45,7
+46,7
@@
class MainWin : public QMainWindow {
virtual ~MainWin();
void init();
virtual ~MainWin();
void init();
-
void addBufferView(const QString &, QAbstractItemModel *, const BufferViewFilter::Modes &, const QList<uint
> &);
+
QDockWidget *addBufferView(const QString &, QAbstractItemModel *, const BufferViewFilter::Modes &, const QList<NetworkId
> &);
AbstractUiMsg *layoutMsg(const Message &);
AbstractUiMsg *layoutMsg(const Message &);
@@
-55,6
+56,7
@@
class MainWin : public QMainWindow {
protected slots:
void connectedToCore();
void disconnectedFromCore();
protected slots:
void connectedToCore();
void disconnectedFromCore();
+ void systrayActivated( QSystemTrayIcon::ActivationReason );
private slots:
private slots:
@@
-64,12
+66,12
@@
class MainWin : public QMainWindow {
void showCoreConnectionDlg(bool autoConnect = false);
void coreConnectionDlgFinished(int result);
void showCoreConnectionDlg(bool autoConnect = false);
void coreConnectionDlgFinished(int result);
- void showBuffer(BufferInfo);
- void showBuffer(Buffer *);
+ void disconnectFromNet();
signals:
void connectToCore(const QVariantMap &connInfo);
void disconnectFromCore();
signals:
void connectToCore(const QVariantMap &connInfo);
void disconnectFromCore();
+ void disconnectFromNetwork(NetworkId);
void requestBacklog(BufferInfo, QVariant, QVariant);
private:
void requestBacklog(BufferInfo, QVariant, QVariant);
private:
@@
-88,7
+90,7
@@
class MainWin : public QMainWindow {
CoreConnectDlg *coreConnectDlg;
SettingsDlg *settingsDlg;
CoreConnectDlg *coreConnectDlg;
SettingsDlg *settingsDlg;
-
uint
currentBuffer;
+
BufferId
currentBuffer;
QString currentProfile;
QList<QDockWidget *> netViews;
QString currentProfile;
QList<QDockWidget *> netViews;