X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=gui%2Fmainwin.cpp;h=2b63b17897b9fb6c63fa34db20d739dbf6dcfd97;hp=84835ad8e2139616ad81ea87ef6ba4d1f85f7a88;hb=b27b03c4239150189b7ae8963ca2e8c9b1a0ce4a;hpb=ddc5208315db8ca9ca19f6a59ee7caefe631ffc7

diff --git a/gui/mainwin.cpp b/gui/mainwin.cpp
index 84835ad8..2b63b178 100644
--- a/gui/mainwin.cpp
+++ b/gui/mainwin.cpp
@@ -29,7 +29,7 @@
 
 #include "mainwin.h"
 #include "buffer.h"
-#include "networkview.h"
+#include "bufferviewwidget.h"
 #include "serverlist.h"
 #include "coreconnectdlg.h"
 #include "settingsdlg.h"
@@ -40,7 +40,7 @@ LayoutThread *layoutThread;
 MainWin::MainWin() : QMainWindow() {
   ui.setupUi(this);
   //widget = 0;
-  qDebug() << "Available DB drivers: " << QSqlDatabase::drivers ();
+  //qDebug() << "Available DB drivers: " << QSqlDatabase::drivers ();
   setWindowTitle("Quassel IRC");
   //setWindowTitle("Κυασελ Εγαρζη");
   setWindowIcon(QIcon(":/qirc-icon.png"));
@@ -69,6 +69,7 @@ void MainWin::init() {
   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(guiProxy, SIGNAL(csBacklogData(BufferId, QList<QVariant>, bool)), this, SLOT(recvBacklogData(BufferId, QList<QVariant>, bool)));
+  connect(guiProxy, SIGNAL(csUpdateBufferId(BufferId)), this, SLOT(updateBufferId(BufferId)));
   connect(this, SIGNAL(sendInput(BufferId, QString)), guiProxy, SLOT(gsUserInput(BufferId, QString)));
   connect(this, SIGNAL(requestBacklog(BufferId, QVariant, QVariant)), guiProxy, SLOT(gsRequestBacklog(BufferId, QVariant, QVariant)));
 
@@ -89,12 +90,9 @@ void MainWin::init() {
 
   setupSettingsDlg();
 
-  //Buffer::init();
   setupMenus();
   setupViews();
 
-  //bufferWidget = 0;
-
   QSettings s;
   s.beginGroup("Geometry");
   //resize(s.value("MainWinSize", QSize(500, 400)).toSize());
@@ -102,35 +100,6 @@ void MainWin::init() {
   if(s.contains("MainWinState")) restoreState(s.value("MainWinState").toByteArray());
   s.endGroup();
 
-  // replay backlog
-  // FIXME do this right
-  /*
-  QHash<Buffer *, QList<Message> > hash;
-  Buffer *b;
-
-  foreach(QString net, coreBackLog.keys()) {
-    //if(net != "MoepNet") continue;
-    while(coreBackLog[net].count()) {
-      //recvMessage(net, coreBackLog[net].takeFirst());
-      Message msg = coreBackLog[net].takeLast();
-      if(msg.flags & Message::PrivMsg) {
-      // query
-        if(msg.flags & Message::Self) b = getBuffer(net, msg.target);
-        else b = getBuffer(net, nickFromMask(msg.sender));
-      } else {
-        b = getBuffer(net, msg.target);
-      }
-      hash[b].prepend(msg);
-      if(hash[b].count() >= 5) {
-        ui.bufferWidget->prependMessages(b, hash.take(b));
-      }
-    }
-  }
-  foreach(Buffer *buf, hash.keys()) {
-    ui.bufferWidget->prependMessages(buf, hash.take(buf));
-  }
-*/
-
   /* make lookups by id faster */
   foreach(BufferId id, coreBuffers) {
     bufferIds[id.uid()] = id;  // make lookups by id faster
@@ -184,37 +153,41 @@ void MainWin::setupMenus() {
 }
 
 void MainWin::setupViews() {
-  NetworkView *all = new NetworkView(tr("All Buffers"), NetworkView::AllNets);
-  registerNetView(all);
-  addDockWidget(Qt::LeftDockWidgetArea, all);
-  NetworkView *allchans = new NetworkView(tr("All Channels"), NetworkView::AllNets|NetworkView::NoQueries|NetworkView::NoServers);
-  registerNetView(allchans);
-  addDockWidget(Qt::LeftDockWidgetArea, allchans);
-  NetworkView *allqrys = new NetworkView(tr("All Queries"), NetworkView::AllNets|NetworkView::NoChannels|NetworkView::NoServers);
-  registerNetView(allqrys);
-  addDockWidget(Qt::RightDockWidgetArea, allqrys);
-  NetworkView *allnets = new NetworkView(tr("All Networks"), NetworkView::AllNets|NetworkView::NoChannels|NetworkView::NoQueries);
-  registerNetView(allnets);
-  addDockWidget(Qt::RightDockWidgetArea, allnets);
+  BufferTreeModel *model = new BufferTreeModel(this); // FIXME Where is the delete for that? :p
+  connect(model, SIGNAL(bufferSelected(Buffer *)), this, SLOT(showBuffer(Buffer *)));
+  connect(this, SIGNAL(bufferSelected(Buffer *)), model, SLOT(selectBuffer(Buffer *)));
+  connect(this, SIGNAL(bufferUpdated(Buffer *)), model, SLOT(bufferUpdated(Buffer *)));
+  connect(this, SIGNAL(bufferActivity(Buffer::ActivityLevel, Buffer *)), model, SLOT(bufferActivity(Buffer::ActivityLevel, Buffer *)));
+  
+  BufferViewDock *all = new BufferViewDock(model, tr("All Buffers"), BufferViewFilter::AllNets);
+  registerBufferViewDock(all);
+  
+  BufferViewDock *allchans = new BufferViewDock(model, tr("All Channels"), BufferViewFilter::AllNets|BufferViewFilter::NoQueries|BufferViewFilter::NoServers);
+  registerBufferViewDock(allchans);
+  
+  BufferViewDock *allqrys = new BufferViewDock(model, tr("All Queries"), BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoServers);
+  registerBufferViewDock(allqrys);
+
+  
+  BufferViewDock *allnets = new BufferViewDock(model, tr("All Networks"), BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries);
+  registerBufferViewDock(allnets);
+
 
   ui.menuViews->addSeparator();
 }
 
-void MainWin::registerNetView(NetworkView *view) {
+void MainWin::registerBufferViewDock(BufferViewDock *dock) {
+  addDockWidget(Qt::LeftDockWidgetArea, dock);
+  dock->setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea);
+  netViews.append(dock);
+  ui.menuViews->addAction(dock->toggleViewAction());
+  
+  /*
   connect(this, SIGNAL(bufferSelected(Buffer *)), view, SLOT(selectBuffer(Buffer *)));
-  connect(this, SIGNAL(bufferUpdated(Buffer *)), view, SLOT(bufferUpdated(Buffer *)));
   connect(this, SIGNAL(bufferDestroyed(Buffer *)), view, SLOT(bufferDestroyed(Buffer *)));
   connect(view, SIGNAL(bufferSelected(Buffer *)), this, SLOT(showBuffer(Buffer *)));
-  //QList<Buffer *> bufs;
-  //typedef QHash<QString, Buffer *> bufhash;
-  //QList<bufhash> foo = buffers.values();
-  //foreach(bufhash h, foo) {
-  //  bufs += h.values();
-  //}
   view->setBuffers(buffers.values());
-  view->setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea);
-  netViews.append(view);
-  ui.menuViews->addAction(view->toggleViewAction());
+   */
 }
 
 void MainWin::showServerList() {
@@ -255,7 +228,6 @@ void MainWin::showBuffer(BufferId id) {
 }
 
 void MainWin::showBuffer(Buffer *b) {
-  //currentBuffer = b->bufferName(); currentNetwork = b->networkName();
   currentBuffer = b->bufferId().groupId();
   //emit bufferSelected(b);
   //qApp->processEvents();
@@ -268,7 +240,7 @@ void MainWin::networkConnected(QString net) {
   BufferId id = getStatusBufferId(net);
   Buffer *b = getBuffer(id);
   b->setActive(true);
-  //b->displayMsg(Message(id, Message::Server, tr("Connected.")));  FIXME
+  //b->displayMsg(Message(id, Message::Server, tr("Connected.")));
   // TODO buffersUpdated();
 }
 
@@ -283,6 +255,11 @@ void MainWin::networkDisconnected(QString net) {
   connected[net] = false;
 }
 
+void MainWin::updateBufferId(BufferId id) {
+  bufferIds[id.uid()] = id;  // make lookups by id faster
+  getBuffer(id);
+}
+
 BufferId MainWin::getBufferId(QString net, QString buf) {
   foreach(BufferId id, buffers.keys()) {
     if(id.network() == net && id.buffer() == buf) return id;
@@ -337,7 +314,19 @@ void MainWin::recvMessage(Message msg) {
     b = getBuffer(net, msg.target);
   }
   */
+  
+
   Buffer *b = getBuffer(msg.buffer);
+  
+  Buffer::ActivityLevel level = Buffer::OtherActivity;
+  if(msg.type == Message::Plain or msg.type == Message::Notice){
+    level |= Buffer::NewMessage;
+  }
+  if(msg.flags & Message::Highlight){
+    level |= Buffer::Highlight;
+  }
+  emit bufferActivity(level, b);
+
   //b->displayMsg(msg);
   b->appendChatLine(new ChatLine(msg));
 }