projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged changes from branch "sput" r62:66 back into trunk.
[quassel.git]
/
gui
/
chatwidget.h
diff --git
a/gui/chatwidget.h
b/gui/chatwidget.h
index
1641824
..
2fdd895
100644
(file)
--- a/
gui/chatwidget.h
+++ b/
gui/chatwidget.h
@@
-52,9
+52,11
@@
class ChatWidget : public QAbstractScrollArea {
public slots:
void clear();
public slots:
void clear();
+ void prependChatLine(ChatLine *);
+ void appendChatLine(ChatLine *);
void prependChatLines(QList<ChatLine *>);
void prependChatLines(QList<ChatLine *>);
- void append
Msg(Message
);
- void
appendMsgList(QList<Message> *
);
+ void append
ChatLines(QList<ChatLine *>
);
+ void
setContents(QList<ChatLine *>
);
protected:
virtual void resizeEvent(QResizeEvent *event);
protected:
virtual void resizeEvent(QResizeEvent *event);
@@
-133,7
+135,7
@@
class ChatLine : public QObject {
Q_OBJECT
public:
Q_OBJECT
public:
- ChatLine(Message message
, QString networkName, QString bufferName
);
+ ChatLine(Message message);
~ChatLine();
qreal layout(qreal tsWidth, qreal nickWidth, qreal textWidth);
~ChatLine();
qreal layout(qreal tsWidth, qreal nickWidth, qreal textWidth);
@@
-143,9
+145,11
@@
class ChatLine : public QObject {
enum SelectionMode { None, Partial, Full };
void setSelection(SelectionMode, int start = 0, int end = 0);
enum SelectionMode { None, Partial, Full };
void setSelection(SelectionMode, int start = 0, int end = 0);
- QDateTime getTimeStamp();
- QString getSender();
- QString getText();
+ QDateTime timeStamp();
+ QString sender();
+ QString text();
+ uint msgId();
+ BufferId bufferId();
bool isUrl(int pos);
QUrl getUrl(int pos);
bool isUrl(int pos);
QUrl getUrl(int pos);
@@
-155,7
+159,6
@@
class ChatLine : public QObject {
private:
qreal hght;
Message msg;
private:
qreal hght;
Message msg;
- QString networkName, bufferName;
qreal tsWidth, senderWidth, textWidth;
Style::FormattedString tsFormatted, senderFormatted, textFormatted;
qreal tsWidth, senderWidth, textWidth;
Style::FormattedString tsFormatted, senderFormatted, textFormatted;
@@
-193,6
+196,7
@@
class ChatLine : public QObject {
QList<FormatRange> calcFormatRanges(const Style::FormattedString &, QTextLayout::FormatRange additional = QTextLayout::FormatRange());
};
QList<FormatRange> calcFormatRanges(const Style::FormattedString &, QTextLayout::FormatRange additional = QTextLayout::FormatRange());
};
+/*
struct LayoutTask {
QList<Message> messages;
Buffer *buffer;
struct LayoutTask {
QList<Message> messages;
Buffer *buffer;
@@
-223,5
+227,6
@@
class LayoutThread : public QThread {
bool abort;
};
bool abort;
};
+*/
#endif
#endif