projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed win32.o
[quassel.git]
/
src
/
uisupport
/
bufferview.cpp
diff --git
a/src/uisupport/bufferview.cpp
b/src/uisupport/bufferview.cpp
index
8debe24
..
ecaf7e9
100644
(file)
--- a/
src/uisupport/bufferview.cpp
+++ b/
src/uisupport/bufferview.cpp
@@
-40,7
+40,6
@@
#include "network.h"
#include "networkmodel.h"
#include "contextmenuactionprovider.h"
#include "network.h"
#include "networkmodel.h"
#include "contextmenuactionprovider.h"
-#include "uisettings.h"
/*****************************************
* The TreeView showing the Buffers
/*****************************************
* The TreeView showing the Buffers
@@
-59,10
+58,6
@@
BufferView::BufferView(QWidget *parent)
BufferViewDelegate *tristateDelegate = new BufferViewDelegate(this);
setItemDelegate(tristateDelegate);
delete oldDelegate;
BufferViewDelegate *tristateDelegate = new BufferViewDelegate(this);
setItemDelegate(tristateDelegate);
delete oldDelegate;
-
- UiStyleSettings s("QtUiStyle/Fonts"); // li'l dirty here, but fonts are stored in QtUiStyle :/
- s.notify("BufferView", this, SLOT(setCustomFont(QVariant)));
- setCustomFont(s.value("BufferView", QFont()));
}
void BufferView::init() {
}
void BufferView::init() {
@@
-72,8
+67,13
@@
void BufferView::init() {
setIndentation(10);
expandAll();
setIndentation(10);
expandAll();
+ header()->hide(); // nobody seems to use this anyway
+
setAnimated(true);
setAnimated(true);
+ // FIXME This is to workaround bug #663
+ setUniformRowHeights(true);
+
#ifndef QT_NO_DRAGANDDROP
setDragEnabled(true);
setAcceptDrops(true);
#ifndef QT_NO_DRAGANDDROP
setDragEnabled(true);
setAcceptDrops(true);
@@
-194,13
+194,6
@@
void BufferView::setRootIndexForNetworkId(const NetworkId &networkId) {
}
}
}
}
-void BufferView::setCustomFont(const QVariant &v) {
- QFont font = v.value<QFont>();
- if(font.family().isEmpty())
- font = QApplication::font();
- setFont(font);
-}
-
void BufferView::joinChannel(const QModelIndex &index) {
BufferInfo::Type bufferType = (BufferInfo::Type)index.data(NetworkModel::BufferTypeRole).value<int>();
void BufferView::joinChannel(const QModelIndex &index) {
BufferInfo::Type bufferType = (BufferInfo::Type)index.data(NetworkModel::BufferTypeRole).value<int>();
@@
-436,7
+429,7
@@
void BufferView::menuActionTriggered(QAction *result) {
}
void BufferView::wheelEvent(QWheelEvent* event) {
}
void BufferView::wheelEvent(QWheelEvent* event) {
- if(
UiSettings().value("MouseWheelChangesBuffers", QVariant(true)).toBool
() == (bool)(event->modifiers() & Qt::AltModifier))
+ if(
ItemViewSettings().mouseWheelChangesBuffer
() == (bool)(event->modifiers() & Qt::AltModifier))
return QTreeView::wheelEvent(event);
int rowDelta = ( event->delta() > 0 ) ? -1 : 1;
return QTreeView::wheelEvent(event);
int rowDelta = ( event->delta() > 0 ) ? -1 : 1;