Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
753f36a0
Unverified
Commit
753f36a0
authored
Oct 20, 2019
by
Gus Grubba
Committed by
GitHub
Oct 20, 2019
Browse files
Merge pull request #7939 from mavlink/pr_link_name
Persist link name when switching types.
parents
97a9a79a
55175ff0
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/comm/LinkManager.cc
View file @
753f36a0
...
@@ -762,6 +762,7 @@ bool LinkManager::endConfigurationEditing(LinkConfiguration* config, LinkConfigu
...
@@ -762,6 +762,7 @@ bool LinkManager::endConfigurationEditing(LinkConfiguration* config, LinkConfigu
saveLinkConfigurationList
();
saveLinkConfigurationList
();
// Tell link about changes (if any)
// Tell link about changes (if any)
config
->
updateSettings
();
config
->
updateSettings
();
emit
config
->
nameChanged
(
config
->
name
());
// Discard temporary duplicate
// Discard temporary duplicate
delete
editedConfig
;
delete
editedConfig
;
}
else
{
}
else
{
...
...
src/ui/preferences/LinkSettings.qml
View file @
753f36a0
...
@@ -67,7 +67,6 @@ Rectangle {
...
@@ -67,7 +67,6 @@ Rectangle {
text
:
object
.
name
text
:
object
.
name
exclusiveGroup
:
linkGroup
exclusiveGroup
:
linkGroup
visible
:
!
object
.
dynamic
visible
:
!
object
.
dynamic
onClicked
:
{
onClicked
:
{
checked
=
true
checked
=
true
_currentSelection
=
object
_currentSelection
=
object
...
@@ -275,7 +274,7 @@ Rectangle {
...
@@ -275,7 +274,7 @@ Rectangle {
linkSettingLoader
.
source
=
""
linkSettingLoader
.
source
=
""
linkSettingLoader
.
visible
=
false
linkSettingLoader
.
visible
=
false
// Save current name
// Save current name
var
name
=
editConfig
.
name
var
name
=
nameField
.
text
// Discard link configuration (old type)
// Discard link configuration (old type)
QGroundControl
.
linkManager
.
cancelConfigurationEditing
(
editConfig
)
QGroundControl
.
linkManager
.
cancelConfigurationEditing
(
editConfig
)
// Create new link configuration
// Create new link configuration
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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