X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtgui%2Fmainwin.cpp;h=36b367598ac793785286e771d518ba95e370af4d;hp=74d626790895d2b227d5be3c6effc6a091a08934;hb=ec9528b2997470953e3c4e456271e696026e9717;hpb=869129b31cbc62bf88c685ab61d419a1815aedc7 diff --git a/src/qtgui/mainwin.cpp b/src/qtgui/mainwin.cpp index 74d62679..36b36759 100644 --- a/src/qtgui/mainwin.cpp +++ b/src/qtgui/mainwin.cpp @@ -23,16 +23,16 @@ #include "bufferview.h" #include "chatline.h" #include "client.h" -#include "clientproxy.h" #include "coreconnectdlg.h" #include "serverlist.h" #include "settingsdlg.h" //#include "settingspage.h" +#include "signalproxy.h" MainWin::MainWin(QtGui *_gui, QWidget *parent) : QMainWindow(parent), gui(_gui) { ui.setupUi(this); - //setWindowTitle("Quassel IRC"); - setWindowTitle(QString::fromUtf8("Κυασελ Εγαρζη")); + setWindowTitle("Quassel IRC"); + //setWindowTitle(QString::fromUtf8("Κυασελ Εγαρζη")); setWindowIcon(QIcon(":/qirc-icon.png")); setWindowIconText("Quassel IRC"); @@ -41,12 +41,12 @@ 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))); + 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); @@ -108,7 +108,7 @@ void MainWin::setupMenus() { 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())); + Client::signalProxy()->attachSignal(this, SIGNAL(importOldBacklog())); } void MainWin::setupViews() {