X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtgui%2Fmainwin.cpp;h=ef96c2a04937da7174e34f29c385e214acba7bdb;hp=fedf028c2c49cc23b7a3f631cbc90427d140ee2a;hb=06a03c2c69ee934aaeec83512bae2fffee83a340;hpb=0ac9ce4d7cf768d13993d6aa1d6b791c4149a843

diff --git a/src/qtgui/mainwin.cpp b/src/qtgui/mainwin.cpp
index fedf028c..ef96c2a0 100644
--- a/src/qtgui/mainwin.cpp
+++ b/src/qtgui/mainwin.cpp
@@ -23,16 +23,17 @@
 #include "bufferview.h"
 #include "chatline.h"
 #include "client.h"
-#include "clientproxy.h"
+//#include "clientproxy.h"
 #include "coreconnectdlg.h"
 #include "serverlist.h"
 #include "settingsdlg.h"
-#include "settingspages.h"
+//#include "settingspage.h"
+#include "signalproxy.h"
 
 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");
 
@@ -41,17 +42,18 @@ MainWin::MainWin(QtGui *_gui, QWidget *parent) : QMainWindow(parent), gui(_gui)
 }
 
 void MainWin::init() {
-  connect(this, SIGNAL(requestBacklog(BufferId, QVariant, QVariant)), ClientProxy::instance(), SLOT(gsRequestBacklog(BufferId, QVariant, QVariant)));
+  //connect(this, SIGNAL(requestBacklog(BufferId, QVariant, QVariant)), ClientProxy::instance(), SLOT(gsRequestBacklog(BufferId, QVariant, QVariant)));
+  Client::signalProxy()->attachSignal(this, SIGNAL(requestBacklog(BufferId, QVariant, QVariant)));
   ui.bufferWidget->init();
 
   show();
 
-  VarMap connInfo;
-  connInfo["User"] = "Default";
-  connInfo["Password"] = "password";
-  connectToCore(connInfo);
+  //QVariantMap 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();
@@ -59,7 +61,7 @@ void MainWin::init() {
   serverListDlg = new ServerListDlg(this);
   serverListDlg->setVisible(serverListDlg->showOnStartup());
 
-  setupSettingsDlg();
+  //setupSettingsDlg();
 
   setupMenus();
   setupViews();
@@ -71,10 +73,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();
+  //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() {
@@ -95,21 +101,24 @@ 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()));
-  //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()));
-  connect(this, SIGNAL(importOldBacklog()), ClientProxy::instance(), SLOT(gsImportBacklog()));
+  //connect(this, SIGNAL(importOldBacklog()), ClientProxy::instance(), SLOT(gsImportBacklog()));
+  Client::signalProxy()->attachSignal(this, SIGNAL(importOldBacklog()));
 }
 
 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());
@@ -132,7 +141,7 @@ void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model,
   
   addDockWidget(Qt::LeftDockWidgetArea, dock);
   ui.menuViews->addAction(dock->toggleViewAction());
-  
+
   netViews.append(dock);
 }
 
@@ -140,16 +149,44 @@ void MainWin::connectedToCore() {
   foreach(BufferId id, Client::allBufferIds()) {
     emit requestBacklog(id, 100, -1);
   }
+
+  ui.menuViews->setEnabled(true);
+  ui.menuCore->setEnabled(true);
+  ui.actionConnectCore->setEnabled(false);
+  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);