X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtgui%2Fmainwin.cpp;h=6b89e20e069d91f4612e3e029bc1690b9662511c;hb=42ff71aaa8d3cee9e348a45758c56c380a4f1b45;hp=d05de42c494d6a4f36a8dd74ef9d05621d3f6367;hpb=ec07b6300b6b3b125127ad2d7cd42fabeb020b1b;p=quassel.git

diff --git a/src/qtgui/mainwin.cpp b/src/qtgui/mainwin.cpp
index d05de42c..6b89e20e 100644
--- a/src/qtgui/mainwin.cpp
+++ b/src/qtgui/mainwin.cpp
@@ -18,43 +18,39 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <QtGui>
-#include <QtCore>
-#include <QSqlDatabase>
+#include "mainwin.h"
 
+#include "bufferview.h"
+#include "chatline.h"
 #include "client.h"
-#include "util.h"
-#include "global.h"
-#include "message.h"
 #include "clientproxy.h"
-
-#include "mainwin.h"
-#include "buffer.h"
-#include "chatline.h"
-#include "serverlist.h"
 #include "coreconnectdlg.h"
+#include "serverlist.h"
 #include "settingsdlg.h"
 #include "settingspages.h"
 
-MainWin::MainWin() : QMainWindow() {
+MainWin::MainWin(QtGui *_gui, QWidget *parent) : QMainWindow(parent), gui(_gui) {
   ui.setupUi(this);
-  //widget = 0;
-  //qDebug() << "Available DB drivers: " << QSqlDatabase::drivers ();
-  setWindowTitle("Quassel IRC");
-  //setWindowTitle("Κυασελ Εγαρζη");
+  //setWindowTitle("Quassel IRC");
+  setWindowTitle(QString::fromUtf8("Κυασελ Εγαρζη"));
   setWindowIcon(QIcon(":/qirc-icon.png"));
   setWindowIconText("Quassel IRC");
 
-  //workspace = new QWorkspace(this);
-  //setCentralWidget(workspace);
   statusBar()->showMessage(tr("Waiting for core..."));
+  
 }
 
 void MainWin::init() {
+  connect(this, SIGNAL(requestBacklog(BufferId, QVariant, QVariant)), ClientProxy::instance(), SLOT(gsRequestBacklog(BufferId, QVariant, QVariant)));
   ui.bufferWidget->init();
 
   show();
-  //syncToCore();
+
+  VarMap connInfo;
+  connInfo["User"] = "Default";
+  connInfo["Password"] = "password";
+  connectToCore(connInfo);
+
   statusBar()->showMessage(tr("Ready."));
   systray = new QSystemTrayIcon(this);
   systray->setIcon(QIcon(":/qirc-icon.png"));
@@ -79,17 +75,6 @@ void MainWin::init() {
   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, "");
-      }
-    }
-  }
-  */
 }
 
 MainWin::~MainWin() {
@@ -122,43 +107,43 @@ void MainWin::setupMenus() {
 
 void MainWin::setupViews() {
   
-  BufferTreeModel *model = Client::bufferModel(); // FIXME Where is the delete for that? :p
+  BufferTreeModel *model = Client::bufferModel();
   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, QStringList(), this);
-  registerBufferViewDock(all);
-  
-  BufferViewDock *allchans = new BufferViewDock(model, tr("All Channels"), BufferViewFilter::AllNets|BufferViewFilter::NoQueries|BufferViewFilter::NoServers, QStringList(), this);
-  registerBufferViewDock(allchans);
-  
-  BufferViewDock *allqrys = new BufferViewDock(model, tr("All Queries"), BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoServers, QStringList(), this);
-  registerBufferViewDock(allqrys);
-
+  addBufferView(tr("All Buffers"), model, BufferViewFilter::AllNets, QStringList());
+  addBufferView(tr("All Channels"), model, BufferViewFilter::AllNets|BufferViewFilter::NoQueries|BufferViewFilter::NoServers, QStringList());
+  addBufferView(tr("All Queries"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoServers, QStringList());
+  addBufferView(tr("All Networks"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries, QStringList());
+  addBufferView(tr("Full Custom"), model, BufferViewFilter::FullCustom, QStringList());
   
-  BufferViewDock *allnets = new BufferViewDock(model, tr("All Networks"), BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries, QStringList(), this);
-  registerBufferViewDock(allnets);
-
-  BufferViewDock *fullCustom = new BufferViewDock(model, tr("Full Custom"), BufferViewFilter::FullCustom|BufferViewFilter::SomeNets, QStringList(), this);
-  registerBufferViewDock(fullCustom);
-
   ui.menuViews->addSeparator();
 }
 
-void MainWin::registerBufferViewDock(BufferViewDock *dock) {
-  addDockWidget(Qt::LeftDockWidgetArea, dock);
+void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model, const BufferViewFilter::Modes &mode, const QStringList &nets) {
+  QDockWidget *dock = new QDockWidget(viewname, this);
+  dock->setObjectName(QString("ViewDock-" + viewname)); // should be unique for mainwindow state!
   dock->setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea);
-  netViews.append(dock);
+  //dock->setContentsMargins(4,4,4,4);
+
+  //create the view and initialize it's filter
+  BufferView *view = new BufferView(dock);
+  view->setFilteredModel(model, mode, nets);
+  dock->setWidget(view);
+  
+  addDockWidget(Qt::LeftDockWidgetArea, dock);
   ui.menuViews->addAction(dock->toggleViewAction());
   
-  /*
-  connect(this, SIGNAL(bufferSelected(Buffer *)), view, SLOT(selectBuffer(Buffer *)));
-  connect(this, SIGNAL(bufferDestroyed(Buffer *)), view, SLOT(bufferDestroyed(Buffer *)));
-  connect(view, SIGNAL(bufferSelected(Buffer *)), this, SLOT(showBuffer(Buffer *)));
-  view->setBuffers(buffers.values());
-   */
+  netViews.append(dock);
+}
+
+void MainWin::connectedToCore() {
+  foreach(BufferId id, Client::allBufferIds()) {
+    emit requestBacklog(id, 100, -1);
+  }
+}
+
+void MainWin::disconnectedFromCore() {
+
 }
 
 AbstractUiMsg *MainWin::layoutMsg(const Message &msg) {
@@ -206,6 +191,7 @@ void MainWin::showBuffer(Buffer *b) {
   currentBuffer = b->bufferId().groupId();
   //emit bufferSelected(b);
   //qApp->processEvents();
+      
   ui.bufferWidget->setBuffer(b);
   //emit bufferSelected(b);
 }