X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=7e7d61a71e7a8ed7c773427bd9b0447cda52b6f1;hp=47e44e53bb7bcce3fc90d5568c8646efe878af91;hb=e5ef65b239e9a128a5cf86e6eef9bce1fd098448;hpb=2e6dc76ae100a6b8e1b1661e422995f90083500e;ds=sidebyside

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 47e44e53..7e7d61a7 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -39,6 +39,7 @@
 
 #include "settingspages/fontssettingspage.h"
 #include "settingspages/identitiessettingspage.h"
+#include "settingspages/networkssettingspage.h"
 
 #include "debugconsole.h"
 
@@ -125,6 +126,17 @@ void MainWin::init() {
 
   ui.menuViews->addAction(dock->toggleViewAction());
 
+
+  // attach the BufferWidget to the PropertyMapper
+  Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, ui.bufferWidget, "currentBuffer");
+  Client::bufferModel()->mapProperty(0, NetworkModel::NetworkIdRole, ui.bufferWidget, "currentNetwork");
+  connect(Client::networkModel(), SIGNAL(bufferAboutToBeRemoved(BufferId)),
+          ui.bufferWidget, SLOT(removeBuffer(BufferId)));
+
+  // attach the NickList to the PropertyMapper
+  Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, nickListWidget, "currentBuffer");
+  
+  
 #ifdef SPUTDEV
   showSettingsDlg();
 #endif
@@ -159,54 +171,45 @@ void MainWin::setupMenus() {
 }
 
 void MainWin::setupViews() {
-  
   BufferModel *model = Client::bufferModel();
-  connect(model, SIGNAL(bufferSelected(Buffer *)), this, SLOT(showBuffer(Buffer *)));
 
-  addBufferView(tr("All Buffers"), model, BufferViewFilter::AllNets, QList<uint>());
-  addBufferView(tr("All Channels"), model, BufferViewFilter::AllNets|BufferViewFilter::NoQueries|BufferViewFilter::NoServers, QList<uint>());
-  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>());
+  addBufferView(tr("All Buffers"), model, BufferViewFilter::AllNets, QList<NetworkId>());
+  addBufferView(tr("All Channels"), model, BufferViewFilter::AllNets|BufferViewFilter::NoQueries|BufferViewFilter::NoServers, QList<NetworkId>());
+  addBufferView(tr("All Queries"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoServers, QList<NetworkId>())->hide();
+  addBufferView(tr("All Networks"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries, QList<NetworkId>())->hide();
+  addBufferView(tr("Full Custom"), model, BufferViewFilter::FullCustom, QList<NetworkId>())->hide();
 
-//   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();
 }
 
-void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model, const BufferViewFilter::Modes &mode, const QList<uint> &nets) {
+QDockWidget *MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model, const BufferViewFilter::Modes &mode, const QList<NetworkId> &nets) {
   QDockWidget *dock = new QDockWidget(viewname, this);
   dock->setObjectName(QString("ViewDock-" + viewname)); // should be unique for mainwindow state!
   dock->setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea);
-  //dock->setContentsMargins(4,4,4,4);
 
   //create the view and initialize it's filter
   BufferView *view = new BufferView(dock);
+  view->show();
   view->setFilteredModel(model, mode, nets);
   Client::bufferModel()->synchronizeView(view);
   dock->setWidget(view);
+  dock->show();
 
   addDockWidget(Qt::LeftDockWidgetArea, dock);
   ui.menuViews->addAction(dock->toggleViewAction());
 
   netViews.append(dock);
+  return dock;
 }
 
 void MainWin::setupSettingsDlg() {
-  settingsDlg->registerSettingsPage(new FontsSettingsPage(settingsDlg));
 #ifdef SPUTDEV
-  settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg));
+  connect(settingsDlg, SIGNAL(finished(int)), QApplication::instance(), SLOT(quit()));  // FIXME
 #endif
+
+  settingsDlg->registerSettingsPage(new FontsSettingsPage(settingsDlg));
+  settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg));
+  settingsDlg->registerSettingsPage(new NetworksSettingsPage(settingsDlg));
 }
 
 void MainWin::connectedToCore() {
@@ -242,14 +245,14 @@ void MainWin::showCoreConnectionDlg(bool autoConnect) {
   coreConnectDlg = new CoreConnectDlg(this, autoConnect);
   connect(coreConnectDlg, SIGNAL(finished(int)), this, SLOT(coreConnectionDlgFinished(int)));
   coreConnectDlg->setModal(true);
-  if(!autoConnect || !coreConnectDlg->willDoInternalAutoConnect())
+  //if(!autoConnect || !coreConnectDlg->willDoInternalAutoConnect())
     coreConnectDlg->show(); // avoid flicker and show dlg only if we do remote connect, which needs a progress bar
-  if(autoConnect) coreConnectDlg->doAutoConnect();
+  //if(autoConnect) coreConnectDlg->doAutoConnect();
 }
 
 void MainWin::coreConnectionDlgFinished(int /*code*/) {
-
   coreConnectDlg->close();
+  //exit(1);
 }
 
 
@@ -284,17 +287,3 @@ void MainWin::closeEvent(QCloseEvent *event)
   //}
 }
 
-void MainWin::showBuffer(BufferInfo id) {
-  showBuffer(Client::buffer(id));
-}
-
-void MainWin::showBuffer(Buffer *b) {
-  currentBuffer = b->bufferInfo().groupId();
-  //emit bufferSelected(b);
-  //qApp->processEvents();
-  ui.bufferWidget->setBuffer(b);
-  nickListWidget->setBuffer(b);
-  //if(b->bufferType() == Buffer::ChannelType) nickDock->show();
-  //else nickDock->hide();
-  //emit bufferSelected(b);
-}