projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix wordwrap when using Qt > 4.6.3
[quassel.git]
/
src
/
uisupport
/
bufferview.h
diff --git
a/src/uisupport/bufferview.h
b/src/uisupport/bufferview.h
index
c9af5b7
..
5d19a13
100644
(file)
--- a/
src/uisupport/bufferview.h
+++ b/
src/uisupport/bufferview.h
@@
-25,6
+25,7
@@
#include <QMenu>
#include <QDockWidget>
#include <QModelIndex>
#include <QMenu>
#include <QDockWidget>
#include <QModelIndex>
+#include <QStyledItemDelegate>
#include <QTreeView>
#include <QPointer>
#include <QTreeView>
#include <QPointer>
@@
-80,6
+81,7
@@
private slots:
void setExpandedState(const QModelIndex &networkIdx);
void on_configChanged();
void setExpandedState(const QModelIndex &networkIdx);
void on_configChanged();
+ void on_layoutChanged();
private:
QPointer<BufferViewConfig> _config;
private:
QPointer<BufferViewConfig> _config;
@@
-95,7
+97,6
@@
private:
// ******************************
// BufferViewDelgate
// ******************************
// ******************************
// BufferViewDelgate
// ******************************
-#include <QStyledItemDelegate>
class BufferViewDelegate : public QStyledItemDelegate {
Q_OBJECT
class BufferViewDelegate : public QStyledItemDelegate {
Q_OBJECT
@@
-105,15
+106,9
@@
public:
bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index);
protected:
bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index);
protected:
- virtual void initStyleOption(QStyleOptionViewItem *option, const QModelIndex &index) const;
-
-private:
- QColor _FgColorHighlightActivity;
- QColor _FgColorNewMessageActivity;
- QColor _FgColorOtherActivity;
+ virtual void customEvent(QEvent *event);
};
};
-
// ==============================
// BufferView Dock
// ==============================
// ==============================
// BufferView Dock
// ==============================
@@
-123,6
+118,8
@@
class BufferViewDock : public QDockWidget {
public:
BufferViewDock(BufferViewConfig *config, QWidget *parent);
public:
BufferViewDock(BufferViewConfig *config, QWidget *parent);
+ int bufferViewId() const;
+ BufferViewConfig *config() const;
inline BufferView *bufferView() const { return qobject_cast<BufferView *>(widget()); }
public slots:
inline BufferView *bufferView() const { return qobject_cast<BufferView *>(widget()); }
public slots: