X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=gui%2Fmainwin.cpp;fp=gui%2Fmainwin.cpp;h=6ea4091c3727d1c69cb551c85f984f4fc88cf684;hp=8a21a9d309b76a84a47ef66ec85f42c2eed37fcc;hb=d6a96a47a3964b9c0b1ea2413601d70d0d327413;hpb=959e81d7ff35673870505331c012107cf67a5ab9

diff --git a/gui/mainwin.cpp b/gui/mainwin.cpp
index 8a21a9d3..6ea4091c 100644
--- a/gui/mainwin.cpp
+++ b/gui/mainwin.cpp
@@ -22,14 +22,18 @@
 #include <QtCore>
 
 #include "global.h"
+#include "message.h"
+#include "guiproxy.h"
 
 #include "mainwin.h"
-#include "channelwidget.h"
+#include "buffer.h"
+#include "networkview.h"
 #include "serverlist.h"
 #include "coreconnectdlg.h"
 
 MainWin::MainWin() : QMainWindow() {
   ui.setupUi(this);
+  widget = 0;
 
   setWindowTitle("Quassel IRC");
   setWindowIcon(QIcon(":/qirc-icon.png"));
@@ -41,24 +45,68 @@ MainWin::MainWin() : QMainWindow() {
   move(s.value("MainWinPos", QPoint(50, 50)).toPoint());
   s.endGroup();
 
-  //workspace = new QWorkspace(this);
-  //setCentralWidget(workspace);
+  workspace = new QWorkspace(this);
+  setCentralWidget(workspace);
   statusBar()->showMessage(tr("Waiting for core..."));
-  setEnabled(false);
+
+  netView = new NetworkView("", this);
+  netView->setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea);
+  addDockWidget(Qt::LeftDockWidgetArea, netView);
+  connect(netView, SIGNAL(bufferSelected(QString, QString)), this, SLOT(showBuffer(QString, QString)));
+  connect(this, SIGNAL(bufferSelected(QString, QString)), netView, SLOT(selectBuffer(QString, QString)));
+
+  connect(guiProxy, SIGNAL(csServerState(QString, QVariant)), this, SLOT(recvNetworkState(QString, QVariant)));
+  connect(guiProxy, SIGNAL(csServerConnected(QString)), this, SLOT(networkConnected(QString)));
+  connect(guiProxy, SIGNAL(csServerDisconnected(QString)), this, SLOT(networkDisconnected(QString)));
+  connect(guiProxy, SIGNAL(csDisplayMsg(QString, Message)), this, SLOT(recvMessage(QString, Message)));
+  connect(guiProxy, SIGNAL(csDisplayStatusMsg(QString, QString)), this, SLOT(recvStatusMsg(QString, QString)));
+  connect(guiProxy, SIGNAL(csTopicSet(QString, QString, QString)), this, SLOT(setTopic(QString, QString, QString)));
+  connect(guiProxy, SIGNAL(csSetNicks(QString, QString, QStringList)), this, SLOT(setNicks(QString, QString, QStringList)));
+  connect(guiProxy, SIGNAL(csNickAdded(QString, QString, VarMap)), this, SLOT(addNick(QString, QString, VarMap)));
+  connect(guiProxy, SIGNAL(csNickRemoved(QString, QString)), this, SLOT(removeNick(QString, QString)));
+  connect(guiProxy, SIGNAL(csNickRenamed(QString, QString, QString)), this, SLOT(renameNick(QString, QString, QString)));
+  connect(guiProxy, SIGNAL(csNickUpdated(QString, QString, VarMap)), this, SLOT(updateNick(QString, QString, VarMap)));
+  connect(guiProxy, SIGNAL(csOwnNickSet(QString, QString)), this, SLOT(setOwnNick(QString, QString)));
+  connect(this, SIGNAL(sendInput( QString, QString, QString )), guiProxy, SLOT(gsUserInput(QString, QString, QString)));
+
   show();
   syncToCore();
-  setEnabled(true);
+  statusBar()->showMessage(tr("Ready."));
+
+  buffersUpdated();
+
   serverListDlg = new ServerListDlg(this);
   serverListDlg->setVisible(serverListDlg->showOnStartup());
   setupMenus();
-  //identitiesAct = settingsMenu->addAction(QIcon(":/default/identity.png"), tr("&Identities..."), serverListDlg, SLOT(editIdentities()));
-  //showServerList();
-  IrcWidget *cw = new IrcWidget(this);
-  setCentralWidget(cw);
-  //workspace->addWindow(cw);
-  //cw->showMaximized();
-  statusBar()->showMessage(tr("Ready."));
-  cw->setFocus();
+
+  // replay backlog
+  foreach(QString net, coreBackLog.keys()) {
+    while(coreBackLog[net].count()) {
+      recvMessage(net, coreBackLog[net].takeFirst());
+    }
+  }
+  /*
+  foreach(QString key, buffers.keys()) {
+    foreach(Buffer *b, buffers[key].values()) {
+      QWidget *widget = b->showWidget(this);
+      workspace->addWindow(widget);
+      widget->show();
+    }
+  }
+  */
+  s.beginGroup("Buffers");
+  QString net = s.value("CurrentNetwork", "").toString();
+  QString buf = s.value("CurrentBuffer", "").toString();
+  s.endGroup();
+  if(!net.isEmpty()) {
+    if(buffers.contains(net)) {
+      if(buffers[net].contains(buf)) {
+        showBuffer(net, buf);
+      } else {
+        showBuffer(net, "");
+      }
+    }
+  }
 }
 
 void MainWin::setupMenus() {
@@ -66,27 +114,6 @@ void MainWin::setupMenus() {
   connect(ui.actionEditIdentities, SIGNAL(activated()), serverListDlg, SLOT(editIdentities()));
 }
 
-void MainWin::syncToCore() {
-  if(global->getData("CoreReady").toBool()) return;
-  // ok, apparently we are running as standalone GUI
-  coreConnectDlg = new CoreConnectDlg(this);
-  if(coreConnectDlg->exec() != QDialog::Accepted) {
-    //qApp->quit();
-    exit(1);
-  }
-  VarMap state = coreConnectDlg->getCoreState().toMap()["CoreData"].toMap();
-  delete coreConnectDlg;
-  QString key;
-  foreach(key, state.keys()) {
-    global->updateData(key, state[key]);
-  }
-  if(!global->getData("CoreReady").toBool()) {
-    QMessageBox::critical(this, tr("Fatal Error"), tr("<b>Could not synchronize with Quassel Core!</b><br>Quassel GUI will be aborted."), QMessageBox::Abort);
-    //qApp->quit();
-    exit(1);
-  }
-}
-
 void MainWin::showServerList() {
 //  if(!serverListDlg) {
 //    serverListDlg = new ServerListDlg(this);
@@ -102,8 +129,164 @@ void MainWin::closeEvent(QCloseEvent *event)
     s.setValue("MainWinSize", size());
     s.setValue("MainWinPos", pos());
     s.endGroup();
+    s.beginGroup("Buffers");
+    s.setValue("CurrentNetwork", currentNetwork);
+    s.setValue("CurrentBuffer", currentBuffer);
+    s.endGroup();
     event->accept();
   //} else {
     //event->ignore();
   //}
 }
+
+void MainWin::showBuffer(QString net, QString buf) {
+  currentBuffer = buf; currentNetwork = net;
+  Buffer *b = getBuffer(net, buf);
+  QWidget *old = widget;
+  widget = b->showWidget(this);
+  if(widget == old) return;
+  workspace->addWindow(widget);
+  widget->showMaximized();
+  if(old) { old->close(); old->setParent(this); }
+  workspace->setActiveWindow(widget);
+  //widget->setFocus();
+  //workspace->setFocus();
+  //widget->activateWindow();
+  widget->setFocus(Qt::MouseFocusReason);
+  focusNextChild();
+  //workspace->tile();
+  emit bufferSelected(net, buf);
+}
+
+void MainWin::networkConnected(QString net) {
+  connected[net] = true;
+  Buffer *b = getBuffer(net, "");
+  b->setActive(true);
+  b->displayMsg(Message::server("", tr("Connected.")));
+  buffersUpdated();
+}
+
+void MainWin::networkDisconnected(QString net) {
+  //getBuffer(net, "")->setActive(false);
+  foreach(QString buf, buffers[net].keys()) {
+    Buffer *b = getBuffer(net, buf);
+    b->displayMsg(Message::server(buf, tr("Server disconnected.")));
+    b->setActive(false);
+    
+  }
+  connected[net] = false;
+}
+
+Buffer * MainWin::getBuffer(QString net, QString buf) {
+  if(!buffers[net].contains(buf)) {
+    Buffer *b = new Buffer(net, buf);
+    b->setOwnNick(ownNick[net]);
+    connect(b, SIGNAL(userInput(QString, QString, QString)), this, SLOT(userInput(QString, QString, QString)));
+    buffers[net][buf] = b;
+    buffersUpdated();
+  }
+  return buffers[net][buf];
+}
+
+void MainWin::buffersUpdated() {
+  netView->buffersUpdated(buffers);
+}
+
+void MainWin::recvNetworkState(QString net, QVariant state) {
+  connected[net] = true;
+  setOwnNick(net, state.toMap()["OwnNick"].toString());
+  getBuffer(net, "")->setActive(true);
+  VarMap t = state.toMap()["Topics"].toMap();
+  VarMap n = state.toMap()["Nicks"].toMap();
+  foreach(QString buf, t.keys()) {
+    getBuffer(net, buf)->setActive(true);
+    setTopic(net, buf, t[buf].toString());
+  }
+  foreach(QString nick, n.keys()) {
+    addNick(net, nick, n[nick].toMap());
+  }
+  buffersUpdated();
+}
+
+void MainWin::recvMessage(QString net, Message msg) {
+  Buffer *b = getBuffer(net, msg.target);
+  b->displayMsg(msg);
+}
+
+void MainWin::recvStatusMsg(QString net, QString msg) {
+  recvMessage(net, Message::server("", QString("[STATUS] %1").arg(msg)));
+
+}
+
+void MainWin::userInput(QString net, QString buf, QString msg) {
+  emit sendInput(net, buf, msg);
+}
+
+void MainWin::setTopic(QString net, QString buf, QString topic) {
+  if(!connected[net]) return;
+  Buffer *b = getBuffer(net, buf);
+  b->setTopic(topic);
+  buffersUpdated();
+  //if(!b->isActive()) {
+  //  b->setActive(true);
+  //  buffersUpdated();
+  //}
+}
+
+void MainWin::setNicks(QString net, QString buf, QStringList nicks) {
+  Q_ASSERT(false);
+}
+
+void MainWin::addNick(QString net, QString nick, VarMap props) {
+  if(!connected[net]) return;
+  nicks[net][nick] = props;
+  VarMap chans = props["Channels"].toMap();
+  QStringList c = chans.keys();
+  foreach(QString bufname, c) {
+    getBuffer(net, bufname)->addNick(nick, props);
+  }
+  buffersUpdated();
+}
+
+void MainWin::renameNick(QString net, QString oldnick, QString newnick) {
+  if(!connected[net]) return;
+  QStringList chans = nicks[net][oldnick]["Channels"].toMap().keys();
+  foreach(QString c, chans) {
+    getBuffer(net, c)->renameNick(oldnick, newnick);
+  }
+  nicks[net][newnick] = nicks[net].take(oldnick);
+}
+
+void MainWin::updateNick(QString net, QString nick, VarMap props) {
+  if(!connected[net]) return;
+  QStringList oldchans = nicks[net][nick]["Channels"].toMap().keys();
+  QStringList newchans = props["Channels"].toMap().keys();
+  foreach(QString c, newchans) {
+    if(oldchans.contains(c)) getBuffer(net, c)->updateNick(nick, props);
+    else getBuffer(net, c)->addNick(nick, props);
+  }
+  foreach(QString c, oldchans) {
+    if(!newchans.contains(c)) getBuffer(net, c)->removeNick(nick);
+  }
+  nicks[net][nick] = props;
+  buffersUpdated();
+}
+
+void MainWin::removeNick(QString net, QString nick) {
+  if(!connected[net]) return;
+  VarMap chans = nicks[net][nick]["Channels"].toMap();
+  foreach(QString bufname, chans.keys()) {
+    getBuffer(net, bufname)->removeNick(nick);
+  }
+  nicks[net].remove(nick);
+  buffersUpdated();
+}
+
+void MainWin::setOwnNick(QString net, QString nick) {
+  if(!connected[net]) return;
+  ownNick[net] = nick;
+  foreach(Buffer *b, buffers[net].values()) {
+    b->setOwnNick(nick);
+  }
+}
+