Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 11, 2025

🦟 Bug fix

Fixes #

Summary

Previous filter configuration of Open file dialog requires from user to pick an exact file format to open file. I guess it shouldn't ask user to do it. Instead it should have all supported formats (from MeshManager in gz-common repo) in one preset.
Also improved error state notification and minor spelling fixes

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers
  • Was GenAI used to generate this PR? If so, make sure to add "Generated-by" to your commits. (See this policy for more info.)

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by and Generated-by messages.


This is an automatic backport of pull request #3167 done by Mergify.

@mergify mergify bot added the conflicts label Nov 11, 2025
@mergify mergify bot requested a review from arjo129 as a code owner November 11, 2025 17:48
@mergify
Copy link
Contributor Author

mergify bot commented Nov 11, 2025

Cherry-pick of 2d4d4f7 has failed:

On branch mergify/bp/gz-sim9/pr-3167
Your branch is up to date with 'origin/gz-sim9'.

You are currently cherry-picking commit 2d4d4f70.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/gui/plugins/component_inspector/ComponentInspector.hh
	modified:   src/gui/plugins/component_inspector_editor/ComponentInspectorEditor.cc
	modified:   src/gui/plugins/component_inspector_editor/ComponentInspectorEditor.hh
	modified:   src/gui/plugins/entity_tree/EntityTree.cc
	modified:   src/gui/plugins/video_recorder/VideoRecorder.qml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/gui/plugins/component_inspector_editor/ComponentInspectorEditor.qml
	both modified:   src/gui/plugins/entity_tree/EntityTree.qml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Signed-off-by: Maksim Derbasov <[email protected]>
Co-authored-by: Addisu Z. Taddese <[email protected]>
(cherry picked from commit 2d4d4f7)
Signed-off-by: Ian Chen <[email protected]>
@iche033 iche033 force-pushed the mergify/bp/gz-sim9/pr-3167 branch from b6c02e1 to 814cd89 Compare November 11, 2025 17:56
@github-project-automation github-project-automation bot moved this from Inbox to In review in Core development Nov 11, 2025
@iche033 iche033 merged commit 774575e into gz-sim9 Nov 11, 2025
13 of 14 checks passed
@iche033 iche033 deleted the mergify/bp/gz-sim9/pr-3167 branch November 11, 2025 22:41
@github-project-automation github-project-automation bot moved this from In review to Done in Core development Nov 11, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🏛️ ionic Gazebo Ionic

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants