Tuned the settings dialog a bit, mostly fixing the layout problems we had and adding

[quassel.git] / src / qtgui / mainwin.cpp

diff --git a/src/qtgui/mainwin.cpp b/src/qtgui/mainwin.cpp
index e6bb7c1..5b19614 100644 (file)
--- a/src/qtgui/mainwin.cpp
+++ b/src/qtgui/mainwin.cpp
@@ -117,10 +117,10 @@ void MainWin::setupViews() {
   connect(model, SIGNAL(bufferSelected(Buffer *)), this, SLOT(showBuffer(Buffer *)));
 
   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());
+  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());
   
   ui.menuViews->addSeparator();
 }
@@ -138,7 +138,7 @@ void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model,
   
   addDockWidget(Qt::LeftDockWidgetArea, dock);
   ui.menuViews->addAction(dock->toggleViewAction());
-  
+
   netViews.append(dock);
 }
 
@@ -149,7 +149,7 @@ void MainWin::connectedToCore() {
 
   ui.menuViews->setEnabled(true);
   ui.menuCore->setEnabled(true);
-  ui.actionDisconnectCore->setEnabled(false); // FIXME
+  ui.actionDisconnectCore->setEnabled(true);
   ui.actionNetworkList->setEnabled(true);
   ui.bufferWidget->show();
 }
@@ -160,7 +160,7 @@ void MainWin::disconnectedFromCore() {
   ui.actionDisconnectCore->setEnabled(false);
   ui.actionNetworkList->setEnabled(false);
   ui.bufferWidget->hide();
-  ui.actionConnectCore->setEnabled(false); // FIXME
+  ui.actionConnectCore->setEnabled(true);
   //qDebug() << "mainwin disconnected";
 }
 
@@ -179,7 +179,7 @@ void MainWin::showCoreConnectionDlg(bool autoConnect) {
 
 void MainWin::coreConnectionDlgFinished(int /*code*/) {
 
-  delete coreConnectDlg;
+  coreConnectDlg->close();
 }