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
e6e27651
Unverified
Commit
e6e27651
authored
Oct 30, 2020
by
Don Gagne
Committed by
GitHub
Oct 30, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix filter dialog clipping (#9152)
parent
bd757cb3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
46 additions
and
62 deletions
+46
-62
AppMessages.qml
src/QmlControls/AppMessages.qml
+46
-62
No files found.
src/QmlControls/AppMessages.qml
View file @
e6e27651
...
...
@@ -27,75 +27,59 @@ Item {
property
bool
loaded
:
false
Component
{
id
:
filtersDialogComponent
QGCViewDialog
{
QGCFlickable
{
anchors.fill
:
parent
contentHeight
:
categoryColumn
.
height
clip
:
true
ColumnLayout
{
anchors.fill
:
parent
RowLayout
{
spacing
:
ScreenTools
.
defaultFontPixelHeight
/
2
Layout.alignment
:
Qt
.
AlignVCenter
Layout.fillHeight
:
true
Layout.fillWidth
:
true
id
:
filtersPopupDialog
QGCLabel
{
text
:
qsTr
(
"
Search:
"
)
}
QGCPopupDialog
{
title
:
qsTr
(
"
Turn on logging categories
"
)
buttons
:
StandardButton
.
Close
QGCTextField
{
id
:
searchText
text
:
""
Layout.fillWidth
:
true
enabled
:
true
}
ColumnLayout
{
RowLayout
{
spacing
:
ScreenTools
.
defaultFontPixelHeight
/
2
Layout.fillWidth
:
true
QGCButton
{
text
:
qsTr
(
"
Clear
"
)
onClicked
:
searchText
.
text
=
""
}
QGCLabel
{
text
:
qsTr
(
"
Search:
"
)
}
QGCTextField
{
id
:
searchText
text
:
""
Layout.fillWidth
:
true
enabled
:
true
}
Row
{
spacing
:
ScreenTools
.
defaultFontPixelHeight
/
2
QGCButton
{
text
:
qsTr
(
"
Clear All
"
)
onClicked
:
categoryRepeater
.
setAllLogs
(
false
)
QGCButton
{
text
:
qsTr
(
"
Clear
"
)
onClicked
:
searchText
.
text
=
""
}
}
QGCButton
{
text
:
qsTr
(
"
Clear All
"
)
onClicked
:
categoryRepeater
.
setAllLogs
(
false
)
}
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
()
}
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
()
}
}
QGCCheckBox
{
text
:
modelData
visible
:
searchText
.
text
?
text
.
match
(
`(
${
searchText
.
text
}
)`
,
"
i
"
)
:
true
checked
:
QGroundControl
.
categoryLoggingOn
(
modelData
)
onClicked
:
{
QGroundControl
.
setCategoryLoggingOn
(
modelData
,
checked
)
QGroundControl
.
updateLoggingFilterRules
()
}
}
}
...
...
@@ -225,7 +209,7 @@ Item {
anchors.bottom
:
parent
.
bottom
anchors.right
:
parent
.
right
text
:
qsTr
(
"
Set Logging
"
)
onClicked
:
mainWindow
.
show
ComponentDialog
(
filtersDialogComponent
,
qsTr
(
"
Turn on logging categories
"
),
mainWindow
.
showDialogDefaultWidth
,
StandardButton
.
Close
)
onClicked
:
mainWindow
.
show
PopupDialogFromComponent
(
filtersPopupDialog
)
}
}
}
...
...
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