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

diff --git a/src/qtgui/mainwin.cpp b/src/qtgui/mainwin.cpp
index 0824c811..ef96c2a0 100644
--- a/src/qtgui/mainwin.cpp
+++ b/src/qtgui/mainwin.cpp
@@ -23,11 +23,12 @@
 #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);
@@ -41,12 +42,13 @@ 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;
+  //QVariantMap connInfo;
   //connInfo["User"] = "Default";
   //connInfo["Password"] = "password";
   //connectToCore(connInfo);
@@ -59,7 +61,7 @@ void MainWin::init() {
   serverListDlg = new ServerListDlg(this);
   serverListDlg->setVisible(serverListDlg->showOnStartup());
 
-  setupSettingsDlg();
+  //setupSettingsDlg();
 
   setupMenus();
   setupViews();
@@ -104,11 +106,12 @@ 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()));
-  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() {