projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sanitizing clipboard handling
[quassel.git]
/
src
/
qtui
/
chatscene.h
diff --git
a/src/qtui/chatscene.h
b/src/qtui/chatscene.h
index
b0c80f4
..
1c64109
100644
(file)
--- a/
src/qtui/chatscene.h
+++ b/
src/qtui/chatscene.h
@@
-22,17
+22,20
@@
#define CHATSCENE_H_
#include <QAbstractItemModel>
#define CHATSCENE_H_
#include <QAbstractItemModel>
+#include <QClipboard>
+#include <QGraphicsItem>
#include <QGraphicsScene>
#include <QSet>
#include <QTimer>
#include "chatlinemodel.h"
#include <QGraphicsScene>
#include <QSet>
#include <QTimer>
#include "chatlinemodel.h"
-#include "columnhandleitem.h"
#include "messagefilter.h"
class AbstractUiMsg;
class ChatItem;
class ChatLine;
#include "messagefilter.h"
class AbstractUiMsg;
class ChatItem;
class ChatLine;
+class ChatView;
+class ColumnHandleItem;
class WebPreviewItem;
class QGraphicsSceneMouseEvent;
class WebPreviewItem;
class QGraphicsSceneMouseEvent;
@@
-53,17
+56,19
@@
public:
SenderChatItemType,
ContentsChatItemType,
SearchHighlightType,
SenderChatItemType,
ContentsChatItemType,
SearchHighlightType,
- WebPreviewType
+ WebPreviewType,
+ ColumnHandleType
};
enum ClickMode {
NoClick,
SingleClick,
DoubleClick,
};
enum ClickMode {
NoClick,
SingleClick,
DoubleClick,
- TripleClick
+ TripleClick,
+ DragStartClick
};
};
- ChatScene(QAbstractItemModel *model, const QString &idString, qreal width,
QObject
*parent);
+ ChatScene(QAbstractItemModel *model, const QString &idString, qreal width,
ChatView
*parent);
virtual ~ChatScene();
inline QAbstractItemModel *model() const { return _model; }
virtual ~ChatScene();
inline QAbstractItemModel *model() const { return _model; }
@@
-73,16
+78,27
@@
public:
inline int rowByScenePos(const QPointF &pos) { return rowByScenePos(pos.y()); }
ChatLineModel::ColumnType columnByScenePos(qreal x);
inline ChatLineModel::ColumnType columnByScenePos(const QPointF &pos) { return columnByScenePos(pos.x()); }
inline int rowByScenePos(const QPointF &pos) { return rowByScenePos(pos.y()); }
ChatLineModel::ColumnType columnByScenePos(qreal x);
inline ChatLineModel::ColumnType columnByScenePos(const QPointF &pos) { return columnByScenePos(pos.x()); }
+
+ ChatView *chatView() const;
+ ChatItem *chatItemAt(const QPointF &pos) const;
+
inline bool isSingleBufferScene() const { return _singleBufferScene; }
bool containsBuffer(const BufferId &id) const;
inline ChatLine *chatLine(int row) { return (row < _lines.count()) ? _lines[row] : 0; }
inline bool isSingleBufferScene() const { return _singleBufferScene; }
bool containsBuffer(const BufferId &id) const;
inline ChatLine *chatLine(int row) { return (row < _lines.count()) ? _lines[row] : 0; }
- inline ColumnHandleItem *firstColumnHandle() const { return _firstColHandle; }
- inline ColumnHandleItem *secondColumnHandle() const { return _secondColHandle; }
+ ColumnHandleItem *firstColumnHandle() const;
+ ColumnHandleItem *secondColumnHandle() const;
inline CutoffMode senderCutoffMode() const { return _cutoffMode; }
inline void setSenderCutoffMode(CutoffMode mode) { _cutoffMode = mode; }
inline CutoffMode senderCutoffMode() const { return _cutoffMode; }
inline void setSenderCutoffMode(CutoffMode mode) { _cutoffMode = mode; }
+ QString selection() const;
+ bool hasSelection() const;
+ bool hasGlobalSelection() const;
+ bool isPosOverSelection(const QPointF &) const;
+ bool isGloballySelecting() const;
+ void initiateDrag(QWidget *source);
+
bool isScrollingAllowed() const;
virtual bool event(QEvent *e);
bool isScrollingAllowed() const;
virtual bool event(QEvent *e);
@@
-95,7
+111,9
@@
public:
void setSelectingItem(ChatItem *item);
ChatItem *selectingItem() const { return _selectingItem; }
void startGlobalSelection(ChatItem *item, const QPointF &itemPos);
void setSelectingItem(ChatItem *item);
ChatItem *selectingItem() const { return _selectingItem; }
void startGlobalSelection(ChatItem *item, const QPointF &itemPos);
- void putToClipboard(const QString &);
+ void clearGlobalSelection();
+ void clearSelection();
+ void selectionToClipboard(QClipboard::Mode = QClipboard::Clipboard);
void requestBacklog();
void requestBacklog();
@@
-108,10
+126,12
@@
signals:
void mouseMoveWhileSelecting(const QPointF &scenePos);
protected:
void mouseMoveWhileSelecting(const QPointF &scenePos);
protected:
+ virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent *contextMenuEvent);
virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *mouseEvent);
virtual void mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent);
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent);
virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *mouseEvent);
virtual void mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent);
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent);
- //virtual bool handleLeftClick(ClickMode mode);
+ virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *mouseEvent);
+ virtual void handleClick(Qt::MouseButton button, const QPointF &scenePos);
protected slots:
void rowsInserted(const QModelIndex &, int, int);
protected slots:
void rowsInserted(const QModelIndex &, int, int);
@@
-124,11
+144,13
@@
private slots:
void deleteWebPreviewEvent();
void showWebPreviewChanged();
void deleteWebPreviewEvent();
void showWebPreviewChanged();
+ void clickTimeout();
+
private:
void setHandleXLimits();
void updateSelection(const QPointF &pos);
private:
void setHandleXLimits();
void updateSelection(const QPointF &pos);
- QString selectionToString() const;
+ ChatView *_chatView;
QString _idString;
QAbstractItemModel *_model;
QList<ChatLine *> _lines;
QString _idString;
QAbstractItemModel *_model;
QList<ChatLine *> _lines;
@@
-154,9
+176,13
@@
private:
int _firstSelectionRow;
bool _isSelecting;
int _firstSelectionRow;
bool _isSelecting;
- bool _showWebPreview;
-
QTimer _clickTimer;
QTimer _clickTimer;
+ ClickMode _clickMode;
+ QPointF _clickPos;
+ bool _clickHandled;
+ bool _leftButtonPressed;
+
+ bool _showWebPreview;
struct WebPreview {
ChatItem *parentItem;
struct WebPreview {
ChatItem *parentItem;