Stopped Quassel from Segfaulting on 2nd+ connect to cores.
[quassel.git] / src / qtui / mainwin.cpp
index a45bfc1..2d980dc 100644 (file)
@@ -21,6 +21,7 @@
 
 #include "mainwin.h"
 
+#include "chatwidget.h"
 #include "bufferview.h"
 #include "chatline-old.h"
 #include "client.h"
@@ -28,7 +29,6 @@
 #include "networkmodel.h"
 #include "buffermodel.h"
 #include "nicklistwidget.h"
-#include "serverlist.h"
 #include "settingsdlg.h"
 #include "signalproxy.h"
 #include "topicwidget.h"
 MainWin::MainWin(QtUi *_gui, QWidget *parent) : QMainWindow(parent), gui(_gui) {
   ui.setupUi(this);
   setWindowTitle("Quassel IRC");
-  //setWindowTitle(QString::fromUtf8("Κυασελ Εγαρζη"));
   setWindowIcon(QIcon(":icons/quassel-icon.png"));
   setWindowIconText("Quassel IRC");
 
   statusBar()->showMessage(tr("Waiting for core..."));
-  serverListDlg = new ServerListDlg(this);
   settingsDlg = new SettingsDlg(this);
   debugConsole = new DebugConsole(this);
 }
 
 void MainWin::init() {
+  UiSettings s;
+  resize(s.value("MainWinSize").toSize());
+
   Client::signalProxy()->attachSignal(this, SIGNAL(requestBacklog(BufferInfo, QVariant, QVariant)));
-  Client::signalProxy()->attachSignal(this, SIGNAL(disconnectFromNetwork(NetworkId)));
+
+  connect(Client::instance(), SIGNAL(networkCreated(NetworkId)), this, SLOT(clientNetworkCreated(NetworkId)));
+  connect(Client::instance(), SIGNAL(networkRemoved(NetworkId)), this, SLOT(clientNetworkRemoved(NetworkId)));
   ui.bufferWidget->init();
 
   show();
 
-  //QVariantMap connInfo;
-  //connInfo["User"] = "Default";
-  //connInfo["Password"] = "password";
-  //connectToCore(connInfo);
-
   statusBar()->showMessage(tr("Not connected to core."));
-  systray = new QSystemTrayIcon(this);
-  systray->setIcon(QIcon(":/icons/quassel-icon.png"));
-  
-  QString toolTip("left click to minimize the quassel client to tray");
-  systray->setToolTip(toolTip);
-  
-  QMenu *systrayMenu = new QMenu();
-  systrayMenu->addAction(ui.actionAboutQuassel);
-  systrayMenu->addSeparator();
-  systrayMenu->addAction(ui.actionConnectCore);
-  systrayMenu->addAction(ui.actionDisconnectCore);
-  systrayMenu->addSeparator();
-  systrayMenu->addAction(ui.actionQuit);
-  
-  systray->setContextMenu(systrayMenu);
-  
-  systray->show();
-  connect(systray, SIGNAL(activated( QSystemTrayIcon::ActivationReason )), 
-          this, SLOT(systrayActivated( QSystemTrayIcon::ActivationReason )));
-
-  //setupSettingsDlg();
 
-  setupMenus();
-  setupViews();
-  setupSettingsDlg();
-
-  // create nick dock
-  nickDock = new QDockWidget(tr("Nicks"), this);
-  nickDock->setObjectName("NickDock");
-  nickDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
-
-  nickListWidget = new NickListWidget(nickDock);
-  nickDock->setWidget(nickListWidget);
-
-  addDockWidget(Qt::RightDockWidgetArea, nickDock);
-  ui.menuViews->addAction(nickDock->toggleViewAction());
-
-  // restore mainwin state
-  UiSettings s;
-  restoreState(s.value("MainWinState").toByteArray());
-
-  disconnectedFromCore();  // Disable menus and stuff
-  showCoreConnectionDlg(true); // autoconnect if appropriate
-  //ui.actionConnectCore->activate(QAction::Trigger);
-
-  if(serverListDlg->showOnStartup()) {
-    showServerList();
-  }
-  
   // DOCK OPTIONS
   setDockNestingEnabled(true);
 
   setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea);
   setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);
-
   setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea);
   setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);
 
-  // new Topic Stuff... should be probably refactored out into a separate method
-  VerticalDock *topicDock = new VerticalDock(tr("Topic"), this);
-  topicDock->setObjectName("TopicDock");
-  TopicWidget *topicwidget = new TopicWidget(topicDock);
-  topicDock->setWidget(topicwidget);
-
-  Client::bufferModel()->mapProperty(1, Qt::DisplayRole, topicwidget, "topic");
-
-  addDockWidget(Qt::TopDockWidgetArea, topicDock);
-
-  ui.menuViews->addAction(topicDock->toggleViewAction());
-
-  // NEW INPUT WIDGET -- damn init() needs a cleanup
-  VerticalDock *inputDock = new VerticalDock(tr("Inputline"), this);
-  inputDock->setObjectName("InputDock");
-  InputWidget *inputWidget = new InputWidget(inputDock);
-  inputDock->setWidget(inputWidget);
+  // setup stuff...
+  setupMenus();
+  setupViews();
+  setupNickWidget();
+  setupChatMonitor();
+  setupInputWidget();
+  setupTopicWidget();
+  setupSystray();
 
-  addDockWidget(Qt::BottomDockWidgetArea, inputDock);
+  setupSettingsDlg();
 
-  ui.menuViews->addAction(inputDock->toggleViewAction());
+  // restore mainwin state
+  restoreState(s.value("MainWinState").toByteArray());
 
-  inputWidget->setModel(Client::bufferModel());
-  inputWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
+  disconnectedFromCore();  // Disable menus and stuff
+  showCoreConnectionDlg(true); // autoconnect if appropriate
 
-  ui.bufferWidget->setFocusProxy(inputWidget);
-  
   // attach the BufferWidget to the PropertyMapper
   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");
-  
-  
 #ifdef SPUTDEV
   showSettingsDlg();
 #endif
@@ -171,32 +106,20 @@ void MainWin::init() {
 }
 
 MainWin::~MainWin() {
-  //typedef QHash<QString, Buffer*> BufHash;
-  //foreach(BufHash h, buffers.values()) {
-  //  foreach(Buffer *b, h.values()) {
-  //    delete b;
-  //  }
-  //}
-  //foreach(Buffer *buf, buffers.values()) delete buf;
-}
-
-/* This is implemented in settingspages.cpp */
-/*
-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.actionNetworkList, SIGNAL(triggered()), this, SLOT(showServerList()));
   connect(ui.actionSettingsDlg, SIGNAL(triggered()), this, SLOT(showSettingsDlg()));
   connect(ui.actionDebug_Console, SIGNAL(triggered()), this, SLOT(showDebugConsole()));
-  connect(ui.actionDisconnectNet, SIGNAL(triggered()), this, SLOT(disconnectFromNet()));
   connect(ui.actionAboutQt, SIGNAL(triggered()), QApplication::instance(), SLOT(aboutQt()));
 
+  actionEditNetworks = new QAction(QIcon(":/22x22/actions/configure"), tr("Edit &Networks..."), this);
+  actionEditNetworks->setEnabled(false); // FIXME
+  ui.menuNetworks->addAction(actionEditNetworks);
 }
 
 void MainWin::setupViews() {
@@ -235,12 +158,107 @@ void MainWin::setupSettingsDlg() {
 
   settingsDlg->registerSettingsPage(new FontsSettingsPage(settingsDlg));
   settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg));
-#ifdef SPUTDEV
   settingsDlg->registerSettingsPage(new NetworksSettingsPage(settingsDlg));
+
+#ifdef SPUTDEV
   connect(settingsDlg, SIGNAL(finished(int)), QApplication::instance(), SLOT(quit()));  // FIXME
 #endif
 }
 
+void MainWin::setupNickWidget() {
+  // create nick dock
+  nickDock = new QDockWidget(tr("Nicks"), this);
+  nickDock->setObjectName("NickDock");
+  nickDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
+
+  nickListWidget = new NickListWidget(nickDock);
+  nickDock->setWidget(nickListWidget);
+
+  addDockWidget(Qt::RightDockWidgetArea, nickDock);
+  ui.menuViews->addAction(nickDock->toggleViewAction());
+
+  Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, nickListWidget, "currentBuffer");
+}
+
+void MainWin::setupChatMonitor() {
+  VerticalDock *dock = new VerticalDock(tr("Chat Monitor"), this);
+  dock->setObjectName("ChatMonitorDock");
+
+  ChatWidget *chatWidget = new ChatWidget(this);
+  chatWidget->show();
+  dock->setWidget(chatWidget);
+  dock->show();
+
+  Buffer *buf = Client::monitorBuffer();
+  if(!buf)
+    return;
+
+  chatWidget->init(BufferId(0));
+  QList<ChatLine *> lines;
+  QList<AbstractUiMsg *> msgs = buf->contents();
+  foreach(AbstractUiMsg *msg, msgs) {
+    lines.append(dynamic_cast<ChatLine*>(msg));
+  }
+  chatWidget->setContents(lines);
+  connect(buf, SIGNAL(msgAppended(AbstractUiMsg *)), chatWidget, SLOT(appendMsg(AbstractUiMsg *)));
+  connect(buf, SIGNAL(msgPrepended(AbstractUiMsg *)), chatWidget, SLOT(prependMsg(AbstractUiMsg *)));
+
+  addDockWidget(Qt::TopDockWidgetArea, dock, Qt::Vertical);
+  ui.menuViews->addAction(dock->toggleViewAction());
+}
+
+void MainWin::setupInputWidget() {
+  VerticalDock *dock = new VerticalDock(tr("Inputline"), this);
+  dock->setObjectName("InputDock");
+
+  InputWidget *inputWidget = new InputWidget(dock);
+  dock->setWidget(inputWidget);
+
+  addDockWidget(Qt::BottomDockWidgetArea, dock);
+
+  ui.menuViews->addAction(dock->toggleViewAction());
+
+  inputWidget->setModel(Client::bufferModel());
+  inputWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
+
+  ui.bufferWidget->setFocusProxy(inputWidget);
+}
+
+void MainWin::setupTopicWidget() {
+  VerticalDock *dock = new VerticalDock(tr("Topic"), this);
+  dock->setObjectName("TopicDock");
+  TopicWidget *topicwidget = new TopicWidget(dock);
+  dock->setWidget(topicwidget);
+
+  Client::bufferModel()->mapProperty(1, Qt::DisplayRole, topicwidget, "topic");
+
+  addDockWidget(Qt::TopDockWidgetArea, dock);
+
+  ui.menuViews->addAction(dock->toggleViewAction());
+}
+
+void MainWin::setupSystray() {
+  systray = new QSystemTrayIcon(this);
+  systray->setIcon(QIcon(":/icons/quassel-icon.png"));
+
+  QString toolTip("left click to minimize the quassel client to tray");
+  systray->setToolTip(toolTip);
+
+  QMenu *systrayMenu = new QMenu(this);
+  systrayMenu->addAction(ui.actionAboutQuassel);
+  systrayMenu->addSeparator();
+  systrayMenu->addAction(ui.actionConnectCore);
+  systrayMenu->addAction(ui.actionDisconnectCore);
+  systrayMenu->addSeparator();
+  systrayMenu->addAction(ui.actionQuit);
+
+  systray->setContextMenu(systrayMenu);
+
+  systray->show();
+  connect(systray, SIGNAL(activated( QSystemTrayIcon::ActivationReason )),
+          this, SLOT(systrayActivated( QSystemTrayIcon::ActivationReason )));
+}
+
 void MainWin::connectedToCore() {
   foreach(BufferInfo id, Client::allBufferInfos()) {
     emit requestBacklog(id, 1000, -1);
@@ -250,7 +268,7 @@ void MainWin::connectedToCore() {
   ui.menuCore->setEnabled(true);
   ui.actionConnectCore->setEnabled(false);
   ui.actionDisconnectCore->setEnabled(true);
-  ui.actionNetworkList->setEnabled(true);
+  //ui.actionNetworkList->setEnabled(true);
   ui.bufferWidget->show();
   statusBar()->showMessage(tr("Connected to core."));
 }
@@ -259,7 +277,7 @@ void MainWin::disconnectedFromCore() {
   ui.menuViews->setEnabled(false);
   ui.menuCore->setEnabled(false);
   ui.actionDisconnectCore->setEnabled(false);
-  ui.actionNetworkList->setEnabled(false);
+  //ui.actionNetworkList->setEnabled(false);
   ui.bufferWidget->hide();
   ui.actionConnectCore->setEnabled(true);
   nickListWidget->reset();
@@ -274,9 +292,7 @@ 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();
+  coreConnectDlg->show();
 }
 
 void MainWin::coreConnectionDlgFinished(int /*code*/) {
@@ -284,15 +300,6 @@ void MainWin::coreConnectionDlgFinished(int /*code*/) {
   //exit(1);
 }
 
-
-void MainWin::showServerList() {
-//  if(!serverListDlg) {
-//    serverListDlg = new ServerListDlg(this);
-//  }
-  serverListDlg->show();
-  serverListDlg->raise();
-}
-
 void MainWin::showSettingsDlg() {
   settingsDlg->show();
 }
@@ -323,8 +330,65 @@ void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReas
   }
 }
 
-void MainWin::disconnectFromNet() {
-  int i = QInputDialog::getInteger(this, tr("Disconnect from Network"), tr("Enter network id:"));
-  emit disconnectFromNetwork(NetworkId(i));
+void MainWin::clientNetworkCreated(NetworkId id) {
+  const Network *net = Client::network(id);
+  QAction *act = new QAction(net->networkName(), this);
+  act->setData(QVariant::fromValue<NetworkId>(id));
+  connect(net, SIGNAL(updatedRemotely()), this, SLOT(clientNetworkUpdated()));
+  connect(act, SIGNAL(triggered()), this, SLOT(connectOrDisconnectFromNet()));
+  bool inserted = false;
+  for(int i = 0; i < networkActions.count(); i++) {
+    if(net->networkName().localeAwareCompare(networkActions[i]->text()) < 0) {
+      networkActions.insert(i, act);
+      inserted = true;
+      break;
+    }
+  }
+  if(!inserted) networkActions.append(act);
+  ui.menuNetworks->clear();  // why the f*** isn't there a QMenu::insertAction()???
+  foreach(QAction *a, networkActions) ui.menuNetworks->addAction(a);
+  ui.menuNetworks->addSeparator();
+  ui.menuNetworks->addAction(actionEditNetworks);
 }
 
+void MainWin::clientNetworkUpdated() {
+  const Network *net = qobject_cast<const Network *>(sender());
+  if(!net) return;
+  foreach(QAction *a, networkActions) {
+    if(a->data().value<NetworkId>() == net->networkId()) {
+      a->setText(net->networkName());
+      if(net->connectionState() == Network::Initialized) {
+        a->setIcon(QIcon(":/16x16/actions/network-connect"));
+        a->setEnabled(true);
+      } else if(net->connectionState() == Network::Disconnected) {
+        a->setIcon(QIcon(":/16x16/actions/network-disconnect"));
+        a->setEnabled(true);
+      } else {
+        a->setIcon(QIcon(":/16x16/actions/gear"));
+        a->setEnabled(false);
+      }
+      return;
+    }
+  }
+}
+
+void MainWin::clientNetworkRemoved(NetworkId id) {
+  QList<QAction *>::iterator actionIter = networkActions.begin();;
+  QAction *action;
+  while(actionIter != networkActions.end()) {
+    action = *actionIter;
+    if(action->data().value<NetworkId>() == id)
+      actionIter = networkActions.erase(actionIter);
+    else
+      actionIter++;
+  }
+}
+
+void MainWin::connectOrDisconnectFromNet() {
+  QAction *act = qobject_cast<QAction *>(sender());
+  if(!act) return;
+  const Network *net = Client::network(act->data().value<NetworkId>());
+  if(!net) return;
+  if(net->connectionState() == Network::Disconnected) net->requestConnect();
+  else net->requestDisconnect();
+}