Trying to fix random segfault upon connect...

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

diff --git a/src/qtgui/mainwin.cpp b/src/qtgui/mainwin.cpp
index bb193cf..451e82a 100644 (file)
--- a/src/qtgui/mainwin.cpp
+++ b/src/qtgui/mainwin.cpp
@@ -18,55 +18,21 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <QtGui>
-#include <QtCore>
-#include <QSqlDatabase>
+#include "mainwin.h"
 
+#include "bufferview.h"
+#include "chatline.h"
 #include "client.h"
-#include "util.h"
-#include "global.h"
-#include "message.h"
 #include "clientproxy.h"
-
-#include "mainwin.h"
-#include "buffer.h"
-#include "chatline.h"
-#include "serverlist.h"
 #include "coreconnectdlg.h"
+#include "serverlist.h"
 #include "settingsdlg.h"
 #include "settingspages.h"
 
-QtGui::QtGui() : AbstractUi() {
-  mainWin = new MainWin(this);
-  connect(mainWin, SIGNAL(connectToCore(const VarMap &)), this, SIGNAL(connectToCore(const VarMap &)));
-  connect(mainWin, SIGNAL(disconnectFromCore()), this, SIGNAL(disconnectFromCore()));
-  
-}
-
-QtGui::~QtGui() {
-  delete mainWin;
-}
-
-void QtGui::init() {
-  mainWin->init();
-}
-
-AbstractUiMsg *QtGui::layoutMsg(const Message &msg) {
-  return mainWin->layoutMsg(msg);
-}
-
-void QtGui::connectedToCore() {
-  mainWin->connectedToCore();
-}
-
-void QtGui::disconnectedFromCore() {
-  mainWin->disconnectedFromCore();
-}
-
 MainWin::MainWin(QtGui *_gui, QWidget *parent) : QMainWindow(parent), gui(_gui) {
   ui.setupUi(this);
-  setWindowTitle("Quassel IRC");
-  //setWindowTitle("Κυασελ Εγαρζη");
+  //setWindowTitle("Quassel IRC");
+  setWindowTitle(QString::fromUtf8("Κυασελ Εγαρζη"));
   setWindowIcon(QIcon(":/qirc-icon.png"));
   setWindowIconText("Quassel IRC");
 
@@ -80,12 +46,12 @@ void MainWin::init() {
 
   show();
 
-  VarMap connInfo;
-  connInfo["User"] = "Default";
-  connInfo["Password"] = "password";
-  connectToCore(connInfo);
+  //VarMap connInfo;
+  //connInfo["User"] = "Default";
+  //connInfo["Password"] = "password";
+  //connectToCore(connInfo);
 
-  statusBar()->showMessage(tr("Ready."));
+  statusBar()->showMessage(tr("Not connected to core."));
   systray = new QSystemTrayIcon(this);
   systray->setIcon(QIcon(":/qirc-icon.png"));
   systray->show();
@@ -105,22 +71,14 @@ void MainWin::init() {
   if(s.contains("MainWinState")) restoreState(s.value("MainWinState").toByteArray());
   s.endGroup();
 
-  s.beginGroup("Buffers");
-  QString net = s.value("CurrentNetwork", "").toString();
-  QString buf = s.value("CurrentBuffer", "").toString();
-  s.endGroup();
-  /*
-  if(!net.isEmpty()) {
-    if(buffers.contains(net)) {
-      if(buffers[net].contains(buf)) {
-        showBuffer(net, buf);
-      } else {
-        showBuffer(net, "");
-      }
-    }
-  }
-  */
+  //s.beginGroup("Buffers");
+  //QString net = s.value("CurrentNetwork", "").toString();
+  //QString buf = s.value("CurrentBuffer", "").toString();
+  //s.endGroup();
 
+  disconnectedFromCore();  // Disable menus and stuff
+  showCoreConnectionDlg(true); // autoconnect if appropriate
+  //ui.actionConnectCore->activate(QAction::Trigger);
 }
 
 MainWin::~MainWin() {
@@ -141,6 +99,8 @@ void MainWin::setupSettingsDlg() {
 */
 
 void MainWin::setupMenus() {
+  connect(ui.actionConnectCore, SIGNAL(triggered()), this, SLOT(showCoreConnectionDlg()));
+  connect(ui.actionDisconnectCore, SIGNAL(triggered()), Client::instance(), SLOT(disconnectFromCore()));
   connect(ui.actionNetworkList, SIGNAL(triggered()), this, SLOT(showServerList()));
   connect(ui.actionEditIdentities, SIGNAL(triggered()), serverListDlg, SLOT(editIdentities()));
   connect(ui.actionSettingsDlg, SIGNAL(triggered()), this, SLOT(showSettingsDlg()));
@@ -155,12 +115,12 @@ void MainWin::setupViews() {
   
   BufferTreeModel *model = Client::bufferModel();
   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();
 }
@@ -178,7 +138,7 @@ void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model,
   
   addDockWidget(Qt::LeftDockWidgetArea, dock);
   ui.menuViews->addAction(dock->toggleViewAction());
-  
+
   netViews.append(dock);
 }
 
@@ -186,16 +146,43 @@ void MainWin::connectedToCore() {
   foreach(BufferId id, Client::allBufferIds()) {
     emit requestBacklog(id, 100, -1);
   }
+
+  ui.menuViews->setEnabled(true);
+  ui.menuCore->setEnabled(true);
+  ui.actionDisconnectCore->setEnabled(true);
+  ui.actionNetworkList->setEnabled(true);
+  ui.bufferWidget->show();
 }
 
 void MainWin::disconnectedFromCore() {
-
+  ui.menuViews->setEnabled(false);
+  ui.menuCore->setEnabled(false);
+  ui.actionDisconnectCore->setEnabled(false);
+  ui.actionNetworkList->setEnabled(false);
+  ui.bufferWidget->hide();
+  ui.actionConnectCore->setEnabled(true);
+  //qDebug() << "mainwin disconnected";
 }
 
 AbstractUiMsg *MainWin::layoutMsg(const Message &msg) {
   return new ChatLine(msg);
 }
 
+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())
+    coreConnectDlg->show(); // avoid flicker and show dlg only if we do remote connect, which needs a progress bar
+  if(autoConnect) coreConnectDlg->doAutoConnect();
+}
+
+void MainWin::coreConnectionDlgFinished(int /*code*/) {
+
+  coreConnectDlg->close();
+}
+
+
 void MainWin::showServerList() {
 //  if(!serverListDlg) {
 //    serverListDlg = new ServerListDlg(this);