Refactoring the GUI. Work in progress.

[quassel.git] / gui / guiproxy.h

diff --git a/gui/guiproxy.h b/gui/guiproxy.h
index 37bfd14..28fbfff 100644 (file)
--- a/gui/guiproxy.h
+++ b/gui/guiproxy.h
@@ -21,36 +21,84 @@
 #ifndef _GUIPROXY_H_
 #define _GUIPROXY_H_
 
-#include "../main/proxy_common.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.
- *  The connection function is defined in main/main_gui.cpp or main/main_mono.cpp.
- */
-class GUIProxy : public QObject {
+class ClientProxy : public QObject {
   Q_OBJECT
 
-  private:
-    void send(GUISignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());
-    void recv(CoreSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());
-
   public:
-    static GUIProxy * init();
+    static ClientProxy *instance();
+    static void destroy();
 
   public slots:
-    void gsUserInput(QString);
+    inline void gsUserInput(BufferId id, QString msg)                 { send(GS_USER_INPUT, QVariant::fromValue(id), msg); }
+    inline void gsRequestConnect(QStringList networks)                { send(GS_REQUEST_CONNECT, networks); }
+    inline void gsImportBacklog()                                     { send(GS_IMPORT_BACKLOG); }
+    inline void gsRequestBacklog(BufferId id, QVariant v1, QVariant v2) { send(GS_REQUEST_BACKLOG, QVariant::fromValue(id), v1, v2); }
+
+    inline void gsGeneric(ClientSignal sig, QVariant v1 = QVariant(), QVariant v2 = QVariant(), QVariant v3 = QVariant()) { send(sig, v1, v2, v3); }
 
+    //void connectToCore(QString host, quint16 port);
+    //void disconnectFromCore();
 
   signals:
-    void psCoreMessage(QString);
+    void csCoreState(QVariant);
+    void csServerState(QString, QVariant);
+    void csServerConnected(QString);
+    void csServerDisconnected(QString);
+    void csDisplayMsg(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 csNickAdded(QString, QString, VarMap);
+    void csNickRemoved(QString, QString);
+    void csNickRenamed(QString, QString, QString);
+    void csNickUpdated(QString, QString, VarMap);
+    void csOwnNickSet(QString, QString);
+    void csQueryRequested(QString, QString);
+    void csBacklogData(BufferId, QList<QVariant>, bool);
+    void csUpdateBufferId(BufferId);
+
+    void csGeneric(CoreSignal, QVariant, QVariant, QVariant);
+
+    //void coreConnected();
+    //void coreDisconnected();
+    //void coreConnectionError(QString errorMsg);
+
+    //void recvPartialItem(quint32 avail, quint32 size);
+
+    void send(ClientSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());
+
+  public slots:
+    void recv(CoreSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());
+
+  private slots:
+    //void updateCoreData(QString);
+
+    //void serverError(QAbstractSocket::SocketError);
+    //void serverHasData();
+
+  private:
+    ClientProxy();
+    static ClientProxy *instanceptr;
+
+    //QTcpSocket socket;
+    //quint32 blockSize;
 
+  //friend class CoreProxy;
 
 };
 
-extern GUIProxy *guiProxy;
+//extern ClientProxy *guiProxy;