Skip to content
Snippets Groups Projects
Verified Commit 0bec1e2e authored by Burak Hançerli's avatar Burak Hançerli :headphones:
Browse files

fix: popup related issues

parent 7cbd9864
No related branches found
No related tags found
1 merge request!64QDS-14321 Async project receive
Pipeline #77737 passed
......@@ -132,6 +132,8 @@ Rectangle {
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.right: parent.right
from: 0
to: 100
height: 2
visible: true
indeterminate: true
......@@ -157,19 +159,16 @@ Rectangle {
}
function onPopupChangeText(text, timeout) {
console.log("Popup text changed", text)
popupText.text = text
timer.interval = timeout
timer.running = timeout <= 0
timer.running = timeout > 0
}
function onPopupChangeProgress(percentage){
console.log("Popup progress changed", percentage)
progressBar.value = percentage
}
function onPopupProgressIndeterminateChanged(indeterminate) {
console.log("Popup progress changed", indeterminate)
progressBar.indeterminate = indeterminate
}
}
......
......@@ -144,8 +144,6 @@ void Backend::initProjectManager()
Qt::QueuedConnection,
Q_ARG(QString, m_lastProjectSenderId));
});
updatePopupText("Initializing Project Manager...");
}
void Backend::initDsManager()
......@@ -166,6 +164,7 @@ void Backend::initDsManager()
if (id == m_lastProjectSenderId) {
QMetaObject::invokeMethod(m_projectManager.get(), "stopProject");
}
emit popupClose();
});
connect(m_dsManager.get(), &DesignStudioManager::allDesignStudiosDisconnected, this, [this] {
......@@ -215,7 +214,6 @@ void Backend::runProject(const QString &id, const QByteArray &projectData)
// we'll use this to notify the correct DS when the project started/stopped
m_lastProjectSenderId = id;
QMetaObject::invokeMethod(m_dsManager.get(), "sendProjectRunning", Q_ARG(QString, id));
bool retVal;
QMetaObject::invokeMethod(m_projectManager.get(),
"runProject",
......@@ -223,9 +221,9 @@ void Backend::runProject(const QString &id, const QByteArray &projectData)
Q_ARG(QByteArray, projectData),
Q_ARG(bool, autoScaleProject()));
if (!retVal) {
if (!retVal)
QMetaObject::invokeMethod(m_dsManager.get(), "sendProjectStopped", Q_ARG(QString, id));
}
emit popupClose();
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment