Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,20 @@ on:
- 'main'

jobs:

pre-commit:
name: Pre-commit
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v5

- name: Run pre-commit
uses: pre-commit/action@v3.0.1

jammy-ci:
runs-on: ubuntu-latest
name: Ubuntu Jammy CI
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/triage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ jobs:
with:
project-url: https://github.com/orgs/gazebosim/projects/7
github-token: ${{ secrets.TRIAGE_TOKEN }}

12 changes: 12 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v5.0.0
hooks:
- id: check-added-large-files
args: ['--maxkb=500']
- id: check-merge-conflict
- id: check-xml
- id: check-yaml
- id: end-of-file-fixer
- id: mixed-line-ending
- id: trailing-whitespace
2 changes: 0 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -174,5 +174,3 @@
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS


1 change: 0 additions & 1 deletion Migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,3 @@ release will remove the deprecated code.
## Gazebo GUI 0.1.0 to 1.0.0

* Gazebo GUI v1 uses QtQuick and it is not compatible with v0, which uses QWidgets.

2 changes: 1 addition & 1 deletion doc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ if (DOXYGEN_FOUND)

COMMENT "Generating API documentation with Doxygen" VERBATIM)

install(FILES ${CMAKE_BINARY_DIR}/doc/${PROJECT_NAME_LOWER}.tag.xml
install(FILES ${CMAKE_BINARY_DIR}/doc/${PROJECT_NAME_LOWER}.tag.xml
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/gz/${PROJECT_NAME_LOWER}_${PROJECT_VERSION_MINOR})
endif()
1 change: 0 additions & 1 deletion examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ command line tool, or used by standalone applications.

Example configuration files which can be used with Gazebo GUI's command
line tool or with standalone applications

1 change: 0 additions & 1 deletion examples/config/dialog_on_exit_shutdown.config
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@
<property type="int" key="width">240</property>
</gz-gui>
</plugin>

6 changes: 3 additions & 3 deletions examples/config/keypublisher.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>

<plugin filename="KeyPublisher">
</plugin>

<plugin filename="TopicEcho">
</plugin>
</plugin>
1 change: 0 additions & 1 deletion examples/config/scroll.config
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,3 @@
<property type="int" key="width">250</property>
</gz-gui>
</plugin>

1 change: 0 additions & 1 deletion examples/config/time.config
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,3 @@
<iterations>true</iterations>
<topic>/world_stats</topic>
</plugin>

1 change: 0 additions & 1 deletion examples/plugin/multiple_qml/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,3 @@ Quickly check try your plugin as follows:

cd build
export GZ_GUI_PLUGIN_PATH=`pwd`; gz gui -s MultipleQml

1 change: 0 additions & 1 deletion examples/standalone/dialogs/dialogs.cc
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,3 @@ int main(int _argc, char **_argv)

return 0;
}

1 change: 0 additions & 1 deletion examples/standalone/start_dialog/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,3 @@ add_executable(${EXEC_NAME}
target_link_libraries(${EXEC_NAME}
gz-gui${GZ_GUI_VER}::gz-gui${GZ_GUI_VER}
)

1 change: 0 additions & 1 deletion examples/standalone/start_dialog/start_dialog.cc
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,3 @@ int main(int _argc, char **_argv)

return 0;
}

1 change: 0 additions & 1 deletion examples/standalone/window/window.cc
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,3 @@ int main(int _argc, char **_argv)

return 0;
}

1 change: 0 additions & 1 deletion include/gz/gui/qml/GzColor.qml
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,3 @@ Item {
}
}
}

2 changes: 1 addition & 1 deletion include/gz/gui/qml/GzPlotIcon.qml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import QtQuick 2.9
* sourceComponent: gzploticon
* }
* Component.onCompleted: {
* plotLoader.item.gzMimeData = {"text/plain" : "Component," + entityFromCpp + "," + typeIdFromCpp + ",x," + typeNameFromCpp}
* plotLoader.item.gzMimeData = {"text/plain" : "Component," + entityFromCpp + "," + typeIdFromCpp + ",x," + typeNameFromCpp}
* }
* }
* }
Expand Down
1 change: 0 additions & 1 deletion include/gz/gui/qml/GzSortFilterModel.qml
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,3 @@ DelegateModel {

filterOnGroup: "visible"
}

1 change: 0 additions & 1 deletion include/gz/gui/qml/GzSplit.qml
Original file line number Diff line number Diff line change
Expand Up @@ -382,4 +382,3 @@ SplitView {
}
}
}

2 changes: 1 addition & 1 deletion include/gz/gui/qml/Main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ ApplicationWindow
contentItem: Image {
fillMode: Image.Pad
horizontalAlignment: Image.AlignHCenter
verticalAlignment: Image.AlignVCenter
verticalAlignment: Image.AlignVCenter
source: Material.theme === Material.Light ? "images/drawer.png" : "images/drawer_dark.png"
}
onClicked: drawer.open()
Expand Down
3 changes: 1 addition & 2 deletions include/gz/gui/qml/PluginMenu.qml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Popup {
}
Keys.onUpPressed: {
pluginMenuListView.decrementCurrentIndex();
}
}
}
}
}
Expand Down Expand Up @@ -138,4 +138,3 @@ Popup {
}
}
}

1 change: 0 additions & 1 deletion src/DragDropModel_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,3 @@ TEST(DragDropModelTest, Mime)

EXPECT_EQ(model->mimeData(ids)->data("application/x-item"), "/example/URI");
}

1 change: 0 additions & 1 deletion src/SearchModel_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -172,4 +172,3 @@ TEST(SearchModelTest, NestedStructure)
EXPECT_EQ(countRowsOfIndex(id) + 1, 3);
}
}

1 change: 0 additions & 1 deletion src/plugins/camera_fps/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@ gz_gui_add_plugin(CameraFps
PUBLIC_LINK_LIBS
gz-rendering${GZ_RENDERING_VER}::gz-rendering${GZ_RENDERING_VER}
)

6 changes: 3 additions & 3 deletions src/plugins/camera_tracking_config/CameraTrackingConfig.qml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ ColumnLayout {
Layout.margins: 2
columns: 2

// X Track Offset
// X Track Offset
Label {
id: xTrackPoseLabel
text: "Track Offset X (m)"
Expand All @@ -71,7 +71,7 @@ ColumnLayout {
CameraTrackingConfig.SetTracking(xTrackPose, yTrackPose, zTrackPose, pGainTrack, xFollowOffset, yFollowOffset, zFollowOffset, pGainFollow)
}
}
// Y Track Offset
// Y Track Offset
Label {
id: yTrackPoseLabel
text: "Track Offset Y (m)"
Expand All @@ -90,7 +90,7 @@ ColumnLayout {
CameraTrackingConfig.SetTracking(xTrackPose, yTrackPose, zTrackPose, pGainTrack, xFollowOffset, yFollowOffset, zFollowOffset, pGainFollow)
}
}
// Z Track Offset
// Z Track Offset
Label {
id: zTrackPoseLabel
text: "Track Offset Z (m)"
Expand Down
1 change: 0 additions & 1 deletion src/plugins/grid_config/GridConfig.qml
Original file line number Diff line number Diff line change
Expand Up @@ -220,4 +220,3 @@ GridLayout {
onGzColorSet: GridConfig.SetColor(gzColorGrid.r, gzColorGrid.g, gzColorGrid.b, gzColorGrid.a)
}
}

1 change: 0 additions & 1 deletion src/plugins/key_publisher/KeyPublisher.qml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ GridLayout {
Layout.fillHeight: true
}
}

1 change: 0 additions & 1 deletion src/plugins/navsat_map/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ gz_gui_add_plugin(NavSatMap
QT_HEADERS
NavSatMap.hh
)

1 change: 0 additions & 1 deletion src/plugins/publisher/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@ gz_gui_add_plugin(Publisher
TEST_SOURCES
Publisher_TEST.cc
)

1 change: 0 additions & 1 deletion src/plugins/shutdown_button/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@ gz_gui_add_plugin(ShutdownButton
TEST_SOURCES
ShutdownButton_TEST.cc
)

2 changes: 1 addition & 1 deletion src/plugins/shutdown_button/ShutdownButton.qml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RowLayout {
* Close icon
*/
property string closeIcon: "\u2A2F"

property int tooltipDelay: 500
property int tooltipTimeout: 1000

Expand Down
1 change: 0 additions & 1 deletion src/plugins/shutdown_button/test.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,3 @@
<title>Shutdown!</title>
</gz-gui>
</plugin>

1 change: 0 additions & 1 deletion src/plugins/transport_scene_manager/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@ gz_gui_add_plugin(TransportSceneManager
PUBLIC_LINK_LIBS
gz-rendering${GZ_RENDERING_VER}::gz-rendering${GZ_RENDERING_VER}
)

1 change: 0 additions & 1 deletion src/plugins/world_stats/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@ gz_gui_add_plugin(WorldStats
TEST_SOURCES
WorldStats_TEST.cc
)

2 changes: 1 addition & 1 deletion test/config/close_dialog_auto_gui_only.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
<window>
<dialog_on_exit>false</dialog_on_exit>
<default_exit_action>CLOSE_GUI</default_exit_action>
</window>
</window>
2 changes: 1 addition & 1 deletion test/config/close_dialog_auto_shutdown.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
<window>
<dialog_on_exit>false</dialog_on_exit>
<default_exit_action>shutdown_server</default_exit_action>
</window>
</window>
2 changes: 1 addition & 1 deletion test/config/close_dialog_buttons.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
<dialog_on_exit_options>
<show_shutdown_button>true</show_shutdown_button>
</dialog_on_exit_options>
</window>
</window>
2 changes: 1 addition & 1 deletion test/config/close_dialog_buttons_text.config
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
<close_gui_button_text>close_gui</close_gui_button_text>
<shutdown_button_text>shutdown</shutdown_button_text>
</dialog_on_exit_options>
</window>
</window>
2 changes: 1 addition & 1 deletion test/config/close_dialog_custom_shutdown_service.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
<dialog_on_exit>false</dialog_on_exit>
<default_exit_action>SHUTDOWN_SERVER</default_exit_action>
<server_control_service>/test_service</server_control_service>
</window>
</window>
2 changes: 1 addition & 1 deletion test/config/close_dialog_default_buttons.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

<window>
<dialog_on_exit>true</dialog_on_exit>
</window>
</window>
2 changes: 1 addition & 1 deletion test/gtest_vendor/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
add_library(gtest STATIC ${CMAKE_CURRENT_SOURCE_DIR}/src/gtest-all.cc)
add_library(gtest_main STATIC ${CMAKE_CURRENT_SOURCE_DIR}/src/gtest_main.cc)

target_include_directories(gtest
target_include_directories(gtest
SYSTEM PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/include
PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion test/gtest_vendor/gtest_vendor_version
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ Author: Abseil Team <absl-team@google.com>
Date: Mon Jun 27 13:15:39 2022 -0700

Mark internal-only function as having internal linkage.

PiperOrigin-RevId: 457550818
Change-Id: I9046801b64ce4581d742d650451332fd56489632
1 change: 0 additions & 1 deletion test/plugins/TestNotRegisteredPlugin.cc
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,3 @@ TestNotRegisteredPlugin::TestNotRegisteredPlugin()
TestNotRegisteredPlugin::~TestNotRegisteredPlugin()
{
}

2 changes: 1 addition & 1 deletion test/regression/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
gz_get_sources(tests)

gz_build_tests(TYPE REGRESSION
gz_build_tests(TYPE REGRESSION
SOURCES ${tests}
ENVIRONMENT GZ_GUI_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX})
1 change: 0 additions & 1 deletion tutorials/05_style.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,3 @@ And an example also configuring the toolbars:

\note When saving the configuration file through the GUI, the current style
will be saved as well.

2 changes: 1 addition & 1 deletion tutorials/index.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Introduction
# Introduction

Gazebo GUI is a component in the Gazebo framework, a set
of libraries designed to rapidly develop robot applications.
Expand Down
1 change: 0 additions & 1 deletion tutorials/scene.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,3 @@ emitted by the `MinimalScene`.
See how the `TransportSceneManager` installs an event filter with
`installEventFilter`, registers an `eventFilter` callback and performs all
rendering operations within the `OnRender` function.

Loading