smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6664 from symless/issue-6663-clear-log

Browse source 
Limited the log in the GUI to 10,000 lines to prevent RAM hogging
This commit is contained in:
Jnewbon 2020-04-20 13:52:13 +01:00 committed by GitHub
commit 0e76ba898a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
azure-pipelines.yml
View file

@ -34,7 +34,7 @@ jobs:
ubuntu18: ubuntu18:
image: symless/ubuntu-sudo:18.04 image: symless/ubuntu-sudo:18.04
ubuntu19: ubuntu19:
image: symless/ubuntu-sudo:19.04 image: symless/ubuntu-sudo:19.10
container: $[ variables['image'] ] container: $[ variables['image'] ]

2
src/gui/src/MainWindow.cpp
View file

@ -460,7 +460,7 @@ void MainWindow::appendLogRaw(const QString& text)
continue; continue;
} }
m_pLogOutput->append(line); m_pLogOutput->appendPlainText(line);
updateFromLogLine(line); updateFromLogLine(line);
} }
} }

7
src/gui/src/MainWindowBase.ui
View file

@ -439,7 +439,7 @@
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QTextEdit" name="m_pLogOutput"> <widget class="QPlainTextEdit" name="m_pLogOutput">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -458,11 +458,14 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="lineWrapMode"> <property name="lineWrapMode">
<enum>QTextEdit::NoWrap</enum> <enum>QPlainTextEdit::NoWrap</enum>
</property> </property>
<property name="readOnly"> <property name="readOnly">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="maximumBlockCount">
<number>10000</number>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>