Lots of additions again. Working on implementing commands and prettifying the output.

[quassel.git] / gui / guiproxy.h

diff --git a/gui/guiproxy.h b/gui/guiproxy.h
index d1f5534..a068b6d 100644 (file)
--- a/gui/guiproxy.h
+++ b/gui/guiproxy.h
@@ -22,10 +22,13 @@
 #define _GUIPROXY_H_
 
 #include "proxy_common.h"
+#include "message.h"
+#include "global.h"
 
 #include <QObject>
 #include <QVariant>
 #include <QTcpSocket>
+#include <QStringList>
 
 /** This class is the GUI side of the proxy. The GUI connects its signals and slots to it,
  *  and the calls are marshalled and sent to (or received and unmarshalled from) the CoreProxy.
@@ -38,18 +41,25 @@ class GUIProxy : public QObject {
     GUIProxy();
 
   public slots:
-    inline void gsUserInput(QString s)                             { send(GS_USER_INPUT, s); }
-    inline void gsRequestConnect(QString host, quint16 port)       { send(GS_REQUEST_CONNECT, host, port); }
-    //inline void gsPutQuasselData(QString key, QVariant data)       { send(GS_PUT_QUASSEL_DATA, key, data); }
+    inline void gsUserInput(QString net, QString buf, QString msg)    { send(GS_USER_INPUT, net, buf, msg); }
+    inline void gsRequestConnect(QStringList networks)                { send(GS_REQUEST_CONNECT, networks); }
 
     void connectToCore(QString host, quint16 port);
     void disconnectFromCore();
 
   signals:
     void csCoreState(QVariant);
-    void csCoreMessage(QString);
+    void csDisplayMsg(QString, QString, Message);
+    void csDisplayStatusMsg(QString, QString);
     void csUpdateGlobalData(QString key, QVariant data);
     void csGlobalDataChanged(QString key);
+    void csModeSet(QString, QString, QString);
+    void csTopicSet(QString, QString, QString);
+    void csSetNicks(QString, QString, QStringList);
+    void csNickAdded(QString, QString, VarMap);
+    void csNickRemoved(QString, QString);
+    void csNickUpdated(QString, QString, VarMap);
+    void csOwnNickSet(QString, QString);
 
     void coreConnected();
     void coreDisconnected();