Checking in current work on settings dialogs. We will move away from SettingsInterface

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

diff --git a/src/qtgui/mainwin.cpp b/src/qtgui/mainwin.cpp
index e6bb7c1..74d6267 100644 (file)
--- a/src/qtgui/mainwin.cpp
+++ b/src/qtgui/mainwin.cpp
@@ -27,7 +27,7 @@
 #include "coreconnectdlg.h"
 #include "serverlist.h"
 #include "settingsdlg.h"
-#include "settingspages.h"
+//#include "settingspage.h"
 
 MainWin::MainWin(QtGui *_gui, QWidget *parent) : QMainWindow(parent), gui(_gui) {
   ui.setupUi(this);
@@ -59,7 +59,7 @@ void MainWin::init() {
   serverListDlg = new ServerListDlg(this);
   serverListDlg->setVisible(serverListDlg->showOnStartup());
 
-  setupSettingsDlg();
+  //setupSettingsDlg();
 
   setupMenus();
   setupViews();
@@ -104,7 +104,7 @@ void MainWin::setupMenus() {
   connect(ui.actionNetworkList, SIGNAL(triggered()), this, SLOT(showServerList()));
   connect(ui.actionEditIdentities, SIGNAL(triggered()), serverListDlg, SLOT(editIdentities()));
   connect(ui.actionSettingsDlg, SIGNAL(triggered()), this, SLOT(showSettingsDlg()));
-  //ui.actionSettingsDlg->setEnabled(false);
+  ui.actionSettingsDlg->setEnabled(false);
   connect(ui.actionAboutQt, SIGNAL(triggered()), QApplication::instance(), SLOT(aboutQt()));
   // for debugging
   connect(ui.actionImportBacklog, SIGNAL(triggered()), this, SLOT(importBacklog()));
@@ -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,8 @@ void MainWin::connectedToCore() {
 
   ui.menuViews->setEnabled(true);
   ui.menuCore->setEnabled(true);
-  ui.actionDisconnectCore->setEnabled(false); // FIXME
+  ui.actionConnectCore->setEnabled(false);
+  ui.actionDisconnectCore->setEnabled(true);
   ui.actionNetworkList->setEnabled(true);
   ui.bufferWidget->show();
 }
@@ -160,7 +161,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 +180,7 @@ void MainWin::showCoreConnectionDlg(bool autoConnect) {
 
 void MainWin::coreConnectionDlgFinished(int /*code*/) {
 
-  delete coreConnectDlg;
+  coreConnectDlg->close();
 }