6 ➡️ 7 (main) (#353)

Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
gazebosim · Jan 28, 2022 · 3753ef2 · 3753ef2
2 parents 167f80c + 2c46acb
commit 3753ef2
Show file tree

Hide file tree

Showing 52 changed files with 2,007 additions and 43 deletions.
diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
@@ -14,6 +14,8 @@ qml-module-qt-labs-platform
 qml-module-qt-labs-settings
 qml-module-qtcharts
 qml-module-qtgraphicaleffects
+qml-module-qtlocation
+qml-module-qtpositioning
 qml-module-qtqml-models2
 qml-module-qtquick-controls
 qml-module-qtquick-controls2

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -59,7 +59,7 @@ set(IGN_TRANSPORT_VER ${ignition-transport12_VERSION_MAJOR})
 
 #--------------------------------------
 # Find ignition-rendering
-ign_find_package(ignition-rendering7 REQUIRED COMPONENTS ogre)
+ign_find_package(ignition-rendering7 REQUIRED)
 set(IGN_RENDERING_VER ${ignition-rendering7_VERSION_MAJOR})
 
 #--------------------------------------

diff --git a/Changelog.md b/Changelog.md
@@ -6,6 +6,44 @@
 
 ## Ignition Gui 6
 
+### Ignition Gui 6.3.0 (2022-01-06)
+
+1. NavSat (GPS) map plugin
+    * [Pull request #342](https://github.com/ignitionrobotics/ign-gui/pull/342)
+
+### Ignition Gui 6.2.0 (2021-12-08)
+
+1. Grid config: set values from startup and improve layout
+    * [Pull request #324](https://github.com/ignitionrobotics/ign-gui/pull/324)
+
+1. Fix codecheck
+    * [Pull request #332](https://github.com/ignitionrobotics/ign-gui/pull/332)
+    * [Pull request #329](https://github.com/ignitionrobotics/ign-gui/pull/329)
+
+1. Offer a way to disable warnings on marker manager
+    * [Pull request #326](https://github.com/ignitionrobotics/ign-gui/pull/326)
+
+1. Add PreRender event to MinimalScene
+    * [Pull request #325](https://github.com/ignitionrobotics/ign-gui/pull/325)
+
+1. Use qmldir to define QML module with IgnSpinBox
+    * [Pull request #319](https://github.com/ignitionrobotics/ign-gui/pull/319)
+
+1. Fix TopicEcho plugin message display
+    * [Pull request #322](https://github.com/ignitionrobotics/ign-gui/pull/322)
+
+1. Don't set visual scale for point markers
+    * [Pull request #321](https://github.com/ignitionrobotics/ign-gui/pull/321)
+
+1. Set marker point size from message
+    * [Pull request #317](https://github.com/ignitionrobotics/ign-gui/pull/317)
+
+1. Don't crash if a plugin has invalid QML
+    * [Pull request #315](https://github.com/ignitionrobotics/ign-gui/pull/315)
+
+1. Added log storing for ign-gui
+    * [Pull request #272](https://github.com/ignitionrobotics/ign-gui/pull/272)
+
 ### Ignition Gui 6.1.0 (2021-11-05)
 
 1. Improved doxygen
@@ -368,7 +406,31 @@
 
 ## Ignition Gui 3
 
-### Ignition Gui 3.X.X (202X-XX-XX)
+### Ignition Gui 3.9.0 (2022-01-14)
+
+1. Added a button that allows shutting down both the client and server.
+    * [Pull request #335](https://github.com/ignitionrobotics/ign-gui/pull/335)
+
+1. Prevent Scene3D 💥 if another scene is already loaded
+    * [Pull request #347](https://github.com/ignitionrobotics/ign-gui/pull/347)
+
+1. Add project() to examples and remove hard-dependency on Ogre1
+    * [Pull request #345](https://github.com/ignitionrobotics/ign-gui/pull/345)
+
+1. Fix codecheck
+    * [Pull request #329](https://github.com/ignitionrobotics/ign-gui/pull/329)
+
+1. Use `qmldir` to define QML module with `IgnSpinBox`
+    * [Pull request #319](https://github.com/ignitionrobotics/ign-gui/pull/319)
+
+1. Fix `TopicEcho` plugin message display
+    * [Pull request #322](https://github.com/ignitionrobotics/ign-gui/pull/322)
+
+1. Don't crash if a plugin has invalid QML
+    * [Pull request #315](https://github.com/ignitionrobotics/ign-gui/pull/315)
+
+1. Added log storing for `ign gui` CLI
+    * [Pull request #272](https://github.com/ignitionrobotics/ign-gui/pull/272)
 
 ### Ignition Gui 3.8.0 (2021-10-12)
 

diff --git a/Migration.md b/Migration.md
@@ -5,6 +5,10 @@ Deprecated code produces compile-time warnings. These warning serve as
 notification to users that their code should be upgraded. The next major
 release will remove the deprecated code.
 
+## Ignition GUI 6.2 to 6.3
+
+* New QML dependencies, only needed for the NavSatMap plugin: `qml-module-qtlocation`, `qml-module-qtpositioning`
+
 ## Ignition GUI 6.1 to 6.2
 
 * All features from `Grid3D` have been incorportated into `GridConfig`. The code

diff --git a/examples/config/dialog_on_exit_shutdown.config b/examples/config/dialog_on_exit_shutdown.config
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+
+<!-- Window -->
+<window>
+  <width>1000</width>
+  <height>845</height>
+  <default_exit_action>SHUTDOWN_SERVER</default_exit_action>
+  <dialog_on_exit>true</dialog_on_exit>
+  <dialog_on_exit_options>
+    <prompt_text>really?</prompt_text>
+    <show_shutdown_button>true</show_shutdown_button>
+    <show_close_gui_button>true</show_close_gui_button>
+    <shutdown_button_text>Quit Server and GUI</shutdown_button_text>
+    <!-- Always change this text when displaying both close GUI and shutdown button, otherwise there
+         would be a dialog with "OK", "Cancel" and "shutdown", which is not very good UX. -->
+    <close_gui_button_text>Quit GUI only</close_gui_button_text>
+  </dialog_on_exit_options>
+</window>
+
+<plugin filename="ShutdownButton">
+<ignition-gui>
+  <title>Shutdown</title>
+  <property type="int" key="x">500</property>
+  <property type="int" key="y">950</property>
+  <property type="int" key="height">180</property>
+  <property type="int" key="width">240</property>
+</ignition-gui>
+</plugin>
+
diff --git a/examples/plugin/custom_context_menu/CMakeLists.txt b/examples/plugin/custom_context_menu/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
+project(ignition-gui-custom-context-menu)
+
 if(POLICY CMP0100)
   cmake_policy(SET CMP0100 NEW)
 endif()

diff --git a/examples/plugin/dialog_from_plugin/CMakeLists.txt b/examples/plugin/dialog_from_plugin/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
+project(ignition-gui-dialog-from-plugin)
+
 if(POLICY CMP0100)
   cmake_policy(SET CMP0100 NEW)
 endif()

diff --git a/examples/plugin/hello_plugin/CMakeLists.txt b/examples/plugin/hello_plugin/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
+project(ignition-gui-hello-plugin)
+
 if(POLICY CMP0100)
   cmake_policy(SET CMP0100 NEW)
 endif()

diff --git a/examples/plugin/ign_components/CMakeLists.txt b/examples/plugin/ign_components/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
+project(ignition-gui-ign-components)
+
 if(POLICY CMP0100)
   cmake_policy(SET CMP0100 NEW)
 endif()

diff --git a/examples/plugin/multiple_qml/CMakeLists.txt b/examples/plugin/multiple_qml/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
+project(ignition-gui-multiple-qml)
+
 if(POLICY CMP0100)
   cmake_policy(SET CMP0100 NEW)
 endif()

diff --git a/examples/standalone/custom_drawer/CMakeLists.txt b/examples/standalone/custom_drawer/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
+project(ignition-gui-custom-drawer)
+
 if(POLICY CMP0100)
   cmake_policy(SET CMP0100 NEW)
 endif()

diff --git a/examples/standalone/dialogs/CMakeLists.txt b/examples/standalone/dialogs/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
+project(ignition-gui-dialogs)
+
 if(POLICY CMP0100)
   cmake_policy(SET CMP0100 NEW)
 endif()

diff --git a/examples/standalone/marker/CMakeLists.txt b/examples/standalone/marker/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
+project(ignition-gui-marker)
+
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
   find_package(ignition-transport12 QUIET REQUIRED OPTIONAL_COMPONENTS log)
   set(IGN_TRANSPORT_VER ${ignition-transport12_VERSION_MAJOR})

diff --git a/examples/standalone/scene_provider/CMakeLists.txt b/examples/standalone/scene_provider/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
+project(ignition-gui-scene-provider)
+
 find_package(ignition-msgs9 REQUIRED)
 find_package(ignition-transport12 REQUIRED)
 
@@ -10,4 +12,3 @@ target_link_libraries(scene_provider
   ignition-msgs9::core
   ignition-transport12::core
 )
-
diff --git a/examples/standalone/window/CMakeLists.txt b/examples/standalone/window/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
+project(ignition-gui-window)
+
 if(POLICY CMP0100)
   cmake_policy(SET CMP0100 NEW)
 endif()