X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=0feeb63e8d0bcc304c259685c233808ff586f9a1;hp=d244dc856f4d34514f955a213743ae6e83fa9522;hb=2f05c5d7e94d5e96d2b4bae59140fd3b60a7a62f;hpb=cf28e7152c5d940aec586be1b29fbf8ddc99f087

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index d244dc85..0feeb63e 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -25,6 +25,7 @@
 #include "client.h"
 #include "coreconnectdlg.h"
 #include "networkmodel.h"
+#include "buffermodel.h"
 #include "nicklistwidget.h"
 #include "serverlist.h"
 #include "settingsdlg.h"
@@ -117,13 +118,15 @@ void MainWin::init() {
   TopicWidget *topicwidget = new TopicWidget(dock);
   dock->setWidget(topicwidget);
 
-  Client::networkModel()->mapProperty(1, Qt::DisplayRole, topicwidget, "topic");
+  Client::bufferModel()->mapProperty(1, Qt::DisplayRole, topicwidget, "topic");
 
   addDockWidget(Qt::TopDockWidgetArea, dock);
 
   ui.menuViews->addAction(dock->toggleViewAction());
 
-  //showSettingsDlg();
+#ifdef SPUTDEV
+  showSettingsDlg();
+#endif
 
 }
 
@@ -157,7 +160,7 @@ void MainWin::setupMenus() {
 
 void MainWin::setupViews() {
   
-  NetworkModel *model = Client::networkModel();
+  BufferModel *model = Client::bufferModel();
   connect(model, SIGNAL(bufferSelected(Buffer *)), this, SLOT(showBuffer(Buffer *)));
 
   addBufferView(tr("All Buffers"), model, BufferViewFilter::AllNets, QList<uint>());
@@ -165,6 +168,18 @@ void MainWin::setupViews() {
   addBufferView(tr("All Queries"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoServers, QList<uint>());
   addBufferView(tr("All Networks"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries, QList<uint>());
   addBufferView(tr("Full Custom"), model, BufferViewFilter::FullCustom, QList<uint>());
+
+//   QDockWidget *dock = new QDockWidget("FILTERTEST", this);
+//   dock->setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea);
+//   BufferView *view = new BufferView(dock);
+//   view->setModel(Client::bufferModel());
+//   dock->setWidget(view);
+
+//   addDockWidget(Qt::LeftDockWidgetArea, dock);
+//   ui.menuViews->addAction(dock->toggleViewAction());
+
+//   netViews.append(dock);
+
   
   ui.menuViews->addSeparator();
 }
@@ -178,9 +193,9 @@ void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model,
   //create the view and initialize it's filter
   BufferView *view = new BufferView(dock);
   view->setFilteredModel(model, mode, nets);
-  Client::networkModel()->synchronizeView(view);
+  Client::bufferModel()->synchronizeView(view);
   dock->setWidget(view);
-  
+
   addDockWidget(Qt::LeftDockWidgetArea, dock);
   ui.menuViews->addAction(dock->toggleViewAction());
 
@@ -189,8 +204,9 @@ void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model,
 
 void MainWin::setupSettingsDlg() {
   settingsDlg->registerSettingsPage(new FontsSettingsPage(settingsDlg));
+#ifdef SPUTDEV
   settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg));
-
+#endif
 }
 
 void MainWin::connectedToCore() {