X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fmainwin.cpp;h=d916771ac062072497911aec5793149a04391892;hb=8ec76e512d20ce5d1dc76de556bb98a06b75d695;hp=e88a86db866cc472edea585ae8ef03a2c81c8d58;hpb=eb9c5e7ed502b6f01311ecb5d3066a3ac31ec24d;p=quassel.git

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index e88a86db..d916771a 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -17,15 +17,15 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-//#define SPUTDEV
-
 #include "mainwin.h"
 
 #include "aboutdlg.h"
 #include "chatwidget.h"
 #include "bufferview.h"
+#include "chatline.h"
 #include "chatline-old.h"
 #include "client.h"
+#include "clientbacklogmanager.h"
 #include "coreconnectdlg.h"
 #include "networkmodel.h"
 #include "buffermodel.h"
@@ -51,6 +51,7 @@
 
 
 #include "debugconsole.h"
+#include "global.h"
 
 MainWin::MainWin(QtUi *_gui, QWidget *parent)
   : QMainWindow(parent),
@@ -70,7 +71,10 @@ MainWin::MainWin(QtUi *_gui, QWidget *parent)
 
 void MainWin::init() {
   QtUiSettings s;
-  resize(s.value("MainWinSize").toSize());
+  if(s.value("MainWinSize").isValid())
+    resize(s.value("MainWinSize").toSize());
+  else
+    resize(QSize(800, 500));
 
   Client::signalProxy()->attachSignal(this, SIGNAL(requestBacklog(BufferInfo, QVariant, QVariant)));
 
@@ -94,9 +98,9 @@ void MainWin::init() {
   setupMenus();
   setupViews();
   setupNickWidget();
+  setupTopicWidget();
   setupChatMonitor();
   setupInputWidget();
-  setupTopicWidget();
   setupSystray();
 
   
@@ -108,16 +112,16 @@ void MainWin::init() {
   disconnectedFromCore();  // Disable menus and stuff
   showCoreConnectionDlg(true); // autoconnect if appropriate
 
-  // attach the BufferWidget to the PropertyMapper
+  // attach the BufferWidget to the BufferModel and the default selection
   ui.bufferWidget->setModel(Client::bufferModel());
   ui.bufferWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
-
-#ifdef SPUTDEV
-  //showSettingsDlg();
-  //showAboutDlg();
-  showNetworkDlg();
-  exit(1);
-#endif
+  
+  if(Global::SPUTDEV) {
+    //showSettingsDlg();
+    //showAboutDlg();
+    //showNetworkDlg();
+    //exit(1);
+  }
 
 }
 
@@ -169,6 +173,7 @@ QDockWidget *MainWin::addBufferView(const QString &viewname, QAbstractItemModel
   dock->show();
 
   addDockWidget(Qt::LeftDockWidgetArea, dock);
+
   ui.menuViews->addAction(dock->toggleViewAction());
 
   netViews.append(dock);
@@ -184,11 +189,6 @@ void MainWin::setupSettingsDlg() {
   //Category: General
   settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg));
   settingsDlg->registerSettingsPage(new NetworksSettingsPage(settingsDlg));
-
-
-#ifdef SPUTDEV
-  connect(settingsDlg, SIGNAL(finished(int)), QApplication::instance(), SLOT(quit()));  // FIXME
-#endif
 }
 
 void MainWin::setupNickWidget() {
@@ -201,9 +201,12 @@ void MainWin::setupNickWidget() {
   nickDock->setWidget(nickListWidget);
 
   addDockWidget(Qt::RightDockWidgetArea, nickDock);
+
   ui.menuViews->addAction(nickDock->toggleViewAction());
 
-  Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, nickListWidget, "currentBuffer");
+  // attach the NickListWidget to the BufferModel and the default selection
+  nickListWidget->setModel(Client::bufferModel());
+  nickListWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
 }
 
 void MainWin::setupChatMonitor() {
@@ -220,10 +223,10 @@ void MainWin::setupChatMonitor() {
     return;
 
   chatWidget->init(BufferId(0));
-  QList<ChatLine *> lines;
+  QList<ChatLineOld *> lines;
   QList<AbstractUiMsg *> msgs = buf->contents();
   foreach(AbstractUiMsg *msg, msgs) {
-    lines.append(dynamic_cast<ChatLine*>(msg));
+    lines.append(dynamic_cast<ChatLineOld*>(msg));
   }
   chatWidget->setContents(lines);
   connect(buf, SIGNAL(msgAppended(AbstractUiMsg *)), chatWidget, SLOT(appendMsg(AbstractUiMsg *)));
@@ -258,7 +261,8 @@ void MainWin::setupTopicWidget() {
 
   dock->setWidget(topicwidget);
 
-  Client::bufferModel()->mapProperty(1, Qt::DisplayRole, topicwidget, "topic");
+  topicwidget->setModel(Client::bufferModel());
+  topicwidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
 
   addDockWidget(Qt::TopDockWidgetArea, dock);
 
@@ -285,11 +289,11 @@ void MainWin::setupSystray() {
   if(s.value("UseSystemTrayIcon", QVariant(true)).toBool()) {
     systray->show();
   }
-  
-  #ifndef Q_WS_MAC
+
+#ifndef Q_WS_MAC
   connect(systray, SIGNAL(activated( QSystemTrayIcon::ActivationReason )),
           this, SLOT(systrayActivated( QSystemTrayIcon::ActivationReason )));
-  #endif
+#endif
 
 }
 
@@ -315,7 +319,8 @@ void MainWin::changeTopic(const QString &topic) {
 
 void MainWin::connectedToCore() {
   foreach(BufferInfo id, Client::allBufferInfos()) {
-    emit requestBacklog(id, 1000, -1);
+    // emit requestBacklog(id, 1000, -1);
+    Client::backlogManager()->requestBacklog(id.bufferId(), 1000, -1);
   }
 
   ui.menuViews->setEnabled(true);
@@ -334,12 +339,13 @@ void MainWin::disconnectedFromCore() {
   //ui.actionNetworkList->setEnabled(false);
   ui.bufferWidget->hide();
   ui.actionConnectCore->setEnabled(true);
-  nickListWidget->reset();
+  // nickListWidget->reset();
   statusBar()->showMessage(tr("Not connected to core."));
 }
 
 AbstractUiMsg *MainWin::layoutMsg(const Message &msg) {
-  return new ChatLine(msg);
+  if(Global::SPUTDEV) return new ChatLine(msg);
+  return new ChatLineOld(msg);
 }
 
 void MainWin::showCoreConnectionDlg(bool autoConnect) {