X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=28c94d1378dc8e8f1632d664d3f8037722b3dd0e;hb=6e50e532fa24b8e36237eb7ae9c5c9b21058519f;hp=b2ea75a4b9581c8778884db348d3737aed8632aa;hpb=dd10a98793d8c158417a8830194ca9b5d1302424;p=quassel.git

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index b2ea75a4..28c94d13 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -29,16 +29,11 @@
 #include <QSystemTrayIcon>
 #include <QTimer>
 
-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"
@@ -48,127 +43,115 @@ class DebugConsole;
 class MainWin : public QMainWindow {
   Q_OBJECT
 
-  public:
-    MainWin(QtUi *gui, QWidget *parent = 0);
-    virtual ~MainWin();
+public:
+  MainWin(QWidget *parent = 0);
+  virtual ~MainWin();
 
-    void init();
-    void addBufferView(BufferViewConfig *config = 0);
+  void init();
+  void addBufferView(BufferViewConfig *config = 0);
 
-    void displayTrayIconMessage(const QString &title, const QString &message);
+  void displayTrayIconMessage(const QString &title, const QString &message);
 
 #ifdef HAVE_DBUS
-    void sendDesktopNotification(const QString &title, const QString &message);
+  void sendDesktopNotification(const QString &title, const QString &message);
 #endif
 
-    virtual bool event(QEvent *event);
-
-  public slots:
-    void setTrayIconActivity(bool active = false);
-
-  protected:
-    void closeEvent(QCloseEvent *event);
-    virtual void changeEvent(QEvent *event);
-
-  protected slots:
-    void connectedToCore();
-    void setConnectedState();
-    void updateLagIndicator(int lag);
-    void securedConnection();
-    void disconnectedFromCore();
-    void setDisconnectedState();
-    void systrayActivated( QSystemTrayIcon::ActivationReason );
-
-  private slots:
-    void addBufferView(int bufferViewConfigId);
-    void removeBufferView(int bufferViewConfigId);
-    void receiveMessage(const Message &msg);
-    void showChannelList(NetworkId netId = NetworkId());
-    void showCoreInfoDlg();
-    void showSettingsDlg();
-    void on_actionEditNetworks_triggered();
-    void on_actionManageViews_triggered();
-    void on_actionLockDockPositions_toggled(bool lock);
-    void showAboutDlg();
-    void showDebugConsole();
-
-    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);
-
-    void loadLayout();
-    void saveLayout();
-
+  virtual bool event(QEvent *event);
+
+public slots:
+  void setTrayIconActivity(bool active = false);
+
+protected:
+  void closeEvent(QCloseEvent *event);
+  virtual void changeEvent(QEvent *event);
+					 
+protected slots:
+  void connectedToCore();
+  void setConnectedState();
+  void updateLagIndicator(int lag);
+  void securedConnection();
+  void disconnectedFromCore();
+  void setDisconnectedState();
+  void systrayActivated( QSystemTrayIcon::ActivationReason );
+							    
+private slots:
+  void addBufferView(int bufferViewConfigId);
+  void removeBufferView(int bufferViewConfigId);
+  void messagesInserted(const QModelIndex &parent, int start, int end);
+  void showChannelList(NetworkId netId = NetworkId());
+  void showCoreInfoDlg();
+  void showSettingsDlg();
+  void on_actionEditNetworks_triggered();
+  void on_actionManageViews_triggered();
+  void on_actionLockDockPositions_toggled(bool lock);
+  void showAboutDlg();
+  void on_actionDebugNetworkModel_triggered(bool);
+  
+  void showCoreConnectionDlg(bool autoConnect = false);
+  
+  void clientNetworkCreated(NetworkId);
+  void clientNetworkRemoved(NetworkId);
+  void clientNetworkUpdated();
+  void connectOrDisconnectFromNet();
+  
+  void makeTrayIconBlink();
+  void saveStatusBarStatus(bool enabled);
+
+  void loadLayout();
+  void saveLayout();
+  
 #ifdef HAVE_DBUS
-    void desktopNotificationClosed(uint id, uint reason);
-    void desktopNotificationInvoked(uint id, const QString & action);
+  void desktopNotificationClosed(uint id, uint reason);
+  void desktopNotificationInvoked(uint id, const QString & action);
 #endif
-
-  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;
-
-    TitleSetter _titleSetter;
-
-    void setupMenus();
-    void setupViews();
-    void setupNickWidget();
-    void setupChatMonitor();
-    void setupInputWidget();
-    void setupTopicWidget();
-    void setupStatusBar();
-    void setupSystray();
-
-    void setupSettingsDlg();
-
-    void toggleVisibility();
-
-    void enableMenus();
-
-    QSystemTrayIcon *systray;
-    QIcon activeTrayIcon;
-    QIcon onlineTrayIcon;
-    QIcon offlineTrayIcon;
-    bool trayIconActive;
-    QTimer *timer;
-
-    CoreConnectDlg *coreConnectDlg;
-    ChannelListDlg *channelListDlg;
-    SettingsDlg *settingsDlg;
-    DebugConsole *debugConsole;
-
-    BufferId currentBuffer;
-    QString currentProfile;
-
-    QList<QDockWidget *> _netViews;
-    NickListWidget *nickListWidget;
-
-    QAction *actionEditNetworks;
-    QList<QAction *> networkActions;
-
+  
+signals:
+  void connectToCore(const QVariantMap &connInfo);
+  void disconnectFromCore();
+  void requestBacklog(BufferInfo, QVariant, QVariant);
+  
+private:
+  Ui::MainWin ui;
+  
+  QMenu *systrayMenu;
+  QLabel *coreLagLabel;
+  QLabel *sslLabel;
+  MsgProcessorStatusWidget *msgProcessorStatusWidget;
+  
+  TitleSetter _titleSetter;
+  
+  void setupMenus();
+  void setupViews();
+  void setupNickWidget();
+  void setupChatMonitor();
+  void setupInputWidget();
+  void setupTopicWidget();
+  void setupStatusBar();
+  void setupSystray();
+  
+  void toggleVisibility();
+  
+  void enableMenus();
+  
+  QSystemTrayIcon *systray;
+  QIcon activeTrayIcon;
+  QIcon onlineTrayIcon;
+  QIcon offlineTrayIcon;
+  bool trayIconActive;
+  QTimer *timer;
+
+  BufferId currentBuffer;
+  QString currentProfile;
+  
+  QList<QDockWidget *> _netViews;
+  NickListWidget *nickListWidget;
+  
 #ifdef HAVE_DBUS
-    org::freedesktop::Notifications *desktopNotifications;
-    quint32 notificationId;
+  org::freedesktop::Notifications *desktopNotifications;
+  quint32 notificationId;
 #endif
-
-    friend class QtUi;
+  
+  friend class QtUi;
 };
 
 #endif