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
98f34318
Unverified
Commit
98f34318
authored
Apr 24, 2020
by
Don Gagne
Committed by
GitHub
Apr 24, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8679 from patrickelectric/improve_log_ui
Improve category log menu
parents
63f15c94
7b1ea757
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
61 additions
and
24 deletions
+61
-24
AppMessages.qml
src/QmlControls/AppMessages.qml
+61
-24
No files found.
src/QmlControls/AppMessages.qml
View file @
98f34318
...
...
@@ -11,6 +11,7 @@ import QtQuick 2.3
import
QtQuick
.
Controls
1.2
import
QtQuick
.
Controls
.
Styles
1.4
import
QtQuick
.
Dialogs
1.2
import
QtQuick
.
Layouts
1.12
import
QGroundControl
1.0
import
QGroundControl
.
Palette
1.0
...
...
@@ -29,35 +30,71 @@ Item {
id
:
filtersDialogComponent
QGCViewDialog
{
QGCFlickable
{
anchors.fill
:
parent
anchors.fill
:
parent
contentHeight
:
categoryColumn
.
height
clip
:
true
Column
{
id
:
categoryColumn
spacing
:
ScreenTools
.
defaultFontPixelHeight
/
2
QGCButton
{
text
:
qsTr
(
"
Clear All
"
)
onClicked
:
{
var
logCats
=
QGroundControl
.
loggingCategories
()
for
(
var
i
=
0
;
i
<
logCats
.
length
;
i
++
)
{
QGroundControl
.
setCategoryLoggingOn
(
logCats
[
i
],
false
)
}
QGroundControl
.
updateLoggingFilterRules
()
categoryRepeater
.
model
=
undefined
categoryRepeater
.
model
=
QGroundControl
.
loggingCategories
()
ColumnLayout
{
anchors.fill
:
parent
RowLayout
{
spacing
:
ScreenTools
.
defaultFontPixelHeight
/
2
Layout.alignment
:
Qt
.
AlignVCenter
Layout.fillHeight
:
true
Layout.fillWidth
:
true
QGCLabel
{
text
:
qsTr
(
"
Search:
"
)
}
QGCTextField
{
id
:
searchText
text
:
""
Layout.fillWidth
:
true
enabled
:
true
}
QGCButton
{
text
:
qsTr
(
"
Clear
"
)
onClicked
:
searchText
.
text
=
""
}
}
Repeater
{
id
:
categoryRepeater
model
:
QGroundControl
.
loggingCategories
()
QGCCheckBox
{
text
:
modelData
checked
:
QGroundControl
.
categoryLoggingOn
(
modelData
)
onClicked
:
{
QGroundControl
.
setCategoryLoggingOn
(
modelData
,
checked
)
Row
{
spacing
:
ScreenTools
.
defaultFontPixelHeight
/
2
QGCButton
{
text
:
qsTr
(
"
Clear All
"
)
onClicked
:
categoryRepeater
.
setAllLogs
(
false
)
}
}
Column
{
id
:
categoryColumn
spacing
:
ScreenTools
.
defaultFontPixelHeight
/
2
Repeater
{
id
:
categoryRepeater
model
:
QGroundControl
.
loggingCategories
()
function
setAllLogs
(
value
)
{
var
logCategories
=
QGroundControl
.
loggingCategories
()
for
(
var
category
of
logCategories
)
{
QGroundControl
.
setCategoryLoggingOn
(
category
,
value
)
}
QGroundControl
.
updateLoggingFilterRules
()
// Update model for repeater
categoryRepeater
.
model
=
undefined
categoryRepeater
.
model
=
QGroundControl
.
loggingCategories
()
}
QGCCheckBox
{
text
:
modelData
visible
:
searchText
.
text
?
text
.
match
(
`(
${
searchText
.
text
}
)`
,
"
i
"
)
:
true
checked
:
QGroundControl
.
categoryLoggingOn
(
modelData
)
onClicked
:
{
QGroundControl
.
setCategoryLoggingOn
(
modelData
,
checked
)
QGroundControl
.
updateLoggingFilterRules
()
}
}
}
}
...
...
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