/***************************************************************************
- * Copyright (C) 2005-09 by the Quassel Project *
+ * Copyright (C) 2005-2010 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include "buffersettings.h"
#include "buffersyncer.h"
#include "client.h"
-#include "iconloader.h"
+#include "contextmenuactionprovider.h"
+#include "graphicalui.h"
#include "network.h"
#include "networkmodel.h"
-#include "networkmodelactionprovider.h"
-#include "quasselui.h"
-#include "uisettings.h"
+#include "contextmenuactionprovider.h"
/*****************************************
* The TreeView showing the Buffers
setSelectionMode(QAbstractItemView::ExtendedSelection);
QAbstractItemDelegate *oldDelegate = itemDelegate();
- BufferViewDelegate *newDelegate = new BufferViewDelegate(this);
- setItemDelegate(newDelegate);
+ BufferViewDelegate *tristateDelegate = new BufferViewDelegate(this);
+ setItemDelegate(tristateDelegate);
delete oldDelegate;
}
hideColumn(1);
hideColumn(2);
setIndentation(10);
+
expandAll();
- setAnimated(true);
+ header()->hide(); // nobody seems to use this anyway
+
+ // breaks with Qt 4.8
+ if(QString("4.8.0") > qVersion()) // FIXME breaks with Qt versions >= 4.10!
+ setAnimated(true);
+
+ // FIXME This is to workaround bug #663
+ setUniformRowHeights(true);
#ifndef QT_NO_DRAGANDDROP
setDragEnabled(true);
// activated() fails on X11 and Qtopia at least
#if defined Q_WS_QWS || defined Q_WS_X11
+ disconnect(this, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(joinChannel(QModelIndex)));
connect(this, SIGNAL(doubleClicked(QModelIndex)), SLOT(joinChannel(QModelIndex)));
#else
// afaik this is better on Mac and Windows
+ disconnect(this, SIGNAL(activated(QModelIndex)), this, SLOT(joinChannel(QModelIndex)));
connect(this, SIGNAL(activated(QModelIndex)), SLOT(joinChannel(QModelIndex)));
#endif
}
header()->addAction(showSection);
}
+ connect(model, SIGNAL(layoutChanged()), this, SLOT(on_layoutChanged()));
}
void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig *config) {
return QTreeView::dropEvent(event);
int res = QMessageBox::question(0, tr("Merge buffers permanently?"),
- tr("Do you want to merge the buffer \"%1\" permanently into buffer \"%2\"?\n This cannot be reversed!").arg(Client::networkModel()->bufferName(bufferId2)).arg(Client::networkModel()->bufferName(bufferId1)),
- QMessageBox::Yes|QMessageBox::No, QMessageBox::No);
+ tr("Do you want to merge the buffer \"%1\" permanently into buffer \"%2\"?\n This cannot be reversed!").arg(Client::networkModel()->bufferName(bufferId2)).arg(Client::networkModel()->bufferName(bufferId1)),
+ QMessageBox::Yes|QMessageBox::No, QMessageBox::No);
if(res == QMessageBox::Yes) {
Client::mergeBuffersPermanently(bufferId1, bufferId2);
}
continue;
removedRows << bufferId;
+ }
+ foreach(BufferId bufferId, removedRows) {
if(permanently)
config()->requestRemoveBufferPermanently(bufferId);
else
}
}
-void BufferView::rowsInserted(const QModelIndex & parent, int start, int end) {
+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
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);
+ setExpandedState(parent);
+}
+
+void BufferView::on_layoutChanged() {
+ int numNets = model()->rowCount(QModelIndex());
+ for(int row = 0; row < numNets; row++) {
+ QModelIndex networkIdx = model()->index(row, 0, QModelIndex());
+ setExpandedState(networkIdx);
}
}
if(!networkId.isValid())
continue;
- update(networkIdx);
setExpandedState(networkIdx);
}
// update selection to current one
Client::bufferModel()->synchronizeView(this);
}
-
- return;
}
void BufferView::storeExpandedState(const QModelIndex &networkIdx) {
expandNetwork = (bool)(oldState & WasExpanded);
}
- storeExpandedState(networkIdx); // this call is needed to keep track of the isActive state
- if(expandNetwork != isExpanded(networkIdx))
+ if(expandNetwork != isExpanded(networkIdx)) {
+ update(networkIdx);
setExpanded(networkIdx, expandNetwork);
+ }
+ storeExpandedState(networkIdx); // this call is needed to keep track of the isActive state
}
void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
indexList.removeAll(index);
indexList.prepend(index);
- Client::mainUi()->actionProvider()->addActions(contextMenu, indexList, this, "menuActionTriggered", (bool)config());
+ GraphicalUi::contextMenuActionProvider()->addActions(contextMenu, indexList, this, "menuActionTriggered", (bool)config());
}
void BufferView::addFilterActions(QMenu *contextMenu, const QModelIndex &index) {
if(!filterActions.isEmpty()) {
contextMenu->addSeparator();
foreach(QAction *action, filterActions) {
- contextMenu->addAction(action);
+ contextMenu->addAction(action);
}
}
}
}
void BufferView::menuActionTriggered(QAction *result) {
- NetworkModelActionProvider::ActionType type = (NetworkModelActionProvider::ActionType)result->data().toInt();
+ ContextMenuActionProvider::ActionType type = (ContextMenuActionProvider::ActionType)result->data().toInt();
switch(type) {
- case NetworkModelActionProvider::HideBufferTemporarily:
+ case ContextMenuActionProvider::HideBufferTemporarily:
removeSelectedBuffers();
break;
- case NetworkModelActionProvider::HideBufferPermanently:
+ case ContextMenuActionProvider::HideBufferPermanently:
removeSelectedBuffers(true);
break;
default:
}
}
-void BufferView::wheelEvent(QWheelEvent* event) {
- if(UiSettings().value("MouseWheelChangesBuffers", QVariant(true)).toBool() == (bool)(event->modifiers() & Qt::AltModifier))
- return QTreeView::wheelEvent(event);
+void BufferView::nextBuffer() {
+ changeBuffer(Forward);
+}
- int rowDelta = ( event->delta() > 0 ) ? -1 : 1;
+void BufferView::previousBuffer() {
+ changeBuffer(Backward);
+}
+
+void BufferView::changeBuffer(Direction direction) {
QModelIndex currentIndex = selectionModel()->currentIndex();
QModelIndex resultingIndex;
- if( model()->hasIndex( currentIndex.row() + rowDelta, currentIndex.column(), currentIndex.parent() ) )
- {
- resultingIndex = currentIndex.sibling( currentIndex.row() + rowDelta, currentIndex.column() );
+
+ if(currentIndex.parent().isValid()) {
+ //If we are a child node just switch among siblings unless it's the first/last child
+ resultingIndex = currentIndex.sibling(currentIndex.row() + direction, 0);
+
+ if(!resultingIndex.isValid()) {
+ QModelIndex parent = currentIndex.parent();
+ if(direction == Backward)
+ resultingIndex = parent;
+ else
+ resultingIndex = parent.sibling(parent.row() + direction, 0);
}
- else //if we scroll into a the parent node...
- {
- QModelIndex parent = currentIndex.parent();
- QModelIndex aunt = parent.sibling( parent.row() + rowDelta, parent.column() );
- if( rowDelta == -1 )
- resultingIndex = aunt.child( model()->rowCount( aunt ) - 1, 0 );
- else
- resultingIndex = aunt.child( 0, 0 );
- if( !resultingIndex.isValid() )
- return;
- }
+ } else {
+ //If we have a toplevel node, try and get an adjacent child
+ if(direction == Backward) {
+ QModelIndex newParent = currentIndex.sibling(currentIndex.row() - 1, 0);
+ if(model()->hasChildren(newParent))
+ resultingIndex = newParent.child(model()->rowCount(newParent) - 1, 0);
+ else
+ resultingIndex = newParent;
+ } else {
+ if(model()->hasChildren(currentIndex))
+ resultingIndex = currentIndex.child(0, 0);
+ else
+ resultingIndex = currentIndex.sibling(currentIndex.row() + 1, 0);
+ }
+ }
+
+ if(!resultingIndex.isValid())
+ return;
+
selectionModel()->setCurrentIndex( resultingIndex, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows );
selectionModel()->select( resultingIndex, QItemSelectionModel::ClearAndSelect );
+}
+
+void BufferView::wheelEvent(QWheelEvent* event) {
+ if(ItemViewSettings().mouseWheelChangesBuffer() == (bool)(event->modifiers() & Qt::AltModifier))
+ return QTreeView::wheelEvent(event);
+ int rowDelta = ( event->delta() > 0 ) ? -1 : 1;
+ changeBuffer((Direction)rowDelta);
}
QSize BufferView::sizeHint() const {
// ****************************************
// BufferViewDelgate
// ****************************************
+class ColorsChangedEvent : public QEvent {
+public:
+ ColorsChangedEvent() : QEvent(QEvent::User) {};
+};
+
BufferViewDelegate::BufferViewDelegate(QObject *parent)
: QStyledItemDelegate(parent)
{
- UiSettings s("QtUiStyle/Colors");
- _FgColorHighlightActivity = s.value("highlightActivityFG", QVariant(QColor(Qt::magenta))).value<QColor>();
- _FgColorNewMessageActivity = s.value("newMessageActivityFG", QVariant(QColor(Qt::green))).value<QColor>();
- _FgColorOtherActivity = s.value("otherActivityFG", QVariant(QColor(Qt::darkGreen))).value<QColor>();
+}
+
+void BufferViewDelegate::customEvent(QEvent *event) {
+ if(event->type() != QEvent::User)
+ return;
+
+ event->accept();
}
bool BufferViewDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index) {
return true;
}
-void BufferViewDelegate::initStyleOption(QStyleOptionViewItem *option, const QModelIndex &index) const {
- QStyledItemDelegate::initStyleOption(option, index);
-
- BufferInfo::ActivityLevel activity = (BufferInfo::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt();
-
- if(activity & BufferInfo::Highlight) {
- option->palette.setColor(QPalette::Text, _FgColorHighlightActivity);
- return;
- }
- if(activity & BufferInfo::NewMessage) {
- option->palette.setColor(QPalette::Text, _FgColorNewMessageActivity);
- return;
- }
- if(activity & BufferInfo::OtherActivity) {
- option->palette.setColor(QPalette::Text, _FgColorOtherActivity);
- return;
- }
-
- if(!index.data(NetworkModel::ItemActiveRole).toBool() || index.data(NetworkModel::UserAwayRole).toBool()) {
- option->palette.setColor(QPalette::Text, option->palette.color(QPalette::Dark));
- }
-}
-
-
// ==============================
// BufferView Dock
// ==============================
BufferViewDock::BufferViewDock(BufferViewConfig *config, QWidget *parent)
- : QDockWidget(config->bufferViewName(), parent)
+ : QDockWidget(parent),
+ _active(false),
+ _title(config->bufferViewName())
{
setObjectName("BufferViewDock-" + QString::number(config->bufferViewId()));
toggleViewAction()->setData(config->bufferViewId());
setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea);
connect(config, SIGNAL(bufferViewNameSet(const QString &)), this, SLOT(bufferViewRenamed(const QString &)));
+ updateTitle();
+}
+
+void BufferViewDock::updateTitle() {
+ QString title = _title;
+ if(isActive())
+ title.prepend(QString::fromUtf8("• "));
+ setWindowTitle(title);
+}
+
+void BufferViewDock::setActive(bool active) {
+ if(active != isActive()) {
+ _active = active;
+ updateTitle();
+ if(active)
+ raise(); // for tabbed docks
+ }
}
void BufferViewDock::bufferViewRenamed(const QString &newName) {
- setWindowTitle(newName);
+ _title = newName;
+ updateTitle();
toggleViewAction()->setText(newName);
}
+
+int BufferViewDock::bufferViewId() const {
+ BufferView *view = bufferView();
+ if(!view)
+ return 0;
+
+ if(view->config())
+ return view->config()->bufferViewId();
+ else
+ return 0;
+}
+
+BufferViewConfig *BufferViewDock::config() const {
+ BufferView *view = bufferView();
+ if(!view)
+ return 0;
+ else
+ return view->config();
+}
projects / quassel.git / blobdiff