Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Qt UI Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Design Studio
QML Viewer Projects
Qt UI Viewer
Commits
0bec1e2e
Verified
Commit
0bec1e2e
authored
6 months ago
by
Burak Hançerli
Browse files
Options
Downloads
Patches
Plain Diff
fix: popup related issues
parent
7cbd9864
No related branches found
No related tags found
1 merge request
!64
QDS-14321 Async project receive
Pipeline
#77737
passed
6 months ago
Stage: build
Stage: test
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Main.qml
+3
-4
3 additions, 4 deletions
src/Main.qml
src/backend/backend.cpp
+3
-5
3 additions, 5 deletions
src/backend/backend.cpp
with
6 additions
and
9 deletions
src/Main.qml
+
3
−
4
View file @
0bec1e2e
...
...
@@ -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
}
}
...
...
This diff is collapsed.
Click to expand it.
src/backend/backend.cpp
+
3
−
5
View file @
0bec1e2e
...
...
@@ -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
();
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment