X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=db28ae42edebe0f3164ffa2b551daeeb2bb88f8f;hp=2b2f00ddc3f7eac52bc2b3a6b8fa2e4b31e1c3e4;hb=08aac67d4dc813ed541a81d06fb83d9c4fec5834;hpb=2517c75cb456db066aec68f99eed6e42d12a827d

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index 2b2f00dd..db28ae42 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by the Quassel IRC 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  *
@@ -19,7 +19,6 @@
  ***************************************************************************/
 
 #include "client.h"
-#include "buffer.h"
 #include "bufferview.h"
 #include "networkmodel.h"
 
@@ -29,36 +28,13 @@
 // Please be carefull when reimplementing methods which are used to inform the view about changes to the data
 // to be on the safe side: call QTreeView's method aswell
 BufferView::BufferView(QWidget *parent) : QTreeView(parent) {
-  // dirty fast hack:
-  header()->setContextMenuPolicy(Qt::ActionsContextMenu);
-
-  QAction *showBufferAct = new QAction(tr("Buffer"), header());
-  showBufferAct->setCheckable(true);
-  showBufferAct->setChecked(true);
-  showBufferAct->setProperty("column", 0);
-  connect(showBufferAct, SIGNAL(toggled(bool)), this, SLOT(toggleHeader(bool)));
-  header()->addAction(showBufferAct);
-  
-  QAction *showTopicAct = new QAction(tr("Topic"), header());
-  showTopicAct->setCheckable(true);
-  showTopicAct->setChecked(true);
-  showTopicAct->setProperty("column", 1);
-  connect(showTopicAct, SIGNAL(toggled(bool)), this, SLOT(toggleHeader(bool)));
-  header()->addAction(showTopicAct);
-    
-  QAction *showNickAct = new QAction(tr("Nick Count"), header());
-  showNickAct->setCheckable(true);
-  showNickAct->setChecked(true);
-  showNickAct->setProperty("column", 2);
-  connect(showNickAct, SIGNAL(toggled(bool)), this, SLOT(toggleHeader(bool)));
-  header()->addAction(showNickAct);
-  
 }
 
 void BufferView::init() {
   setIndentation(10);
-  // header()->hide();
-  // header()->hideSection(1);
+  header()->setContextMenuPolicy(Qt::ActionsContextMenu);
+  hideColumn(1);
+  hideColumn(2);
   expandAll();
 
   setAnimated(true);
@@ -74,7 +50,7 @@ void BufferView::init() {
   connect(this, SIGNAL(activated(QModelIndex)), this, SLOT(joinChannel(QModelIndex)));
 }
 
-void BufferView::setFilteredModel(QAbstractItemModel *model, BufferViewFilter::Modes mode, QList<uint> nets) {
+void BufferView::setFilteredModel(QAbstractItemModel *model, BufferViewFilter::Modes mode, QList<NetworkId> nets) {
   BufferViewFilter *filter = new BufferViewFilter(model, mode, nets);
   setModel(filter);
   connect(this, SIGNAL(removeBuffer(const QModelIndex &)), filter, SLOT(removeBuffer(const QModelIndex &)));
@@ -84,16 +60,38 @@ void BufferView::setModel(QAbstractItemModel *model) {
   delete selectionModel();
   QTreeView::setModel(model);
   init();
+
+  // remove old Actions
+  QList<QAction *> oldactions = header()->actions();
+  foreach(QAction *action, oldactions) {
+    header()->removeAction(action);
+    action->deleteLater();
+  }
+
+  QString sectionName;
+  QAction *showSection;
+  for(int i = 0; i < model->columnCount(); i++) {
+    sectionName = (model->headerData(i, Qt::Horizontal, Qt::DisplayRole)).toString();
+    showSection = new QAction(sectionName, header());
+    showSection->setCheckable(true);
+    showSection->setChecked(!isColumnHidden(i));
+    showSection->setProperty("column", i);
+    connect(showSection, SIGNAL(toggled(bool)), this, SLOT(toggleHeader(bool)));
+    header()->addAction(showSection);
+  }
   
 }
 
 void BufferView::joinChannel(const QModelIndex &index) {
-  Buffer::Type bufferType = (Buffer::Type)index.data(NetworkModel::BufferTypeRole).toInt();
+  BufferItem::Type bufferType = (BufferItem::Type)index.data(NetworkModel::BufferTypeRole).value<int>();
 
-  if(bufferType != Buffer::ChannelType)
+  if(bufferType != BufferItem::ChannelType)
     return;
+
+  BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
   
-  Client::fakeInput(index.data(NetworkModel::BufferUidRole).toUInt(), QString("/JOIN %1").arg(index.sibling(index.row(), 0).data().toString()));
+  Client::userInput(bufferInfo, QString("/JOIN %1").arg(bufferInfo.buffer()));
+  // Client::fakeInput(index.data(NetworkModel::BufferIdRole).value<BufferId>(), QString("/JOIN %1").arg(index.sibling(index.row(), 0).data().toString()));
 }
 
 void BufferView::keyPressEvent(QKeyEvent *event) {
@@ -119,5 +117,5 @@ void BufferView::rowsInserted(const QModelIndex & parent, int start, int end) {
 
 void BufferView::toggleHeader(bool checked) {
   QAction *action = qobject_cast<QAction *>(sender());
-  header()->setSectionHidden((action->property("column")).toInt(), not checked);
+  header()->setSectionHidden((action->property("column")).toInt(), !checked);
 }