Started to reorganize the Buffer{Model|View|Filter}. Mostly cleanup at the moment.

[quassel.git] / src / qtui / bufferview.cpp

diff --git a/src/qtui/bufferview.cpp b/src/qtui/bufferview.cpp
index 17f637b..c57737f 100644 (file)
--- a/src/qtui/bufferview.cpp
+++ b/src/qtui/bufferview.cpp
@@ -18,7 +18,9 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include "client.h"
 #include "bufferview.h"
+#include "buffertreemodel.h"
 
 /*****************************************
 * The TreeView showing the Buffers
@@ -46,15 +48,13 @@ void BufferView::init() {
   connect(selectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
           model(), SLOT(changeCurrent(const QModelIndex &, const QModelIndex &)));
   
-  connect(this, SIGNAL(doubleClicked(const QModelIndex &)),
-          model(), SLOT(doubleClickReceived(const QModelIndex &)));
-  
   connect(model(), SIGNAL(selectionChanged(const QModelIndex &)),
           this, SLOT(select(const QModelIndex &)));
   
   connect(this, SIGNAL(selectionChanged(const QModelIndex &, QItemSelectionModel::SelectionFlags)),
           selectionModel(), SLOT(select(const QModelIndex &, QItemSelectionModel::SelectionFlags)));
 
+  connect(this, SIGNAL(activated(QModelIndex)), this, SLOT(joinChannel(QModelIndex)));
 }
 
 void BufferView::setFilteredModel(QAbstractItemModel *model, BufferViewFilter::Modes mode, QStringList nets) {
@@ -83,6 +83,15 @@ void BufferView::dropEvent(QDropEvent *event) {
   QTreeView::dropEvent(event);    
 }
 
+void BufferView::joinChannel(const QModelIndex &index) {
+  Buffer::Type bufferType = (Buffer::Type)index.data(BufferTreeModel::BufferTypeRole).toInt();
+
+  if(bufferType != Buffer::ChannelBuffer)
+    return;
+  
+  Client::fakeInput(index.data(BufferTreeModel::BufferUidRole).toUInt(), QString("/JOIN %1").arg(index.sibling(index.row(), 0).data().toString()));
+}
+
 void BufferView::keyPressEvent(QKeyEvent *event) {
   if(event->key() == Qt::Key_Backspace || event->key() == Qt::Key_Delete) {
     event->accept();
@@ -96,7 +105,10 @@ 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) {
-  if(parent == QModelIndex())
-    setExpanded(model()->index(start, 0, parent), true);
   QTreeView::rowsInserted(parent, start, end);
+  if(model()->rowCount(parent) == 1 && parent != QModelIndex()) {
+    // without updating the parent the expand will have no effect... Qt Bug?
+    update(parent); 
+    expand(parent);
+  }
 }