projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renaming the classes and .ui files that got temp names because of collisions
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
b84a85c
..
3a3be26
100644
(file)
--- a/
src/qtui/mainwin.h
+++ b/
src/qtui/mainwin.h
@@
-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.
@@
-55,18
+56,21
@@
class MainWin : public QMainWindow {
protected slots:
void connectedToCore();
void disconnectedFromCore();
protected slots:
void connectedToCore();
void disconnectedFromCore();
+ void systrayActivated( QSystemTrayIcon::ActivationReason );
private slots:
private slots:
- void showServerList();
void showSettingsDlg();
void showDebugConsole();
void showCoreConnectionDlg(bool autoConnect = false);
void coreConnectionDlgFinished(int result);
void showSettingsDlg();
void showDebugConsole();
void showCoreConnectionDlg(bool autoConnect = false);
void coreConnectionDlgFinished(int result);
+ 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:
@@
-75,13
+79,17
@@
class MainWin : public QMainWindow {
void setupMenus();
void setupViews();
void setupMenus();
void setupViews();
+ void setupNickWidget();
+ void setupChatMonitor();
+ void setupInputWidget();
+ void setupTopicWidget();
+
void setupSettingsDlg();
void enableMenus();
QSystemTrayIcon *systray;
void setupSettingsDlg();
void enableMenus();
QSystemTrayIcon *systray;
- ServerListDlg *serverListDlg;
CoreConnectDlg *coreConnectDlg;
SettingsDlg *settingsDlg;
CoreConnectDlg *coreConnectDlg;
SettingsDlg *settingsDlg;