X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtopia%2Ftopicbar.cpp;h=724817fa04fc1a7a6c2e6b27c8dbe6bee4db07f0;hp=d8d9f45ad5464dbb096c6a94f29e3e21a3e4285a;hb=e561e02a8d2f1f009559d17c7b1c66cb6f4e2a5a;hpb=6c6daea183c3a013a91fb8e9f250f6dece3023f8

diff --git a/src/qtopia/topicbar.cpp b/src/qtopia/topicbar.cpp
index d8d9f45a..724817fa 100644
--- a/src/qtopia/topicbar.cpp
+++ b/src/qtopia/topicbar.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel IRC Development Team             *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -18,10 +18,11 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "topicbar.h"
-
 #include <QtGui>
 
+#include "topicbar.h"
+#include "client.h"
+
 
 TopicBar::TopicBar(QWidget *parent) : QPushButton(parent) {
   setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
@@ -38,9 +39,17 @@ TopicBar::TopicBar(QWidget *parent) : QPushButton(parent) {
   fillText = " *** ";
   oneshot = true;
   timer = new QTimer(this);
-  timer->setInterval(20);
+  timer->setInterval(25);
   connect(timer, SIGNAL(timeout()), this, SLOT(updateOffset()));
   connect(this, SIGNAL(clicked()), this, SLOT(startScrolling()));
+
+  _model = Client::bufferModel();
+  connect(_model, SIGNAL(dataChanged(QModelIndex, QModelIndex)),
+          this, SLOT(dataChanged(QModelIndex, QModelIndex)));
+
+  _selectionModel = Client::bufferModel()->standardSelectionModel();
+  connect(_selectionModel, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
+          this, SLOT(currentChanged(QModelIndex, QModelIndex)));
 }
 
 TopicBar::~TopicBar() {
@@ -48,6 +57,18 @@ TopicBar::~TopicBar() {
 
 }
 
+void TopicBar::currentChanged(const QModelIndex &current, const QModelIndex &previous) {
+  Q_UNUSED(previous);
+  setContents(current.sibling(current.row(), 1).data().toString());
+}
+
+void TopicBar::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
+  QItemSelectionRange changedArea(topLeft, bottomRight);
+  QModelIndex currentTopicIndex = _selectionModel->currentIndex().sibling(_selectionModel->currentIndex().row(), 1);
+  if(changedArea.contains(currentTopicIndex))
+    setContents(currentTopicIndex.data().toString());
+};
+
 void TopicBar::resizeEvent(QResizeEvent *event) {
   QPushButton::resizeEvent(event);
   calcTextMetrics();
@@ -67,7 +88,7 @@ void TopicBar::calcTextMetrics() {
     secondTextStart = fillTextStart + boundingRect.width();
     displayText = QString("%1%2%1").arg(text).arg(fillText);
     offset = 0;
-    timer->start();
+    //timer->start();  // uncomment this to get autoscroll rather than on-demand
   }
 }
 
@@ -88,7 +109,7 @@ void TopicBar::paintEvent(QPaintEvent *event) {
 }
 
 void TopicBar::updateOffset() {
-  offset++;
+  offset+=1;
   if(offset >= secondTextStart) {
     offset = 0;
     if(oneshot) timer->stop(); // only scroll once!
@@ -98,7 +119,7 @@ void TopicBar::updateOffset() {
 
 void TopicBar::startScrolling() {
   if(displayText.length() > text.length()) {
-    oneshot = false;
+    //oneshot = false;
     timer->start();
   }
 }