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
957e2f3b
Commit
957e2f3b
authored
Dec 30, 2017
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix dynamic file extension changing
Don't close mobile dialog on file delete
parent
fc8c0d7f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
10 deletions
+11
-10
QGCFileDialog.qml
src/QmlControls/QGCFileDialog.qml
+11
-10
No files found.
src/QmlControls/QGCFileDialog.qml
View file @
957e2f3b
...
...
@@ -17,8 +17,8 @@ Item {
property
var
qgcView
property
string
folder
property
var
nameFilters
property
string
fileExtension
// Primary file extension to search for
property
string
fileExtension2
// Secondary file extension to search for
property
string
fileExtension
// Primary file extension to search for
property
string
fileExtension2
:
""
// Secondary file extension to search for
property
string
title
property
bool
selectExisting
property
bool
selectFolder
...
...
@@ -28,12 +28,16 @@ Item {
property
bool
_mobileDlg
:
QGroundControl
.
corePlugin
.
options
.
useMobileFileDialog
property
var
_rgExtensions
Component.onCompleted
:
{
if
(
fileExtension2
===
""
)
{
Component.onCompleted
:
setupFileExtensions
()
onFileExtensionChanged
:
setupFileExtensions
()
onFileExtension2Changed
:
setupFileExtensions
()
function
setupFileExtensions
()
{
if
(
fileExtension2
==
""
)
{
_rgExtensions
=
[
fileExtension
]
}
else
{
_rgExtensions
=
[
fileExtension
,
fileExtension2
]
}
}
...
...
@@ -128,10 +132,7 @@ Item {
property
string
fileToDelete
onAboutToHide
:
{
fileButton
.
highlight
=
false
hideDialog
()
}
onAboutToHide
:
fileButton
.
highlight
=
false
MenuItem
{
text
:
qsTr
(
"
Delete
"
)
...
...
@@ -143,7 +144,7 @@ Item {
QGCLabel
{
text
:
qsTr
(
"
No files
"
)
visible
:
fileList
.
model
.
length
==
0
&&
fileList2
.
model
.
length
==
0
visible
:
fileList
.
model
.
length
==
0
}
}
}
...
...
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