projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Storing format length as quint16 rather than int.
[quassel.git]
/
src
/
uisupport
/
uistyle.h
diff --git
a/src/uisupport/uistyle.h
b/src/uisupport/uistyle.h
index
59841dc
..
43f248a
100644
(file)
--- a/
src/uisupport/uistyle.h
+++ b/
src/uisupport/uistyle.h
@@
-21,10
+21,7
@@
#ifndef _UISTYLE_H_
#define _UISTYLE_H_
#ifndef _UISTYLE_H_
#define _UISTYLE_H_
-#ifndef SPUTDEV
-# include "old-uistyle.h"
-#else
-
+#include <QDataStream>
#include <QTextCharFormat>
#include <QTextLayout>
#include <QUrl>
#include <QTextCharFormat>
#include <QTextLayout>
#include <QUrl>
@@
-33,11
+30,14
@@
#include "settings.h"
class UiStyle {
#include "settings.h"
class UiStyle {
+ Q_DECLARE_TR_FUNCTIONS (UiStyle);
public:
UiStyle(const QString &settingsKey);
virtual ~UiStyle();
public:
UiStyle(const QString &settingsKey);
virtual ~UiStyle();
+ typedef QList<QPair<quint16, quint32> > FormatList;
+
//! This enumerates the possible formats a text element may have. */
/** These formats are ordered on increasing importance, in cases where a given property is specified
* by multiple active formats.
//! This enumerates the possible formats a text element may have. */
/** These formats are ordered on increasing importance, in cases where a given property is specified
* by multiple active formats.
@@
-117,11
+117,18
@@
class UiStyle {
};
struct StyledString {
};
struct StyledString {
- QString text;
- QList<QPair<int, quint32> > formats; // starting pos, ftypes
+ QString plainText;
+ FormatList formatList; // starting pos, ftypes
+ };
+
+ struct StyledMessage {
+ StyledString timestamp;
+ StyledString sender;
+ StyledString contents;
};
StyledString styleString(const QString &);
};
StyledString styleString(const QString &);
+ StyledMessage styleMessage(const Message &);
void setFormat(FormatType, QTextCharFormat, Settings::Mode mode/* = Settings::Custom*/);
QTextCharFormat format(FormatType, Settings::Mode mode = Settings::Custom) const;
void setFormat(FormatType, QTextCharFormat, Settings::Mode mode/* = Settings::Custom*/);
QTextCharFormat format(FormatType, Settings::Mode mode = Settings::Custom) const;
@@
-134,6
+141,8
@@
class UiStyle {
private:
private:
+ QString mircToInternal(const QString &);
+
QTextCharFormat _defaultPlainFormat;
QHash<FormatType, QTextCharFormat> _defaultFormats;
QHash<FormatType, QTextCharFormat> _customFormats;
QTextCharFormat _defaultPlainFormat;
QHash<FormatType, QTextCharFormat> _defaultFormats;
QHash<FormatType, QTextCharFormat> _customFormats;
@@
-143,5
+152,9
@@
class UiStyle {
QString _settingsKey;
};
QString _settingsKey;
};
-#endif // SPUTDEV
+QDataStream &operator<<(QDataStream &out, const UiStyle::FormatList &formatList);
+QDataStream &operator>>(QDataStream &in, UiStyle::FormatList &formatList);
+
+Q_DECLARE_METATYPE(UiStyle::FormatList);
+
#endif
#endif