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
cbb898fb
Commit
cbb898fb
authored
May 01, 2017
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Mobile support both .plan and .mission loading
parent
f17a103b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
3 deletions
+21
-3
PlanView.qml
src/PlanView/PlanView.qml
+2
-1
QGCFileDialog.qml
src/QmlControls/QGCFileDialog.qml
+19
-2
No files found.
src/PlanView/PlanView.qml
View file @
cbb898fb
...
...
@@ -231,7 +231,8 @@ QGCView {
id
:
fileDialog
qgcView
:
_qgcView
folder
:
QGroundControl
.
settingsManager
.
appSettings
.
missionSavePath
fileExtension
:
masterController
.
fileExtension
fileExtension
:
QGroundControl
.
settingsManager
.
appSettings
.
planFileExtension
fileExtension2
:
QGroundControl
.
settingsManager
.
appSettings
.
missionFileExtension
onAcceptedForSave
:
{
masterController
.
saveToFile
(
file
)
...
...
src/QmlControls/QGCFileDialog.qml
View file @
cbb898fb
...
...
@@ -18,6 +18,7 @@ Item {
property
string
folder
property
var
nameFilters
property
string
fileExtension
property
string
fileExtension2
property
string
title
property
bool
selectExisting
property
bool
selectFolder
...
...
@@ -90,7 +91,7 @@ Item {
spacing
:
ScreenTools
.
defaultFontPixelHeight
/
2
Repeater
{
id
:
fileList
;
id
:
fileList
model
:
controller
.
getFiles
(
folder
,
fileExtension
)
QGCButton
{
...
...
@@ -105,9 +106,25 @@ Item {
}
}
Repeater
{
id
:
fileList2
model
:
fileExtension2
==
""
?
[
]
:
controller
.
getFiles
(
folder
,
fileExtension2
)
QGCButton
{
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
text
:
modelData
onClicked
:
{
hideDialog
()
_root
.
acceptedForLoad
(
controller
.
fullyQualifiedFilename
(
folder
,
modelData
,
fileExtension2
))
}
}
}
QGCLabel
{
text
:
qsTr
(
"
No files
"
)
visible
:
fileList
.
model
.
length
==
0
visible
:
fileList
.
model
.
length
==
0
&&
fileList2
.
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