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
d7234b8e
Commit
d7234b8e
authored
Nov 30, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use new QGCListView
Shows horizontal/vertical scroll indicators
parent
1c7174f2
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 @
d7234b8e
...
@@ -65,6 +65,7 @@
...
@@ -65,6 +65,7 @@
<file alias="QGroundControl/Controls/QGCFlickableHorizontalIndicator.qml">src/QmlControls/QGCFlickableHorizontalIndicator.qml</file>
<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/QGCFlickableVerticalIndicator.qml">src/QmlControls/QGCFlickableVerticalIndicator.qml</file>
<file alias="QGroundControl/Controls/QGCLabel.qml">src/QmlControls/QGCLabel.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/QGCMobileFileDialog.qml">src/QmlControls/QGCMobileFileDialog.qml</file>
<file alias="QGroundControl/Controls/QGCMovableItem.qml">src/QmlControls/QGCMovableItem.qml</file>
<file alias="QGroundControl/Controls/QGCMovableItem.qml">src/QmlControls/QGCMovableItem.qml</file>
<file alias="QGroundControl/Controls/QGCPipable.qml">src/QmlControls/QGCPipable.qml</file>
<file alias="QGroundControl/Controls/QGCPipable.qml">src/QmlControls/QGCPipable.qml</file>
...
...
src/MissionEditor/MissionEditor.qml
View file @
d7234b8e
...
@@ -732,7 +732,7 @@ QGCView {
...
@@ -732,7 +732,7 @@ QGCView {
onWheel
:
wheel
.
accepted
=
true
onWheel
:
wheel
.
accepted
=
true
}
}
ListView
{
QGC
ListView
{
id
:
missionItemEditorListView
id
:
missionItemEditorListView
anchors.left
:
parent
.
left
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
anchors.right
:
parent
.
right
...
@@ -766,7 +766,7 @@ QGCView {
...
@@ -766,7 +766,7 @@ QGCView {
onMoveHomeToMapCenter
:
_visualItems
.
get
(
0
).
coordinate
=
editorMap
.
center
onMoveHomeToMapCenter
:
_visualItems
.
get
(
0
).
coordinate
=
editorMap
.
center
}
}
}
// ListView
}
//
QGC
ListView
}
// Item - Mission Item editor
}
// Item - Mission Item editor
// GeoFence Editor
// GeoFence Editor
...
...
src/MissionEditor/MissionItemStatus.qml
View file @
d7234b8e
...
@@ -111,7 +111,7 @@ Rectangle {
...
@@ -111,7 +111,7 @@ Rectangle {
QGCLabel
{
text
:
_azimuthText
}
QGCLabel
{
text
:
_azimuthText
}
}
}
ListView
{
QGC
ListView
{
id
:
statusListView
id
:
statusListView
model
:
missionItems
model
:
missionItems
highlightMoveDuration
:
250
highlightMoveDuration
:
250
...
...
src/QmlControls/AppMessages.qml
View file @
d7234b8e
...
@@ -96,7 +96,7 @@ QGCView {
...
@@ -96,7 +96,7 @@ QGCView {
}
}
}
}
ListView
{
QGC
ListView
{
Component.onCompleted
:
{
Component.onCompleted
:
{
loaded
=
true
loaded
=
true
}
}
...
...
src/QmlControls/MissionCommandDialog.qml
View file @
d7234b8e
...
@@ -51,7 +51,7 @@ QGCViewDialog {
...
@@ -51,7 +51,7 @@ QGCViewDialog {
onActivated
:
categorySelected
(
textAt
(
index
))
onActivated
:
categorySelected
(
textAt
(
index
))
}
}
ListView
{
QGC
ListView
{
id
:
commandList
id
:
commandList
anchors.margins
:
ScreenTools
.
defaultFontPixelHeight
anchors.margins
:
ScreenTools
.
defaultFontPixelHeight
anchors.left
:
parent
.
left
anchors.left
:
parent
.
left
...
@@ -101,5 +101,5 @@ QGCViewDialog {
...
@@ -101,5 +101,5 @@ QGCViewDialog {
}
}
}
}
}
}
}
// ListView
}
//
QGC
ListView
}
// QGCViewDialog
}
// QGCViewDialog
src/QmlControls/ParameterEditor.qml
View file @
d7234b8e
...
@@ -180,7 +180,7 @@ QGCView {
...
@@ -180,7 +180,7 @@ QGCView {
}
}
/// Parameter list
/// Parameter list
ListView
{
QGC
ListView
{
id
:
editorListView
id
:
editorListView
anchors.leftMargin
:
ScreenTools
.
defaultFontPixelWidth
anchors.leftMargin
:
ScreenTools
.
defaultFontPixelWidth
anchors.left
:
_searchFilter
?
parent
.
left
:
groupScroll
.
right
anchors.left
:
_searchFilter
?
parent
.
left
:
groupScroll
.
right
...
...
src/QmlControls/QGCFlickable.qml
View file @
d7234b8e
import
QtQuick
2.5
import
QtQuick
2.5
import
QGroundControl
.
Palette
1.0
import
QGroundControl
.
Palette
1.0
import
QGroundControl
.
ScreenTools
1.0
/// QGC version of Flickable control that shows horizontal/vertial scroll indicators
Flickable
{
Flickable
{
id
:
root
id
:
root
boundsBehavior
:
Flickable
.
StopAtBounds
boundsBehavior
:
Flickable
.
StopAtBounds
...
...
src/QmlControls/QGCListView.qml
0 → 100644
View file @
d7234b8e
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 @
d7234b8e
...
@@ -96,7 +96,7 @@ QGCViewDialog {
...
@@ -96,7 +96,7 @@ QGCViewDialog {
anchors.margins
:
_margins
anchors.margins
:
_margins
anchors.fill
:
parent
anchors.fill
:
parent
ListView
{
QGC
ListView
{
anchors.fill
:
parent
anchors.fill
:
parent
spacing
:
_margins
/
2
spacing
:
_margins
/
2
orientation
:
ListView
.
Vertical
orientation
:
ListView
.
Vertical
...
...
src/QmlControls/QGroundControl.Controls.qmldir
View file @
d7234b8e
...
@@ -27,6 +27,7 @@ QGCColoredImage 1.0 QGCColoredImage.qml
...
@@ -27,6 +27,7 @@ QGCColoredImage 1.0 QGCColoredImage.qml
QGCComboBox 1.0 QGCComboBox.qml
QGCComboBox 1.0 QGCComboBox.qml
QGCFlickable 1.0 QGCFlickable.qml
QGCFlickable 1.0 QGCFlickable.qml
QGCLabel 1.0 QGCLabel.qml
QGCLabel 1.0 QGCLabel.qml
QGCListView 1.0 QGCListView.qml
QGCMobileFileDialog 1.0 QGCMobileFileDialog.qml
QGCMobileFileDialog 1.0 QGCMobileFileDialog.qml
QGCMovableItem 1.0 QGCMovableItem.qml
QGCMovableItem 1.0 QGCMovableItem.qml
QGCPipable 1.0 QGCPipable.qml
QGCPipable 1.0 QGCPipable.qml
...
...
src/ui/preferences/MavlinkSettings.qml
View file @
d7234b8e
...
@@ -340,7 +340,7 @@ Rectangle {
...
@@ -340,7 +340,7 @@ Rectangle {
color
:
qgcPal
.
window
color
:
qgcPal
.
window
border.color
:
qgcPal
.
text
border.color
:
qgcPal
.
text
border.width
:
0.5
border.width
:
0.5
ListView
{
QGC
ListView
{
width
:
ScreenTools
.
defaultFontPixelWidth
*
56
width
:
ScreenTools
.
defaultFontPixelWidth
*
56
height
:
ScreenTools
.
defaultFontPixelHeight
*
12
height
:
ScreenTools
.
defaultFontPixelHeight
*
12
anchors.centerIn
:
parent
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