mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 21:33:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

QML UI: Show log correctly

Browse source 
Correctly show the log messages. The log window will display all
messages emitted by the QML Manager class.

Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com>
This commit is contained in:
Grace Karanja 2015-08-20 12:08:59 +03:00 • committed by Dirk Hohndel
parent cd28082c39
commit 56771159a8
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
qt-mobile/Log.qml
View file

@ -10,19 +10,28 @@ import org.subsurfacedivelog.mobile 1.0
Item {
id: logWindow
width: parent.width
height: parent.height
objectName: "Log"
ColumnLayout {
width: parent.width
height: parent.height
spacing: 8
TopBar {
height: childrenRect.height
id: topBar
anchors.top: parent.top
}
TextEdit {
anchors.fill: height
text: manager.logText
Rectangle {
anchors.top: topBar.bottom
Layout.fillHeight: true
Layout.fillWidth: true
Text {
anchors.fill: parent
wrapMode: Text.WrapAnywhere
text: manager.logText
}
}
}
}

5
qt-mobile/qmlmanager.cpp
View file

@ -56,6 +56,7 @@ void QMLManager::savePreferences()
void QMLManager::loadDives()
{
showMessage("Loading dives...");
appendTextToLog("Loading dives...");
QString url;
if (getCloudURL(url)) {
showMessage(get_error_string());
@ -71,8 +72,10 @@ void QMLManager::loadDives()
showMessage(get_error_string());
appendTextToLog(get_error_string());
set_filename(fileNamePrt.data(), true);
appendTextToLog(fileNamePrt.data());
} else {
showMessage(get_error_string());
appendTextToLog(get_error_string());
}
process_dives(false, false);
@ -148,11 +151,13 @@ QString QMLManager::logText() const
void QMLManager::setLogText(const QString &logText)
{
m_logText = logText;
emit logTextChanged();
}
void QMLManager::appendTextToLog(const QString &newText)
{
m_logText += "\n" + newText;
emit logTextChanged();
}