Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
e660233e
Commit
e660233e
authored
Nov 09, 2018
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
parent
7bbadf68
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
9 deletions
+15
-9
ChangeLog.md
ChangeLog.md
+1
-0
QGCFileDialog.qml
src/QmlControls/QGCFileDialog.qml
+14
-9
No files found.
ChangeLog.md
View file @
e660233e
...
...
@@ -10,6 +10,7 @@ Note: This file only contains high level features or important fixes.
*
Structure Scan: Fix loading of structure scan height
*
ArduPilot: Fix location of planned home position when not connected to vehicle. Issue #6840.
*
Fix loading of parameters from multiple components. Would report download complete too early, thus missing all default component params.
*
Fix file delete in mobile file dialogs
### 3.4.4 - Stable
*
Stable desktop versions now inform user at boot if newer version is available.
...
...
src/QmlControls/QGCFileDialog.qml
View file @
e660233e
...
...
@@ -107,7 +107,7 @@ Item {
spacing
:
ScreenTools
.
defaultFontPixelHeight
/
2
Repeater
{
id
:
file
List
id
:
file
Repeater
model
:
controller
.
getFiles
(
folder
,
_rgExtensions
)
FileButton
{
...
...
@@ -136,7 +136,10 @@ Item {
MenuItem
{
text
:
qsTr
(
"
Delete
"
)
onTriggered
:
controller
.
deleteFile
(
hamburgerMenu
.
fileToDelete
);
onTriggered
:
{
controller
.
deleteFile
(
hamburgerMenu
.
fileToDelete
)
fileRepeater
.
model
=
controller
.
getFiles
(
folder
,
_rgExtensions
)
}
}
}
}
...
...
@@ -144,7 +147,7 @@ Item {
QGCLabel
{
text
:
qsTr
(
"
No files
"
)
visible
:
file
List
.
model
.
length
===
0
visible
:
file
Repeater
.
model
.
length
===
0
}
}
}
...
...
@@ -217,9 +220,11 @@ Item {
}
Repeater
{
model
:
controller
.
getFiles
(
folder
,
[
fileExtension
])
id
:
fileRepeater
model
:
controller
.
getFiles
(
folder
,
[
fileExtension
])
FileButton
{
id
:
fileButton
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
text
:
modelData
...
...
@@ -240,14 +245,14 @@ Item {
property
string
fileToDelete
onAboutToHide
:
{
fileButton
.
highlight
=
false
hideDialog
()
onAboutToHide
:
fileButton
.
highlight
=
false
}
MenuItem
{
text
:
qsTr
(
"
Delete
"
)
onTriggered
:
controller
.
deleteFile
(
hamburgerMenu
.
fileToDelete
);
onTriggered
:
{
controller
.
deleteFile
(
hamburgerMenu
.
fileToDelete
)
fileRepeater
.
model
=
controller
.
getFiles
(
folder
,
[
fileExtension
])
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment