3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-08-03 16:58:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

[ui] NodeLog: PySide2 5.11 compatibility fixes

Browse source 
* downgrade imports to work with versions prior to 5.12
* remove ES7 syntax
This commit is contained in:
Yann Lanthony 2019-05-09 18:18:48 +02:00
parent e40b0e57b8
commit 17556427fd
No known key found for this signature in database
GPG key ID: 519FAE6DF7A70642
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
meshroom/ui/qml/Controls/TextFileViewer.qml
View file

@ -1,6 +1,5 @@
import QtQuick 2.11
import QtQml.Models 2.11
import QtQuick.Controls 2.5
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.11
import MaterialIcons 2.2
@ -312,19 +311,22 @@ Item {
}
// Load current source file and update ListView's model
function loadSource(keepPosition = false)
function loadSource(keepPosition)
{
if(!visible)
return;
loading = true;
var xhr = new XMLHttpRequest;
xhr.open("GET", root.source);
xhr.onload = function() {
xhr.onreadystatechange = function() {
// - can't rely on 'Last-Modified' header response to verify
// that file has changed on disk (not always up-to-date)
// - instead, let QML engine evaluate whether 'text' property value has changed
textView.setText(xhr.status === 200 ? xhr.responseText : "", keepPosition);
loading = false;
if(xhr.readyState === XMLHttpRequest.DONE) {
textView.setText(xhr.status === 200 ? xhr.responseText : "", keepPosition);
loading = false;
}
};
xhr.send();
}

2
meshroom/ui/qml/GraphEditor/NodeLog.qml
View file

@ -1,4 +1,4 @@
import QtQuick 2.12
import QtQuick 2.11
import QtQuick.Controls 2.3
import QtQuick.Controls 1.4 as Controls1 // SplitView
import QtQuick.Layouts 1.3