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
2b990cc4
Commit
2b990cc4
authored
Dec 01, 2016
by
Don Gagne
Committed by
GitHub
Dec 01, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4272 from DonLakeFlyer/QGCListView
Use new QGCListView
parents
2d6f005d
d7234b8e
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
34 additions
and
12 deletions
+34
-12
qgroundcontrol.qrc
qgroundcontrol.qrc
+1
-0
MissionEditor.qml
src/MissionEditor/MissionEditor.qml
+2
-2
MissionItemStatus.qml
src/MissionEditor/MissionItemStatus.qml
+1
-1
AppMessages.qml
src/QmlControls/AppMessages.qml
+1
-1
MissionCommandDialog.qml
src/QmlControls/MissionCommandDialog.qml
+2
-2
ParameterEditor.qml
src/QmlControls/ParameterEditor.qml
+1
-1
QGCFlickable.qml
src/QmlControls/QGCFlickable.qml
+3
-3
QGCListView.qml
src/QmlControls/QGCListView.qml
+20
-0
QGCMobileFileDialog.qml
src/QmlControls/QGCMobileFileDialog.qml
+1
-1
QGroundControl.Controls.qmldir
src/QmlControls/QGroundControl.Controls.qmldir
+1
-0
MavlinkSettings.qml
src/ui/preferences/MavlinkSettings.qml
+1
-1
No files found.
qgroundcontrol.qrc
View file @
2b990cc4
...
...
@@ -65,6 +65,7 @@
<file alias="QGroundControl/Controls/QGCFlickableHorizontalIndicator.qml">src/QmlControls/QGCFlickableHorizontalIndicator.qml</file>
<file alias="QGroundControl/Controls/QGCFlickableVerticalIndicator.qml">src/QmlControls/QGCFlickableVerticalIndicator.qml</file>
<file alias="QGroundControl/Controls/QGCLabel.qml">src/QmlControls/QGCLabel.qml</file>
<file alias="QGroundControl/Controls/QGCListView.qml">src/QmlControls/QGCListView.qml</file>
<file alias="QGroundControl/Controls/QGCMobileFileDialog.qml">src/QmlControls/QGCMobileFileDialog.qml</file>
<file alias="QGroundControl/Controls/QGCMovableItem.qml">src/QmlControls/QGCMovableItem.qml</file>
<file alias="QGroundControl/Controls/QGCPipable.qml">src/QmlControls/QGCPipable.qml</file>
...
...
src/MissionEditor/MissionEditor.qml
View file @
2b990cc4
...
...
@@ -732,7 +732,7 @@ QGCView {
onWheel
:
wheel
.
accepted
=
true
}
ListView
{
QGC
ListView
{
id
:
missionItemEditorListView
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
...
...
@@ -766,7 +766,7 @@ QGCView {
onMoveHomeToMapCenter
:
_visualItems
.
get
(
0
).
coordinate
=
editorMap
.
center
}
}
// ListView
}
//
QGC
ListView
}
// Item - Mission Item editor
// GeoFence Editor
...
...
src/MissionEditor/MissionItemStatus.qml
View file @
2b990cc4
...
...
@@ -112,7 +112,7 @@ Rectangle {
QGCLabel
{
text
:
_azimuthText
}
}
ListView
{
QGC
ListView
{
id
:
statusListView
model
:
missionItems
highlightMoveDuration
:
250
...
...
src/QmlControls/AppMessages.qml
View file @
2b990cc4
...
...
@@ -96,7 +96,7 @@ QGCView {
}
}
ListView
{
QGC
ListView
{
Component.onCompleted
:
{
loaded
=
true
}
...
...
src/QmlControls/MissionCommandDialog.qml
View file @
2b990cc4
...
...
@@ -51,7 +51,7 @@ QGCViewDialog {
onActivated
:
categorySelected
(
textAt
(
index
))
}
ListView
{
QGC
ListView
{
id
:
commandList
anchors.margins
:
ScreenTools
.
defaultFontPixelHeight
anchors.left
:
parent
.
left
...
...
@@ -101,5 +101,5 @@ QGCViewDialog {
}
}
}
}
// ListView
}
//
QGC
ListView
}
// QGCViewDialog
src/QmlControls/ParameterEditor.qml
View file @
2b990cc4
...
...
@@ -180,7 +180,7 @@ QGCView {
}
/// Parameter list
ListView
{
QGC
ListView
{
id
:
editorListView
anchors.leftMargin
:
ScreenTools
.
defaultFontPixelWidth
anchors.left
:
_searchFilter
?
parent
.
left
:
groupScroll
.
right
...
...
src/QmlControls/QGCFlickable.qml
View file @
2b990cc4
import
QtQuick
2.5
import
QtQuick
2.5
import
QGroundControl
.
Palette
1.0
import
QGroundControl
.
ScreenTools
1.0
import
QGroundControl
.
Palette
1.0
/// QGC version of Flickable control that shows horizontal/vertial scroll indicators
Flickable
{
id
:
root
boundsBehavior
:
Flickable
.
StopAtBounds
...
...
src/QmlControls/QGCListView.qml
0 → 100644
View file @
2b990cc4
import
QtQuick
2.5
import
QGroundControl
.
Palette
1.0
/// QGC version of ListVIew control that shows horizontal/vertial scroll indicators
ListView
{
id
:
root
boundsBehavior
:
Flickable
.
StopAtBounds
property
color
indicatorColor
:
qgcPal
.
text
QGCPalette
{
id
:
qgcPal
;
colorGroupEnabled
:
enabled
}
Component.onCompleted
:
{
var
indicatorComponent
=
Qt
.
createComponent
(
"
QGCFlickableVerticalIndicator.qml
"
)
indicatorComponent
.
createObject
(
root
)
indicatorComponent
=
Qt
.
createComponent
(
"
QGCFlickableHorizontalIndicator.qml
"
)
indicatorComponent
.
createObject
(
root
)
}
}
src/QmlControls/QGCMobileFileDialog.qml
View file @
2b990cc4
...
...
@@ -96,7 +96,7 @@ QGCViewDialog {
anchors.margins
:
_margins
anchors.fill
:
parent
ListView
{
QGC
ListView
{
anchors.fill
:
parent
spacing
:
_margins
/
2
orientation
:
ListView
.
Vertical
...
...
src/QmlControls/QGroundControl.Controls.qmldir
View file @
2b990cc4
...
...
@@ -27,6 +27,7 @@ QGCColoredImage 1.0 QGCColoredImage.qml
QGCComboBox 1.0 QGCComboBox.qml
QGCFlickable 1.0 QGCFlickable.qml
QGCLabel 1.0 QGCLabel.qml
QGCListView 1.0 QGCListView.qml
QGCMobileFileDialog 1.0 QGCMobileFileDialog.qml
QGCMovableItem 1.0 QGCMovableItem.qml
QGCPipable 1.0 QGCPipable.qml
...
...
src/ui/preferences/MavlinkSettings.qml
View file @
2b990cc4
...
...
@@ -340,7 +340,7 @@ Rectangle {
color
:
qgcPal
.
window
border.color
:
qgcPal
.
text
border.width
:
0.5
ListView
{
QGC
ListView
{
width
:
ScreenTools
.
defaultFontPixelWidth
*
56
height
:
ScreenTools
.
defaultFontPixelHeight
*
12
anchors.centerIn
:
parent
...
...
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