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

diff --git a/src/qtgui/mainwin.cpp b/src/qtgui/mainwin.cpp
index ef96c2a0..fc4f8ed8 100644
--- a/src/qtgui/mainwin.cpp
+++ b/src/qtgui/mainwin.cpp
@@ -23,17 +23,18 @@
 #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"
 
+#include "topicwidget.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");
 
@@ -42,8 +43,7 @@ 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)));
+  Client::signalProxy()->attachSignal(this, SIGNAL(requestBacklog(BufferInfo, QVariant, QVariant)));
   ui.bufferWidget->init();
 
   show();
@@ -58,9 +58,6 @@ void MainWin::init() {
   systray->setIcon(QIcon(":/qirc-icon.png"));
   systray->show();
 
-  serverListDlg = new ServerListDlg(this);
-  serverListDlg->setVisible(serverListDlg->showOnStartup());
-
   //setupSettingsDlg();
 
   setupMenus();
@@ -81,6 +78,29 @@ void MainWin::init() {
   disconnectedFromCore();  // Disable menus and stuff
   showCoreConnectionDlg(true); // autoconnect if appropriate
   //ui.actionConnectCore->activate(QAction::Trigger);
+
+  serverListDlg = new ServerListDlg(this);
+  if(serverListDlg->showOnStartup()) {
+    showServerList();
+  }
+
+  // TESTING
+//   setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea);
+//   setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);
+
+//   setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea);
+//   setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);
+  
+//   QDockWidget *dock = new QDockWidget("Topic Dock", this);
+//   dock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);
+
+//   TopicWidget *topicwidget = new TopicWidget(dock);
+//   dock->setWidget(topicwidget);
+  
+//   addDockWidget(Qt::TopDockWidgetArea, dock);
+
+//   ui.menuViews->addAction(dock->toggleViewAction());
+
 }
 
 MainWin::~MainWin() {
@@ -110,7 +130,6 @@ 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()));
 }
 
@@ -146,7 +165,7 @@ void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model,
 }
 
 void MainWin::connectedToCore() {
-  foreach(BufferId id, Client::allBufferIds()) {
+  foreach(BufferInfo id, Client::allBufferInfos()) {
     emit requestBacklog(id, 100, -1);
   }
 
@@ -220,12 +239,12 @@ void MainWin::closeEvent(QCloseEvent *event)
   //}
 }
 
-void MainWin::showBuffer(BufferId id) {
+void MainWin::showBuffer(BufferInfo id) {
   showBuffer(Client::buffer(id));
 }
 
 void MainWin::showBuffer(Buffer *b) {
-  currentBuffer = b->bufferId().groupId();
+  currentBuffer = b->bufferInfo().groupId();
   //emit bufferSelected(b);
   //qApp->processEvents();