X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=56f7d7e9f564f71e71167d3ea37aa19ea3c7227e;hp=38b07a22efc4ebda819c699b77bd7ad4ea8071a4;hb=2a04cb443a50e37165fc2d5447cc705a813efd3e;hpb=d28b9ec38b6ea0bc473200fc2f1e65abd1b56bd6

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 38b07a22..56f7d7e9 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -128,9 +128,8 @@ void MainWin::init() {
 
 
   // attach the BufferWidget to the PropertyMapper
-  Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, ui.bufferWidget, "currentBuffer");
-  connect(Client::networkModel(), SIGNAL(bufferAboutToBeRemoved(BufferId)),
-          ui.bufferWidget, SLOT(removeBuffer(BufferId)));
+  ui.bufferWidget->setModel(Client::bufferModel());
+  ui.bufferWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
 
   // attach the NickList to the PropertyMapper
   Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, nickListWidget, "currentBuffer");
@@ -172,16 +171,16 @@ void MainWin::setupMenus() {
 void MainWin::setupViews() {
   BufferModel *model = Client::bufferModel();
 
-  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();
 
   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);
@@ -198,9 +197,14 @@ void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model,
   ui.menuViews->addAction(dock->toggleViewAction());
 
   netViews.append(dock);
+  return dock;
 }
 
 void MainWin::setupSettingsDlg() {
+#ifdef SPUTDEV
+  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));
@@ -269,7 +273,6 @@ void MainWin::showDebugConsole() {
 void MainWin::closeEvent(QCloseEvent *event)
 {
   //if (userReallyWantsToQuit()) {
-    ui.bufferWidget->saveState();
     UiSettings s;
     s.setValue("MainWinSize", size());
     s.setValue("MainWinPos", pos());