X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=840f5d7e6fdaef417c6e6fe7e7b86abdec6ea335;hp=14b27ec85216adca1812b924ab63f3f4d042a985;hb=1aef6bf0d3d2a7ef469b9a9f68ceb891cc8a896c;hpb=f9fc50a5e043668a2525a6c0903ea339d4ba05b7

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index 14b27ec8..840f5d7e 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -19,7 +19,6 @@
  ***************************************************************************/
 
 #include "client.h"
-//#include "buffer.h"
 #include "bufferview.h"
 #include "networkmodel.h"
 
@@ -34,6 +33,8 @@ BufferView::BufferView(QWidget *parent) : QTreeView(parent) {
 void BufferView::init() {
   setIndentation(10);
   header()->setContextMenuPolicy(Qt::ActionsContextMenu);
+  hideColumn(1);
+  hideColumn(2);
   expandAll();
 
   setAnimated(true);
@@ -49,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 &)));
@@ -73,7 +74,7 @@ void BufferView::setModel(QAbstractItemModel *model) {
     sectionName = (model->headerData(i, Qt::Horizontal, Qt::DisplayRole)).toString();
     showSection = new QAction(sectionName, header());
     showSection->setCheckable(true);
-    showSection->setChecked(true);
+    showSection->setChecked(!isColumnHidden(i));
     showSection->setProperty("column", i);
     connect(showSection, SIGNAL(toggled(bool)), this, SLOT(toggleHeader(bool)));
     header()->addAction(showSection);
@@ -82,12 +83,14 @@ void BufferView::setModel(QAbstractItemModel *model) {
 }
 
 void BufferView::joinChannel(const QModelIndex &index) {
-  BufferItem::Type bufferType = (BufferItem::Type)index.data(NetworkModel::BufferTypeRole).toInt();
+  BufferInfo::Type bufferType = (BufferInfo::Type)index.data(NetworkModel::BufferTypeRole).value<int>();
 
-  if(bufferType != BufferItem::ChannelType)
+  if(bufferType != BufferInfo::ChannelBuffer)
     return;
+
+  BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
   
-  Client::fakeInput(index.data(NetworkModel::BufferIdRole).toUInt(), QString("/JOIN %1").arg(index.sibling(index.row(), 0).data().toString()));
+  Client::userInput(bufferInfo, QString("/JOIN %1").arg(bufferInfo.bufferName()));
 }
 
 void BufferView::keyPressEvent(QKeyEvent *event) {
@@ -113,5 +116,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);
 }