X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=e477ba11db78620890609e71417128e881e72076;hp=8debe24010da9c06169311e7bc741aa40589315b;hb=df38e82953be7b676871f7215053a005decb90d1;hpb=f4c3a241df84e2a2de9ddebdc4c7f25054b4ba9c diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp index 8debe240..e477ba11 100644 --- a/src/uisupport/bufferview.cpp +++ b/src/uisupport/bufferview.cpp @@ -40,7 +40,6 @@ #include "network.h" #include "networkmodel.h" #include "contextmenuactionprovider.h" -#include "uisettings.h" /***************************************** * The TreeView showing the Buffers @@ -59,10 +58,6 @@ BufferView::BufferView(QWidget *parent) 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() { @@ -194,13 +189,6 @@ void BufferView::setRootIndexForNetworkId(const NetworkId &networkId) { } } -void BufferView::setCustomFont(const QVariant &v) { - QFont font = v.value(); - 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(); @@ -436,7 +424,7 @@ void BufferView::menuActionTriggered(QAction *result) { } 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;