projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some cleanups in ChatScene in preparation to mouse handling revamp
[quassel.git]
/
src
/
qtui
/
chatscene.h
diff --git
a/src/qtui/chatscene.h
b/src/qtui/chatscene.h
index
0418232
..
b0c80f4
100644
(file)
--- a/
src/qtui/chatscene.h
+++ b/
src/qtui/chatscene.h
@@
-24,7
+24,9
@@
#include <QAbstractItemModel>
#include <QGraphicsScene>
#include <QSet>
#include <QAbstractItemModel>
#include <QGraphicsScene>
#include <QSet>
+#include <QTimer>
+#include "chatlinemodel.h"
#include "columnhandleitem.h"
#include "messagefilter.h"
#include "columnhandleitem.h"
#include "messagefilter.h"
@@
-39,24
+41,55
@@
class ChatScene : public QGraphicsScene {
Q_OBJECT
public:
Q_OBJECT
public:
+ enum CutoffMode {
+ CutoffLeft,
+ CutoffRight
+ };
+
+ enum ItemType {
+ ChatLineType = QGraphicsItem::UserType + 1,
+ ChatItemType,
+ TimestampChatItemType,
+ SenderChatItemType,
+ ContentsChatItemType,
+ SearchHighlightType,
+ WebPreviewType
+ };
+
+ enum ClickMode {
+ NoClick,
+ SingleClick,
+ DoubleClick,
+ TripleClick
+ };
+
ChatScene(QAbstractItemModel *model, const QString &idString, qreal width, QObject *parent);
virtual ~ChatScene();
inline QAbstractItemModel *model() const { return _model; }
inline QString idString() const { return _idString; }
ChatScene(QAbstractItemModel *model, const QString &idString, qreal width, QObject *parent);
virtual ~ChatScene();
inline QAbstractItemModel *model() const { return _model; }
inline QString idString() const { return _idString; }
- int sectionByScenePos(int x);
- inline int sectionByScenePos(const QPoint &pos) { return sectionByScenePos(pos.x()); }
+ int rowByScenePos(qreal y);
+ 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 bool isSingleBufferScene() const { return _singleBufferScene; }
inline bool isSingleBufferScene() const { return _singleBufferScene; }
-
inline
bool containsBuffer(const BufferId &id) const;
+ bool containsBuffer(const BufferId &id) const;
inline ChatLine *chatLine(int row) { return (row < _lines.count()) ? _lines[row] : 0; }
inline ChatLine *chatLine(int row) { return (row < _lines.count()) ? _lines[row] : 0; }
- inline ColumnHandleItem *firstColumnHandle() const { return firstColHandle; }
- inline ColumnHandleItem *secondColumnHandle() const { return secondColHandle; }
+ inline ColumnHandleItem *firstColumnHandle() const { return
_
firstColHandle; }
+ inline ColumnHandleItem *secondColumnHandle() const { return
_
secondColHandle; }
-public slots:
+ inline CutoffMode senderCutoffMode() const { return _cutoffMode; }
+ inline void setSenderCutoffMode(CutoffMode mode) { _cutoffMode = mode; }
+
+ bool isScrollingAllowed() const;
+
+ virtual bool event(QEvent *e);
+
+ public slots:
void updateForViewport(qreal width, qreal height);
void updateForViewport(qreal width, qreal height);
- void setWidth(qreal
, bool forceReposition = false
);
+ void setWidth(qreal
width
);
// these are used by the chatitems to notify the scene and manage selections
void setSelectingItem(ChatItem *item);
// these are used by the chatitems to notify the scene and manage selections
void setSelectingItem(ChatItem *item);
@@
-71,21
+104,25
@@
public slots:
signals:
void lastLineChanged(QGraphicsItem *item, qreal offset);
signals:
void lastLineChanged(QGraphicsItem *item, qreal offset);
+ void layoutChanged(); // indicates changes to the scenerect due to resizing of the contentsitems
+ void mouseMoveWhileSelecting(const QPointF &scenePos);
protected:
virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *mouseEvent);
virtual void mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent);
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent);
protected:
virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *mouseEvent);
virtual void mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent);
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent);
-
virtual void customEvent(QEvent *event
);
+
//virtual bool handleLeftClick(ClickMode mode
);
protected slots:
void rowsInserted(const QModelIndex &, int, int);
void rowsAboutToBeRemoved(const QModelIndex &, int, int);
private slots:
protected slots:
void rowsInserted(const QModelIndex &, int, int);
void rowsAboutToBeRemoved(const QModelIndex &, int, int);
private slots:
- void handlePositionChanged(qreal xpos);
- void showWebPreview();
- void clearWebPreviewEvent();
+ void firstHandlePositionChanged(qreal xpos);
+ void secondHandlePositionChanged(qreal xpos);
+ void showWebPreviewEvent();
+ void deleteWebPreviewEvent();
+ void showWebPreviewChanged();
private:
void setHandleXLimits();
private:
void setHandleXLimits();
@@
-101,40
+138,36
@@
private:
// we store the size in a member variable.
QRectF _sceneRect;
int _firstLineRow; // the first row to display (aka: not a daychange msg)
// we store the size in a member variable.
QRectF _sceneRect;
int _firstLineRow; // the first row to display (aka: not a daychange msg)
- void updateSceneRect();
void updateSceneRect(qreal width);
void updateSceneRect(qreal width);
+ inline void updateSceneRect() { updateSceneRect(_sceneRect.width()); }
void updateSceneRect(const QRectF &rect);
qreal _viewportHeight;
void updateSceneRect(const QRectF &rect);
qreal _viewportHeight;
- ColumnHandleItem *firstColHandle, *secondColHandle;
- qreal firstColHandlePos, secondColHandlePos;
+ ColumnHandleItem *_firstColHandle, *_secondColHandle;
+ qreal _firstColHandlePos, _secondColHandlePos;
+ CutoffMode _cutoffMode;
ChatItem *_selectingItem;
int _selectionStartCol, _selectionMinCol;
int _selectionStart;
int _selectionEnd;
ChatItem *_selectingItem;
int _selectionStartCol, _selectionMinCol;
int _selectionStart;
int _selectionEnd;
- int _firstSelectionRow
, _lastSelectionRow
;
+ int _firstSelectionRow;
bool _isSelecting;
bool _isSelecting;
- int _lastBacklogSize;
+ bool _showWebPreview;
+
+ QTimer _clickTimer;
struct WebPreview {
ChatItem *parentItem;
struct WebPreview {
ChatItem *parentItem;
-
WebPreview
Item *previewItem;
+
QGraphics
Item *previewItem;
QString url;
QRectF urlRect;
QTimer delayTimer;
QString url;
QRectF urlRect;
QTimer delayTimer;
+ QTimer deleteTimer;
WebPreview() : parentItem(0), previewItem(0) {}
};
WebPreview webPreview;
};
WebPreview() : parentItem(0), previewItem(0) {}
};
WebPreview webPreview;
};
-bool ChatScene::containsBuffer(const BufferId &id) const {
- MessageFilter *filter = qobject_cast<MessageFilter*>(model());
- if(filter)
- return filter->containsBuffer(id);
- else
- return false;
-}
-
#endif
#endif