ign -> gz Upstream Macro Migration : gz-gui (#413)

Co-authored-by: Louise Poubel <louise@openrobotics.org>
gazebosim · Jun 18, 2022 · 9afab1e · 9afab1e
1 parent d421cfa
commit 9afab1e
Show file tree

Hide file tree

Showing 70 changed files with 269 additions and 242 deletions.
diff --git a/Migration.md b/Migration.md
@@ -11,7 +11,13 @@ release will remove the deprecated code.
 * The `ignition` namespace is deprecated and will be removed in future versions.  Use `gz` instead.
 
 * Header files under `ignition/...` are deprecated and will be removed in future versions.
-  Use `gz/...` instead.
+  Please use `gz/...` instead.
+
+* The `ignition-gui` element is deprecated and will be removed.
+  Please use `gz-gui` instead.
+
+* `ignitionVersion()` is deprecated and will be removed in future versions.
+  Please use `gzVersion()` instead.
 
 ## Gazebo GUI 6.2 to 6.3
 

diff --git a/examples/config/dialog_on_exit_shutdown.config b/examples/config/dialog_on_exit_shutdown.config
@@ -18,12 +18,12 @@
 </window>
 
 <plugin filename="ShutdownButton">
-<ignition-gui>
+<gz-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>
+</gz-gui>
 </plugin>
 
diff --git a/examples/config/grid_config.config b/examples/config/grid_config.config
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 
 <plugin filename="MinimalScene">
-    <ignition-gui>
+    <gz-gui>
       <title>View 1</title>
       <property type="string" key="state">docked</property>
-    </ignition-gui>
+    </gz-gui>
     <engine>ogre2</engine>
     <scene>scene</scene>
     <ambient_light>1 1 1</ambient_light>
     <background_color>0.8 0.8 0.8</background_color>
     <camera_pose>-6 3 6 0 0.5 0</camera_pose>
 </plugin>
 <plugin filename="InteractiveViewControl" name="Interactive view control">
-  <ignition-gui>
+  <gz-gui>
     <anchors target="View 1">
       <line own="right" target="right"/>
       <line own="top" target="top"/>
@@ -22,12 +22,12 @@
     <property key="height" type="double">5</property>
     <property key="state" type="string">floating</property>
     <property key="showTitleBar" type="bool">false</property>
-  </ignition-gui>
+  </gz-gui>
 </plugin>
 <plugin filename="GridConfig" name="Grid config">
-  <ignition-gui>
+  <gz-gui>
     <property type="string" key="state">docked</property>
-  </ignition-gui>
+  </gz-gui>
   <insert>
     <horizontal_cell_count>3</horizontal_cell_count>
     <vertical_cell_count>2</vertical_cell_count>

diff --git a/examples/config/plugin_params.config b/examples/config/plugin_params.config
@@ -6,10 +6,10 @@
 
 <plugin filename="Publisher">
   <!--
-    All elements within <ignition-gui> are parsed by Gazebo GUI and common to
+    All elements within <gz-gui> are parsed by Gazebo GUI and common to
     all plugins.
   -->
-  <ignition-gui>
+  <gz-gui>
     <title>Publisher 1</title>
 
     <!--
@@ -25,11 +25,11 @@
     <property type="double" key="height">400</property>
     <property type="double" key="width">250</property>
     <property type="bool" key="enabled">false</property>
-  </ignition-gui>
+  </gz-gui>
 </plugin>
 
 <plugin filename="Publisher">
-  <ignition-gui>
+  <gz-gui>
     <title>Publisher 2</title>
     <property type="bool" key="showTitleBar">false</property>
     <property type="bool" key="resizable">false</property>
@@ -40,23 +40,23 @@
     <property type="double" key="width">300</property>
     <property type="double" key="rotation">30</property>
     <property type="double" key="scale">0.8</property>
-  </ignition-gui>
+  </gz-gui>
 </plugin>
 
 <plugin filename="Publisher">
-  <ignition-gui>
+  <gz-gui>
     <title>Hidden publisher</title>
     <property type="bool" key="visible">false</property>
-  </ignition-gui>
+  </gz-gui>
 </plugin>
 
 <plugin filename="Publisher">
-  <ignition-gui>
+  <gz-gui>
     <title>Collapsed publisher</title>
     <property key="width" type="double">250</property>
     <property key="height" type="double">50</property>
     <property key="state" type="string">docked_collapsed</property>
     <property key="showCollapseButton" type="bool">true</property>
     <property key="showTitleBar" type="bool">true</property>
-  </ignition-gui>
+  </gz-gui>
 </plugin>
diff --git a/examples/config/pubsub.config b/examples/config/pubsub.config
@@ -6,21 +6,21 @@
 </window>
 
 <plugin filename="Publisher">
-  <ignition-gui>
+  <gz-gui>
     <property type="int" key="x">9</property>
     <property type="int" key="y">50</property>
     <property type="int" key="z">0</property>
     <property type="int" key="height">400</property>
     <property type="int" key="width">250</property>
-  </ignition-gui>
+  </gz-gui>
 </plugin>
 
 <plugin filename="TopicEcho">
-  <ignition-gui>
+  <gz-gui>
     <property type="int" key="x">275</property>
     <property type="int" key="y">50</property>
     <property type="int" key="z">0</property>
     <property type="int" key="height">687</property>
     <property type="int" key="width">300</property>
-  </ignition-gui>
+  </gz-gui>
 </plugin>
diff --git a/examples/config/scene3d.config b/examples/config/scene3d.config
@@ -5,18 +5,18 @@
     <height>894</height>
 </window>
 <plugin filename="MinimalScene">
-    <ignition-gui>
+    <gz-gui>
       <title>View 1</title>
       <property type="string" key="state">docked</property>
-    </ignition-gui>
+    </gz-gui>
     <engine>ogre2</engine>
     <scene>scene</scene>
     <ambient_light>1 1 1</ambient_light>
     <background_color>0.8 0.8 0.8</background_color>
     <camera_pose>-6 0 6 0 0.5 0</camera_pose>
 </plugin>
 <plugin filename="InteractiveViewControl" name="Interactive view control">
-  <ignition-gui>
+  <gz-gui>
     <anchors target="View 1">
       <line own="right" target="right"/>
       <line own="top" target="top"/>
@@ -26,10 +26,10 @@
     <property key="height" type="double">5</property>
     <property key="state" type="string">floating</property>
     <property key="showTitleBar" type="bool">false</property>
-  </ignition-gui>
+  </gz-gui>
 </plugin>
 <plugin filename="TransportSceneManager" name="Transport Scene Manager">
-  <ignition-gui>
+  <gz-gui>
     <anchors target="View 1">
       <line own="right" target="right"/>
       <line own="top" target="top"/>
@@ -39,14 +39,14 @@
     <property key="height" type="double">5</property>
     <property key="state" type="string">floating</property>
     <property key="showTitleBar" type="bool">false</property>
-  </ignition-gui>
+  </gz-gui>
   <service>/example/scene</service>
   <pose_topic>/example/pose</pose_topic>
   <deletion_topic>/example/delete</deletion_topic>
   <scene_topic>/example/scene</scene_topic>
 </plugin>
 <plugin filename="MarkerManager" name="Marker Manager">
-  <ignition-gui>
+  <gz-gui>
     <anchors target="View 1">
       <line own="right" target="right"/>
       <line own="top" target="top"/>
@@ -56,11 +56,11 @@
     <property key="height" type="double">5</property>
     <property key="state" type="string">floating</property>
     <property key="showTitleBar" type="bool">false</property>
-  </ignition-gui>
+  </gz-gui>
   <stats_topic>/example/stats</stats_topic>
 </plugin>
 <plugin filename="CameraTracking" name="Camera tracking">
-  <ignition-gui>
+  <gz-gui>
     <anchors target="View 1">
       <line own="right" target="right"/>
       <line own="top" target="top"/>
@@ -70,10 +70,10 @@
     <property key="height" type="double">5</property>
     <property key="state" type="string">floating</property>
     <property key="showTitleBar" type="bool">false</property>
-  </ignition-gui>
+  </gz-gui>
 </plugin>
 <plugin filename="WorldControl">
-  <ignition-gui>
+  <gz-gui>
     <title>Controls</title>
     <property type="bool" key="showTitleBar">false</property>
     <property type="bool" key="resizable">false</property>
@@ -86,7 +86,7 @@
       <line own="left" target="left"/>
       <line own="bottom" target="bottom"/>
     </anchors>
-  </ignition-gui>
+  </gz-gui>
   <play_pause>true</play_pause>
   <step>true</step>
   <start_paused>false</start_paused>
@@ -95,7 +95,7 @@
 </plugin>
 
 <plugin filename="WorldStats">
-  <ignition-gui>
+  <gz-gui>
     <title>Stats</title>
     <property type="bool" key="showTitleBar">false</property>
     <property type="bool" key="resizable">false</property>
@@ -108,7 +108,7 @@
       <line own="right" target="right"/>
       <line own="bottom" target="bottom"/>
     </anchors>
-  </ignition-gui>
+  </gz-gui>
   <sim_time>true</sim_time>
   <real_time>true</real_time>
   <real_time_factor>true</real_time_factor>

diff --git a/examples/config/scroll.config b/examples/config/scroll.config
@@ -6,42 +6,42 @@
 </window>
 
 <plugin filename="Publisher">
-  <ignition-gui>
+  <gz-gui>
     <property type="int" key="z">0</property>
     <property type="int" key="height">400</property>
     <property type="int" key="width">250</property>
-  </ignition-gui>
+  </gz-gui>
 </plugin>
 
 <plugin filename="Publisher">
-  <ignition-gui>
+  <gz-gui>
     <property type="int" key="z">0</property>
     <property type="int" key="height">400</property>
     <property type="int" key="width">250</property>
-  </ignition-gui>
+  </gz-gui>
 </plugin>
 
 <plugin filename="Publisher">
-  <ignition-gui>
+  <gz-gui>
     <property type="int" key="z">0</property>
     <property type="int" key="height">400</property>
     <property type="int" key="width">250</property>
-  </ignition-gui>
+  </gz-gui>
 </plugin>
 
 <plugin filename="Publisher">
-  <ignition-gui>
+  <gz-gui>
     <property type="int" key="z">0</property>
     <property type="int" key="height">400</property>
     <property type="int" key="width">250</property>
-  </ignition-gui>
+  </gz-gui>
 </plugin>
 
 <plugin filename="Publisher">
-  <ignition-gui>
+  <gz-gui>
     <property type="int" key="z">0</property>
     <property type="int" key="height">400</property>
     <property type="int" key="width">250</property>
-  </ignition-gui>
+  </gz-gui>
 </plugin>
 
diff --git a/examples/config/style.config b/examples/config/style.config
@@ -13,9 +13,9 @@
 <plugin filename="Publisher"/>
 
 <plugin filename="WorldControl">
-  <ignition-gui>
+  <gz-gui>
     <title>Controls: all</title>
-  </ignition-gui>
+  </gz-gui>
   <play_pause>true</play_pause>
   <step>true</step>
   <start_paused>false</start_paused>