Commit 38034f7a authored by Martin Straka's avatar Martin Straka

QML TextArea instead of Text

parent 95f93150
......@@ -81,11 +81,12 @@ Item {
Pane {
id: flickContent
anchors.fill: parent
Text {
TextArea {
id: logContent
color: datovkaPalette.text
anchors.fill: parent
textFormat: TextEdit.RichText
readOnly: true
wrapMode: Text.WordWrap
font.pointSize: textFontSizeSmall
}
......
......@@ -159,7 +159,7 @@ QString Files::loadLogContent(const QString &filePath)
debugFuncCall();
QString log;
log.append("<ul>");
//log.append("<ul>");
if (filePath.isEmpty()) {
MemoryLog *mLog = GlobInstcs::logPtr->memoryLog();
......@@ -170,8 +170,8 @@ QString Files::loadLogContent(const QString &filePath)
const QList<quint64> keys(mLog->keys());
foreach (quint64 key, keys) {
log.append("<li>");
log.append(mLog->message(key));
log.append("<br/>");
}
} else {
......@@ -186,13 +186,13 @@ QString Files::loadLogContent(const QString &filePath)
QTextStream in(&file);
while (!in.atEnd()) {
QString line = in.readLine();
log.append("<li>");
log.append(line);
log.append("<br/>");
}
file.close();
}
log.append("</ul>");
//log.append("</ul>");
return log;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment