Merging r774:778 from trunk into branches/0.3. Forwardporting hopefully the last...

diff --git a/src/client/buffermodel.cpp b/src/client/buffermodel.cpp
index 3dfdc6d..b67a447 100644 (file)
--- a/src/client/buffermodel.cpp
+++ b/src/client/buffermodel.cpp
@@ -30,6 +30,10 @@ BufferModel::BufferModel(NetworkModel *parent)
     _selectionModelSynchronizer(this)
 {
   setSourceModel(parent);
     _selectionModelSynchronizer(this)
 {
   setSourceModel(parent);

+  if(QCoreApplication::instance()->arguments().contains("--debugbufferswitches")) {
+    connect(_selectionModelSynchronizer.selectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
+           this, SLOT(debug_currentChanged(const QModelIndex &, const QModelIndex &)));
+  }

 }
 
 bool BufferModel::filterAcceptsRow(int sourceRow, const QModelIndex &parent) const {
 }
 
 bool BufferModel::filterAcceptsRow(int sourceRow, const QModelIndex &parent) const {


@@ -60,14 +64,11 @@ QModelIndex BufferModel::currentIndex() {
 }
 
 void BufferModel::setCurrentIndex(const QModelIndex &newCurrent) {
 }
 
 void BufferModel::setCurrentIndex(const QModelIndex &newCurrent) {

-  _selectionModelSynchronizer.selectionModel()->setCurrentIndex(newCurrent, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
-  _selectionModelSynchronizer.selectionModel()->select(newCurrent, QItemSelectionModel::Current);
+  _selectionModelSynchronizer.selectionModel()->setCurrentIndex(newCurrent, QItemSelectionModel::Current);
+  _selectionModelSynchronizer.selectionModel()->select(newCurrent, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);

 }
 
 void BufferModel::debug_currentChanged(QModelIndex current, QModelIndex previous) {
 }
 
 void BufferModel::debug_currentChanged(QModelIndex current, QModelIndex previous) {

-  qDebug() << "New current:" << current << "(previous:" << previous << ")";
-}
-
-void BufferModel::debug_selectionChanged(QItemSelection current , QItemSelection previous) {
-  qDebug() << "new selection:" << current << "(previoius:" << previous << ")";
+  Q_UNUSED(previous);
+  qDebug() << "Switched current Buffer: " << current << current.data().toString() << "Buffer:" << current.data(NetworkModel::BufferIdRole).value<BufferId>();

 }
 }

diff --git a/src/client/buffermodel.h b/src/client/buffermodel.h
index 3126f73..7bd3fc9 100644 (file)
--- a/src/client/buffermodel.h
+++ b/src/client/buffermodel.h
@@ -50,7 +50,6 @@ public:
 
 private slots:
   void debug_currentChanged(QModelIndex current, QModelIndex previous);
 
 private slots:
   void debug_currentChanged(QModelIndex current, QModelIndex previous);

-  void debug_selectionChanged(QItemSelection current , QItemSelection previous);

     
 private:
   SelectionModelSynchronizer _selectionModelSynchronizer;
     
 private:
   SelectionModelSynchronizer _selectionModelSynchronizer;

diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp
index 9a91980..6fc0c25 100644 (file)
--- a/src/client/treemodel.cpp
+++ b/src/client/treemodel.cpp
@@ -399,9 +399,6 @@ QVariant TreeModel::data(const QModelIndex &index, int role) const {
     return QVariant();
 
   AbstractTreeItem *item = static_cast<AbstractTreeItem *>(index.internalPointer());
     return QVariant();
 
   AbstractTreeItem *item = static_cast<AbstractTreeItem *>(index.internalPointer());

-  if(role == Qt::DisplayRole && !item->data(index.column(), role).isValid()) {
-    qDebug() << item->data(0, role) << item->columnCount();
-  }

   return item->data(index.column(), role);
 }
 
   return item->data(index.column(), role);
 }
 

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index 48e75ba..49d2ae7 100644 (file)
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -20,9 +20,11 @@
 
 #include "bufferview.h"
 
 
 #include "bufferview.h"
 

+#include "buffermodel.h"

 #include "bufferviewfilter.h"
 #include "buffersyncer.h"
 #include "client.h"
 #include "bufferviewfilter.h"
 #include "buffersyncer.h"
 #include "client.h"

+#include "mappedselectionmodel.h"

 #include "network.h"
 #include "networkmodel.h"
 
 #include "network.h"
 #include "networkmodel.h"
 


@@ -78,11 +80,12 @@ void BufferView::init() {
 
 void BufferView::setModel(QAbstractItemModel *model) {
   delete selectionModel();
 
 void BufferView::setModel(QAbstractItemModel *model) {
   delete selectionModel();

+  if(QTreeView::model()) {
+    disconnect(QTreeView::model(), SIGNAL(layoutChanged()), this, SLOT(updateSelection()));
+  }
+  

   QTreeView::setModel(model);
   init();
   QTreeView::setModel(model);
   init();

-  if(!model)
-    return;
-

   // remove old Actions
   QList<QAction *> oldactions = header()->actions();
   foreach(QAction *action, oldactions) {
   // remove old Actions
   QList<QAction *> oldactions = header()->actions();
   foreach(QAction *action, oldactions) {


@@ -90,6 +93,11 @@ void BufferView::setModel(QAbstractItemModel *model) {
     action->deleteLater();
   }
 
     action->deleteLater();
   }
 

+  if(!model)
+    return;
+
+  connect(model, SIGNAL(layoutChanged()), this, SLOT(updateSelection()));
+  

   QString sectionName;
   QAction *showSection;
   for(int i = 1; i < model->columnCount(); i++) {
   QString sectionName;
   QAction *showSection;
   for(int i = 1; i < model->columnCount(); i++) {


@@ -182,14 +190,25 @@ void BufferView::keyPressEvent(QKeyEvent *event) {
 // ensure that newly inserted network nodes are expanded per default
 void BufferView::rowsInserted(const QModelIndex & parent, int start, int end) {
   QTreeView::rowsInserted(parent, start, end);
 // ensure that newly inserted network nodes are expanded per default
 void BufferView::rowsInserted(const QModelIndex & parent, int start, int end) {
   QTreeView::rowsInserted(parent, start, end);

-  if(model()->rowCount(parent) == 1 && parent.data(NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType
-     && (Global::SPUTDEV || parent.data(NetworkModel::ItemActiveRole) == true)) {
+  if(parent.data(NetworkModel::ItemTypeRole) != NetworkModel::NetworkItemType)
+    return;
+  
+  if(model()->rowCount(parent) == 1 && parent.data(NetworkModel::ItemActiveRole) == true) {

     // without updating the parent the expand will have no effect... Qt Bug?
     update(parent);
     expand(parent);
   }
 }
 
     // without updating the parent the expand will have no effect... Qt Bug?
     update(parent);
     expand(parent);
   }
 }
 

+void BufferView::updateSelection() {
+  MappedSelectionModel *mappedSelectionModel = qobject_cast<MappedSelectionModel *>(selectionModel());
+  if(!config())
+    return;
+
+  mappedSelectionModel->mappedSetCurrentIndex(Client::bufferModel()->standardSelectionModel()->currentIndex(), QItemSelectionModel::Current);
+  mappedSelectionModel->mappedSelect(Client::bufferModel()->standardSelectionModel()->selection(), QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
+}
+

 void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
   QTreeView::dataChanged(topLeft, bottomRight);
   
 void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
   QTreeView::dataChanged(topLeft, bottomRight);
   

diff --git a/src/uisupport/bufferview.h b/src/uisupport/bufferview.h
index 0f1b502..6485fa5 100644 (file)
--- a/src/uisupport/bufferview.h
+++ b/src/uisupport/bufferview.h
@@ -45,7 +45,7 @@ public:
 
   void setConfig(BufferViewConfig *config);
   inline BufferViewConfig *config() { return _config; }
 
   void setConfig(BufferViewConfig *config);
   inline BufferViewConfig *config() { return _config; }

-
+                                                              

 public slots:
   void setRootIndexForNetworkId(const NetworkId &networkId);
   
 public slots:
   void setRootIndexForNetworkId(const NetworkId &networkId);
   


@@ -58,11 +58,13 @@ protected:
   virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
   virtual void wheelEvent(QWheelEvent *);
   virtual QSize sizeHint() const;
   virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
   virtual void wheelEvent(QWheelEvent *);
   virtual QSize sizeHint() const;

+  virtual void focusInEvent(QFocusEvent *event) { QAbstractScrollArea::focusInEvent(event); }

 
 private slots:
   void joinChannel(const QModelIndex &index);
   void toggleHeader(bool checked);
   void showContextMenu(const QPoint &);
 
 private slots:
   void joinChannel(const QModelIndex &index);
   void toggleHeader(bool checked);
   void showContextMenu(const QPoint &);

+  void updateSelection();

 
 private:
   QPointer<BufferViewConfig> _config;
 
 private:
   QPointer<BufferViewConfig> _config;

diff --git a/version.inc b/version.inc
index 03281a3..021ed4a 100644 (file)
--- a/version.inc
+++ b/version.inc
@@ -4,8 +4,8 @@
 { using namespace Global;
 
   quasselVersion = "0.2.0-beta1-pre";
 { using namespace Global;
 
   quasselVersion = "0.2.0-beta1-pre";

-  quasselDate = "2008-04-16";
-  quasselBuild = 756;
+  quasselDate = "2008-04-18";
+  quasselBuild = 777;

 
   //! Minimum client build number the core needs
   clientBuildNeeded = 731;
 
   //! Minimum client build number the core needs
   clientBuildNeeded = 731;