X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=a055115ab5c2243759cd376753644c6d8acb3d85;hp=1eae4bce31af4285b8de79e258c7458cf011270d;hb=332069a1830ed3a055ac6f2d7661bae1cc83e40c;hpb=92e686a4a4d3d490a3a187baea27c5864667c580 diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h index 1eae4bce..a055115a 100644 --- a/src/qtui/mainwin.h +++ b/src/qtui/mainwin.h @@ -25,20 +25,16 @@ #include "qtui.h" #include "titlesetter.h" +#include "sessionsettings.h" #include #include -class ServerListDlg; -class ChannelListDlg; -class CoreConnectDlg; class Buffer; class BufferViewConfig; -class SettingsDlg; -class QtUi; +class MsgProcessorStatusWidget; class Message; class NickListWidget; -class DebugConsole; #ifdef HAVE_DBUS # include "desktopnotifications.h" @@ -49,7 +45,7 @@ class MainWin : public QMainWindow { Q_OBJECT public: - MainWin(QtUi *gui, QWidget *parent = 0); + MainWin(QWidget *parent = 0); virtual ~MainWin(); void init(); @@ -62,9 +58,10 @@ class MainWin : public QMainWindow { #endif virtual bool event(QEvent *event); - public slots: void setTrayIconActivity(bool active = false); + void saveStateToSession(const QString &sessionId); + void saveStateToSessionSettings(SessionSettings &s); protected: void closeEvent(QCloseEvent *event); @@ -82,7 +79,7 @@ class MainWin : public QMainWindow { private slots: void addBufferView(int bufferViewConfigId); void removeBufferView(int bufferViewConfigId); - void receiveMessage(const Message &msg); + void messagesInserted(const QModelIndex &parent, int start, int end); void showChannelList(NetworkId netId = NetworkId()); void showCoreInfoDlg(); void showSettingsDlg(); @@ -90,17 +87,15 @@ class MainWin : public QMainWindow { void on_actionManageViews_triggered(); void on_actionLockDockPositions_toggled(bool lock); void showAboutDlg(); - void showDebugConsole(); + void on_actionDebugNetworkModel_triggered(bool); void showCoreConnectionDlg(bool autoConnect = false); - void coreConnectionDlgFinished(int result); void clientNetworkCreated(NetworkId); void clientNetworkRemoved(NetworkId); void clientNetworkUpdated(); void connectOrDisconnectFromNet(); - void changeTopic(const QString &topic); void makeTrayIconBlink(); void saveStatusBarStatus(bool enabled); @@ -115,15 +110,14 @@ class MainWin : public QMainWindow { signals: void connectToCore(const QVariantMap &connInfo); void disconnectFromCore(); - void requestBacklog(BufferInfo, QVariant, QVariant); private: Ui::MainWin ui; - QtUi *gui; QMenu *systrayMenu; QLabel *coreLagLabel; QLabel *sslLabel; + MsgProcessorStatusWidget *msgProcessorStatusWidget; TitleSetter _titleSetter; @@ -136,10 +130,7 @@ class MainWin : public QMainWindow { void setupStatusBar(); void setupSystray(); - void setupSettingsDlg(); - void toggleVisibility(); - void enableMenus(); QSystemTrayIcon *systray; @@ -149,11 +140,6 @@ class MainWin : public QMainWindow { bool trayIconActive; QTimer *timer; - CoreConnectDlg *coreConnectDlg; - ChannelListDlg *channelListDlg; - SettingsDlg *settingsDlg; - DebugConsole *debugConsole; - BufferId currentBuffer; QString currentProfile;