From 8ac8b4163f3b2130012737ef3df2d90249ecc0bc Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Mon, 16 May 2022 16:15:15 -0700 Subject: [PATCH 1/2] Update name and logo on UI, examples and API docs Signed-off-by: Louise Poubel --- examples/README.md | 8 ++--- examples/config/plugin_params.config | 2 +- .../plugin/custom_context_menu/CMakeLists.txt | 2 +- .../plugin/dialog_from_plugin/CMakeLists.txt | 2 +- examples/plugin/hello_plugin/CMakeLists.txt | 2 +- examples/plugin/hello_plugin/HelloPlugin.hh | 2 +- examples/plugin/ign_components/README.md | 2 +- examples/plugin/multiple_qml/CMakeLists.txt | 2 +- .../standalone/custom_drawer/CMakeLists.txt | 2 +- .../standalone/custom_drawer/CustomDrawer.qml | 2 +- examples/standalone/dialogs/CMakeLists.txt | 2 +- examples/standalone/marker/README.md | 6 ++-- examples/standalone/scene_provider/README.md | 4 +-- examples/standalone/window/CMakeLists.txt | 2 +- include/gz/gui/Application.hh | 4 +-- include/gz/gui/Conversions.hh | 28 +++++++++--------- include/gz/gui/Plugin.hh | 4 +-- include/gz/gui/config.hh.in | 2 +- include/gz/gui/qml/Main.qml | 4 +-- include/gz/gui/qml/images/gazebo_logo.png | Bin 0 -> 24272 bytes .../gz/gui/qml/images/ignition_logo_50x50.png | Bin 4336 -> 0 bytes include/gz/gui/resources.qrc | 2 +- include/ignition/gui/qml/Main.qml | 4 +-- .../gui/qml/images/ignition_logo_50x50.png | Bin 4336 -> 0 bytes include/ignition/gui/resources.qrc | 2 +- src/Application.cc | 6 ++-- src/Conversions_TEST.cc | 12 ++++---- src/MainWindow.cc | 2 +- src/cmd/cmdgui.rb.in | 4 +-- src/plugins/CMakeLists.txt | 4 +-- src/plugins/grid_config/GridConfig.hh | 2 +- src/plugins/image_display/ImageDisplay.hh | 2 +- src/plugins/image_display/ImageDisplay.qml | 2 +- src/plugins/marker_manager/MarkerManager.cc | 2 +- src/plugins/minimal_scene/MinimalScene.hh | 2 +- src/plugins/navsat_map/NavSatMap.hh | 2 +- src/plugins/navsat_map/NavSatMap.qml | 2 +- src/plugins/plotting/TransportPlotting.hh | 2 +- src/plugins/point_cloud/PointCloud.qml | 4 +-- src/plugins/publisher/Publisher.hh | 2 +- src/plugins/scene3d/Scene3D.hh | 2 +- src/plugins/tape_measure/TapeMeasure.cc | 2 +- src/plugins/topic_echo/TopicEcho.hh | 2 +- .../TransportSceneManager.hh | 2 +- 44 files changed, 74 insertions(+), 74 deletions(-) create mode 100644 include/gz/gui/qml/images/gazebo_logo.png delete mode 100644 include/gz/gui/qml/images/ignition_logo_50x50.png delete mode 100644 include/ignition/gui/qml/images/ignition_logo_50x50.png diff --git a/examples/README.md b/examples/README.md index 66d367799..e429d7f12 100644 --- a/examples/README.md +++ b/examples/README.md @@ -1,17 +1,17 @@ -This directory contains examples which are not shipped with Ignition GUI +This directory contains examples which are not shipped with Gazebo GUI # Standalone Examples of how to build and run standalone applications which use -Ignition-GUI as a library +Gazebo GUI as a library # Plugin -Examples of how to build plugins which can then be used with Ignition GUI's +Examples of how to build plugins which can then be used with Gazebo GUI's command line tool, or used by standalone applications. # Config -Example configuration files which can be used with Ignition GUI's command +Example configuration files which can be used with Gazebo GUI's command line tool or with standalone applications diff --git a/examples/config/plugin_params.config b/examples/config/plugin_params.config index 8f6e60850..46fb98998 100644 --- a/examples/config/plugin_params.config +++ b/examples/config/plugin_params.config @@ -6,7 +6,7 @@ diff --git a/examples/plugin/custom_context_menu/CMakeLists.txt b/examples/plugin/custom_context_menu/CMakeLists.txt index 37a3a1ac5..37bd86e68 100644 --- a/examples/plugin/custom_context_menu/CMakeLists.txt +++ b/examples/plugin/custom_context_menu/CMakeLists.txt @@ -17,7 +17,7 @@ find_package (Qt5 REQUIRED ) -# Find the Ignition gui library +# Find the Gazebo GUI library find_package(ignition-gui7 REQUIRED) find_package(ignition-common5 REQUIRED) diff --git a/examples/plugin/dialog_from_plugin/CMakeLists.txt b/examples/plugin/dialog_from_plugin/CMakeLists.txt index f44d96b03..f0036cb9e 100644 --- a/examples/plugin/dialog_from_plugin/CMakeLists.txt +++ b/examples/plugin/dialog_from_plugin/CMakeLists.txt @@ -17,7 +17,7 @@ find_package (Qt5 REQUIRED ) -# Find the Ignition gui library +# Find the Gazebo GUI library find_package(ignition-gui7 REQUIRED) find_package(ignition-common5 REQUIRED) diff --git a/examples/plugin/hello_plugin/CMakeLists.txt b/examples/plugin/hello_plugin/CMakeLists.txt index 44a9a4119..f53511e9e 100644 --- a/examples/plugin/hello_plugin/CMakeLists.txt +++ b/examples/plugin/hello_plugin/CMakeLists.txt @@ -17,7 +17,7 @@ find_package (Qt5 REQUIRED ) -# Find the Ignition gui library +# Find the Gazebo GUI library find_package(ignition-gui7 REQUIRED) find_package(ignition-common5 REQUIRED) diff --git a/examples/plugin/hello_plugin/HelloPlugin.hh b/examples/plugin/hello_plugin/HelloPlugin.hh index 144937d75..5b4f105cb 100644 --- a/examples/plugin/hello_plugin/HelloPlugin.hh +++ b/examples/plugin/hello_plugin/HelloPlugin.hh @@ -37,7 +37,7 @@ namespace ignition /// \brief Destructor public: virtual ~HelloPlugin(); - /// \brief Called by Ignition GUI when plugin is instantiated. + /// \brief Called by Gazebo GUI when plugin is instantiated. /// \param[in] _pluginElem XML configuration for this plugin. public: virtual void LoadConfig(const tinyxml2::XMLElement *_pluginElem) override; diff --git a/examples/plugin/ign_components/README.md b/examples/plugin/ign_components/README.md index 9737c224d..d946455c0 100644 --- a/examples/plugin/ign_components/README.md +++ b/examples/plugin/ign_components/README.md @@ -1,4 +1,4 @@ -Demo of QML components provided by Ignition GUI which can be +Demo of QML components provided by Gazebo GUI which can be useful for downstream developers. ## Build diff --git a/examples/plugin/multiple_qml/CMakeLists.txt b/examples/plugin/multiple_qml/CMakeLists.txt index ba0baf53e..61d214ff2 100644 --- a/examples/plugin/multiple_qml/CMakeLists.txt +++ b/examples/plugin/multiple_qml/CMakeLists.txt @@ -17,7 +17,7 @@ find_package (Qt5 REQUIRED ) -# Find the Ignition gui library +# Find the Gazebo GUI library find_package(ignition-gui7 REQUIRED) find_package(ignition-common5 REQUIRED) diff --git a/examples/standalone/custom_drawer/CMakeLists.txt b/examples/standalone/custom_drawer/CMakeLists.txt index d0503d1d9..e304088b7 100644 --- a/examples/standalone/custom_drawer/CMakeLists.txt +++ b/examples/standalone/custom_drawer/CMakeLists.txt @@ -17,7 +17,7 @@ find_package (Qt5 REQUIRED ) -# Find the Ignition gui library +# Find the Gazebo GUI library find_package(ignition-gui7 REQUIRED) QT5_ADD_RESOURCES(resources_RCC custom_drawer.qrc) diff --git a/examples/standalone/custom_drawer/CustomDrawer.qml b/examples/standalone/custom_drawer/CustomDrawer.qml index 6ac642687..dcbf089a5 100644 --- a/examples/standalone/custom_drawer/CustomDrawer.qml +++ b/examples/standalone/custom_drawer/CustomDrawer.qml @@ -50,7 +50,7 @@ Rectangle { actionElement: "cppActionFromQml" } - // Actions provided by Ignition GUI, with custom titles + // Actions provided by Gazebo GUI, with custom titles ListElement { title: "Call default action (Style)" actionElement: "styleSettings" diff --git a/examples/standalone/dialogs/CMakeLists.txt b/examples/standalone/dialogs/CMakeLists.txt index c8277c19f..389fe3eed 100644 --- a/examples/standalone/dialogs/CMakeLists.txt +++ b/examples/standalone/dialogs/CMakeLists.txt @@ -17,7 +17,7 @@ find_package (Qt5 REQUIRED ) -# Find the Ignition gui library +# Find the Gazebo GUI library find_package(ignition-gui7 REQUIRED) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IGNITION-GUI_CXX_FLAGS}") diff --git a/examples/standalone/marker/README.md b/examples/standalone/marker/README.md index a0c5bd565..6beea4cb6 100644 --- a/examples/standalone/marker/README.md +++ b/examples/standalone/marker/README.md @@ -1,7 +1,7 @@ -# Ignition Visualization Marker Example +# Gazebo Visualization Marker Example This example demonstrates how to create, modify, and delete visualization -markers in Ignition GUI. +markers in Gazebo GUI. ## Build Instructions @@ -19,4 +19,4 @@ Launch ign gazebo unpaused then from the build directory above: ./marker The terminal will output messages indicating visualization changes that -will occur in Ignition GUI's render window. +will occur in Gazebo GUI's render window. diff --git a/examples/standalone/scene_provider/README.md b/examples/standalone/scene_provider/README.md index d60425399..d434dd970 100644 --- a/examples/standalone/scene_provider/README.md +++ b/examples/standalone/scene_provider/README.md @@ -1,11 +1,11 @@ ## Scene provider This example demonstrates how to populate and update a 3D scene using -Ignition Transport. +Gazebo Transport. This example is meant to be used with `examples/config/scened.config`, which loads the `Scene3D` plugin to create the scene, and the `TransportSceneManager` -plugin to update the scene using Ignition Transport. +plugin to update the scene using Gazebo Transport. ## Build diff --git a/examples/standalone/window/CMakeLists.txt b/examples/standalone/window/CMakeLists.txt index 24ee52ae4..b5036e370 100644 --- a/examples/standalone/window/CMakeLists.txt +++ b/examples/standalone/window/CMakeLists.txt @@ -17,7 +17,7 @@ find_package (Qt5 REQUIRED ) -# Find the Ignition gui library +# Find the Gazebo GUI library find_package(ignition-gui7 REQUIRED) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IGNITION-GUI_CXX_FLAGS}") diff --git a/include/gz/gui/Application.hh b/include/gz/gui/Application.hh index c947abeef..334a5ef85 100644 --- a/include/gz/gui/Application.hh +++ b/include/gz/gui/Application.hh @@ -57,7 +57,7 @@ namespace ignition kDialog = 1 }; - /// \brief An Ignition GUI application loads a QML engine and + /// \brief A Gazebo GUI application loads a QML engine and /// provides an API to load plugins and configuration files. The application /// supports either running a single main window or several plugins as /// standalone dialogs. @@ -139,7 +139,7 @@ namespace ignition /// 1. Paths given by the environment variable /// 2. Paths added by calling addPluginPath /// 3. Path ~/.gz/gui/plugins - /// 4. The path where Ignition GUI plugins are installed + /// 4. The path where Gazebo GUI plugins are installed /// /// \return A vector of pairs, where each pair contains: /// * A path diff --git a/include/gz/gui/Conversions.hh b/include/gz/gui/Conversions.hh index 2b566237f..322768e90 100644 --- a/include/gz/gui/Conversions.hh +++ b/include/gz/gui/Conversions.hh @@ -44,62 +44,62 @@ namespace ignition namespace gui { /// \brief Return the equivalent Qt color - /// \param[in] _color Ignition color to convert + /// \param[in] _color Gazebo color to convert /// \return Qt color value IGNITION_GUI_VISIBLE QColor convert(const math::Color &_color); - /// \brief Return the equivalent Ignition color + /// \brief Return the equivalent Gazebo color /// \param[in] _color Qt color to convert - /// \return Ignition color value + /// \return Gazebo color value IGNITION_GUI_VISIBLE math::Color convert(const QColor &_color); /// \brief Return the equivalent QPointF. - /// \param[in] _pt Ignition vector to convert. + /// \param[in] _pt Gazebo vector to convert. /// \return QPointF. IGNITION_GUI_VISIBLE QPointF convert(const math::Vector2d &_pt); - /// \brief Return the equivalent Ignition vector. + /// \brief Return the equivalent Gazebo vector. /// \param[in] _pt QPointF to convert - /// \return Ignition Vector2d. + /// \return Gazebo Vector2d. IGNITION_GUI_VISIBLE math::Vector2d convert(const QPointF &_pt); /// \brief Return the equivalent Qt vector 3d. - /// \param[in] _vec Ignition vector 3d to convert. + /// \param[in] _vec Gazebo vector 3d to convert. /// \return Qt vector 3d value. IGNITION_GUI_VISIBLE QVector3D convert(const math::Vector3d &_vec); - /// \brief Return the equivalent Ignition vector 3d. + /// \brief Return the equivalent Gazebo vector 3d. /// \param[in] _vec Qt vector 3d to convert. - /// \return Ignition vector 3d value + /// \return Gazebo vector 3d value IGNITION_GUI_VISIBLE math::Vector3d convert(const QVector3D &_vec); - /// \brief Return the equivalent Ignition mouse event. + /// \brief Return the equivalent Gazebo mouse event. /// /// Note that there isn't a 1-1 mapping between these types, so fields such /// as common::MouseEvent::PressPos need to be set afterwards. /// \param[in] _e Qt mouse event - /// \return Ignition mouse event + /// \return Gazebo mouse event IGNITION_GUI_VISIBLE common::MouseEvent convert(const QMouseEvent &_e); - /// \brief Return the equivalent Ignition mouse event. + /// \brief Return the equivalent Gazebo mouse event. /// /// Note that there isn't a 1-1 mapping between these types. /// \param[in] _e Qt wheel event - /// \return Ignition mouse event + /// \return Gazebo mouse event IGNITION_GUI_VISIBLE common::MouseEvent convert(const QWheelEvent &_e); /// \brief Return the equivalent ignition key event. /// /// \param[in] _e Qt key event - /// \return Ignition key event + /// \return Gazebo key event IGNITION_GUI_VISIBLE common::KeyEvent convert(const QKeyEvent &_e); } diff --git a/include/gz/gui/Plugin.hh b/include/gz/gui/Plugin.hh index dc96bc56e..ed15ebfbe 100644 --- a/include/gz/gui/Plugin.hh +++ b/include/gz/gui/Plugin.hh @@ -37,7 +37,7 @@ namespace ignition { class PluginPrivate; - /// \brief Base class for Ignition GUI plugins. + /// \brief Base class for Gazebo GUI plugins. /// /// When inheriting from this plugin, the following are assumed: /// @@ -127,7 +127,7 @@ namespace ignition protected: std::string configStr; /// \brief Load configuration which is common to all plugins and handled - /// by Ignition GUI. + /// by Gazebo GUI. /// \details Called when a plugin is first created. /// \sa LoadConfig /// \param[in] _ignGuiElem element within the . diff --git a/include/gz/gui/config.hh.in b/include/gz/gui/config.hh.in index d2f3445e0..ad0b28a6e 100644 --- a/include/gz/gui/config.hh.in +++ b/include/gz/gui/config.hh.in @@ -8,7 +8,7 @@ #define IGNITION_GUI_VERSION "${PROJECT_VERSION}" #define IGNITION_GUI_VERSION_FULL "${PROJECT_VERSION_FULL}" -#define IGNITION_GUI_VERSION_HEADER "Ignition ${IGN_DESIGNATION}, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2017 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n" +#define IGNITION_GUI_VERSION_HEADER "Gazebo ${IGN_DESIGNATION}, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2017 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n" #cmakedefine BUILD_TYPE_PROFILE 1 #cmakedefine BUILD_TYPE_DEBUG 1 diff --git a/include/gz/gui/qml/Main.qml b/include/gz/gui/qml/Main.qml index a1401bab8..eebf90697 100644 --- a/include/gz/gui/qml/Main.qml +++ b/include/gz/gui/qml/Main.qml @@ -24,7 +24,7 @@ import "qrc:/qml" ApplicationWindow { - title: qsTr("Ignition GUI") + title: qsTr("Gazebo GUI") width: 1200 height: 1000 minimumWidth: 300 @@ -255,7 +255,7 @@ ApplicationWindow id: aboutDialog modal: true focus: true - title: "Ignition GUI" + title: "Gazebo GUI" x: (window.width - width) / 2 y: window.height / 6 width: Math.min(window.width, window.height) / 3 * 2 diff --git a/include/gz/gui/qml/images/gazebo_logo.png b/include/gz/gui/qml/images/gazebo_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..f5b4cdfa67dbbf481b4beaf3ab0ed30a83a97210 GIT binary patch literal 24272 zcmb@ubyStz*9Cg$?vw@rX+aw45Tq2OyFnTOLGsY4fOLp-HzM8LARyf-pmf*W$M^kx z-|xHQ{&_jW!4Ns;dG_9GtvT16>oM%LvMd%l89D?4!FnkttqOs_t-$`EB7>iJPqxH^ zZ-|x>N)ixAWfaD(F%tMYjj5cf5(MJG2!TKYA&_hEBj^qU;>rnu>>5EJLP-z^iDO!W ziZJ*GWD^BhX~+ZYmC>9Z3xViwzm%3xbD#UY=;lQ@HHUJzoV=)%>xReI_!5y25$`pe z4U=j!A%+K%S{xm!iW)AyJSr0ls+M>&UxfkD>!LUs8X8nOqXJzE{>)lvv{~$;-~qMY z%@Vx)%h~Fin|n7ggU?U4hlaREhmubq(*M7Gtx7qfhE56^mRHZ(bLG?_aFQYD5J93j zmC>!{gQ9IH8(Q$78?W)W;0VUmt!FBXrSFp$?x9}9;nkQn#mheh=~}vv$x+S zehsY^;3JU`gg}|1dCy7&llEndg9+u{iDmcX|6R(_4-wFb!xDlD5s%1CWLCi z5d_6`)zziu;#Sj))5%FKu;w0p8{E_HpQQskplaadaL-9`35JLM!+= z#i#5vk*v?1vSZQ=+Gjey^=UuKK&?>3->m29@%R}FYv-D5#=@>~#wC$SDQBbvb~%4+wR{(P5|b6L&CelxyD+aF+%m$6fWewQ%(*NR09BUNXL{n7cvkJAiW{k3C>0 z&WA%N(kL^l-g0MSA zPeO&@l90H4e3XP4xvgwjXspOPjSQyenOkP2UQl!7W2qK-F4C#9aUvNP6su}d> z_x&htpXrfb1Jy%qHIFuJeVi)G9E2h2pLba3QF>m6WN~5w`I4bEon^s`;GXYICDe0c z+#t{^j#5(Yu1=tldacwsOp}@DF+(u#Nv7qU zWayxPuBK%&myoUYo*_>>gqLC zsy;u3%&?HvwffLvqS}gC`>PeFH@%QMEmp1nQKMe0uIs$kg+?7^0SoX@#Nry>z$B#5 z7e(Fn#YQx_uA=t!dG7BW7rga416@^SoD}|+X-ZmSB3&}d>PruD1$WJ@|$pdTSFa-XYiM*wvUsT3B%%p1B8>jL5%N>_N&sb|#F z3H7Zk%pN#7apG0wHs($<7&53S8?_j87ZhTy4=VA0xxze`V#?z}?DJg!_bQ`{>j zJiida5tiFX(miKOz-SlRaW599m(z`mLx^988WA^DqRp-Fjo}z6v)>oKpj>r71>(WS z)Rk&?GFIU6%WW^Bn8wNXPBN(`OGXE-hWM>IlJr-Wcos&rsM7lLOX^ar&t~W)Lt>YF(ZAzl2c509}(IQvz_*xs^R%(=D1d_{_%q8SY#*Hvd0#HDa zV(~NOZMQzaGFF6>=AH6y9o+3LND$Q{ut9W9%lDRv_|~#$s`7i@7{V0THZ;@Jq%w~~ zEjsun7$kX_s@IoG@}T}Cq>Om$%IVN}QYRbHx!GI!?o#&vlqZP66@L#vKNH-Uv~2S5 zDiKG zVz`~WIVTS(UWAGHjcm_mNi9Or&Jlk19a2NoySU&Iv6&S=P~U<|>gwujhT6=;Pc_)j zkMZzd@w1DU?*%x-s5`xGYVR!nF^1ewrPq4M_E@7$`a#|CzY`a>=;yzW$ByS9-*B5t zYt(thn$xLUAkiQ6K#}WkZ<5~}m@3jJ{+sNihEpo*$Hxm**FG?v^YoOwJbkMcDxu^ZiaD_@SH$m* z8;x-%Dct$@w~ZObtq(lPocz^mW>TjxX=+?W*H|B=$uTXj&}yPK_5A%M+H!+0Lepf7 zgDz;ZZ)#>(U&v$HY)Oq?2jL1k-}k1l5g07t2HjZ_>g6z0AgE%ycnI$a#)4a+-L!Ap zubD%}pq+qIQ7(*?hUnvC9C=|-v&bGPB#6Zxpoq@lh56c6XNgxE3d@CyVW`v80dG#qB2+{^h@(n>b{&^@k@ff6baL~K~U}E zhnrMmKPR3>jGkkm{vNJprcR-Jg_y^>up)t~c!sdpdwNhPv3G|71+&WE= zmNE*$(;Xl!gVOr&D>f_82!6`6$7fpvpwM#8WbTPMGKQfg`O8;Z46{9nqViQnjYPoB zoqXwNA2StEd-%XBV9k7)j|&2Xc>)Iyj^!E3-RCbwPJ?lt36N18g7H8dhN_J@sK|$ zFmX+I^lR_2Qxb?9w4|LMpHdNvoB0E|kZ`BeFzz{ush=)xN&SAOXGVlMLWtT_%?oe1 zA1*Fl&m7}}dh|)~*)#LebP-=iKClFNML;G*@Hj2t7aUlD5Kf~^GmA?p$t5}?%GIQaJ=g3#4@`QzyKkbT6#lSUPr7Jf2Cz4Jb@YmKp zLyoYa*G1hv-s%XZI@{UCyk+q!Xka@CID>dohcyQ2H;bV=r8@hYbo9u7GpfE%-n_Va z$lY8jCk2ZN`Ws3Ca2y0!qLf0#+}FV9a=3yFokKV6JGr;Nq=vOPs?d=DxG1&}67RqF zBp8mahAiai?7I#qMB2wk{hYoQjG?t!Mk4?V=yH$+xts)L4xIc4uT3K3-U-me%~7_4 zylH5`9bMR$`WEE;Xh1TvJ>X@Z-;Hp(ewq@fVf27RR_nm!d>fLLG#9nU ze)9LqIo~{7clGx8lk?C*Z`322C3CtmQqd0&v5>~x2}9Wb;)?3PB6QZK28$S;01~IU z3l*6bSiK?^Rr|D7%)?@R$a&+2VPXF<@Kt;HFye+JJ1%J*|8q|<%UHA|Ni7q-g<*Vm z65L_+znL*!>Qz_DN1{FcFd)Rv=_Ez?vv_ueR#raJGysLs2wj3Nwe&L@DNa~BBu?iA z*<1K@D?O;sNAFNhCyrmELE-@+aAj=M79(am>ziy8MFz#q#ZW!O(D#tI1{U6OqBh;% zCu1X9+reZmZ~0S+uucoML!Ls+sQ3%N%k7cTMm{N0E7L1|F`TmZiCS#r%Qr2!*w10L z_KS$jiVjjM22&>G#Oz0U7}O2)RZj5wf`1p!qCT9$Tb(BCar+ikkx;xu6=kDdM&s%C z!%R97Z51w5(ze7#y2Gt8-N zA!r(&4yac`(A^>=Url{61M6QPI~MxGc895K=c2Z2pDzA$VkoXAxd(( zBuM;!m%F{QKv!G{DJmkq)z=VvQG1%H!A7DTBc$eV2=Ob&qD^;dTnrIRRcv!X0?A-H z9DM*^r&Kdj&hB93qCjn5-r0ke!vVYI3g?@~_rH^pLPJS%|HaIIQb5X{V}*_t{SnB( zqzX}V*^wgmenQJmVeC;%4sOc^*9naW*;hK+Z}dI2H*sdP>(hW&$Vy&eFyS&Liz1o0 z4=+C=xmUe}V>KxI+$_aeGa3U?iN$dV6BS3x=zoQG2PrCRP9Jcqkauxami)sn6 z?YS%CN|kx_Y}Qbl+`s5x1HYrvircAsi96VXCY@`YJnx_A`>E?l_-}FyCIB*u6_$)| z1GH7;dBYsrlE&L}uP ziH5R+E!$^s42P*dL*&NLY$8Gw>BY)Xk85``u()ZN>w zNf;c13_}5r7So^f*E}p;8F`}8DdN(`W+$`&4%9{7EB{x*qFyHDAw5@wnm2a z1N-rpN>5el(1Vb1IFo|~zKlFpY%|XC(MwyzIpTwU0x{2}YNEwW?eX(z;0gvJ9sJ)< zYL7Fj!3t^9f^f+z#X&%btOXGx6%ck8C5GNlKdVKG<&$0u43GGR_!Ai_+EBKq*hZUY z@Y`eRcFW%(sO`&tb!WjK>&Cx6UtU=~`GUteshi^}kLu#Qa~%cV(gFH;o=3;BQw_v2 z$$q^KY;Cbh=tkq0Z}IT-8@}}N|UYf>xgtLaIk{)9+XA z6%w>`b(zR`@wmD&2p9ZJfieV_zeACwkUg;&>0YG|B#)wNwYRd1j%*P^MYIqi`4AB7 zk24*z;gfg_C_)QP_XRVJI~tg5#mFYz?gU*$JkF^7q8BXr%?KP#78}r1xdr`sTN+Dz zKpE}it<*Dy1-(2)^2PWXE7M1|1^A{lNi;fnhf-y58RKb7U!NKcuJG@)>jjDlj*W9ozV zeNrE1R&)@pt*X!oDy)er;v{OO%;K3cWZ1>B*o9}qm@YSn(M$TDt-2dTi-adsLD7=R z2FCULXa`LXhr+E~Md4_&Dk_8qBmX#?9%@@4!na>o>^l~GYD^9>V5Z(N;O3*`F%>5$ z^I^=Ya@{Ct+xV!WRfgigGIpC_R{|}Z*&u?S;FHaozNnmWile^ASNVlb+Gd%ISLa}F z`}&C?-2VH0H?wN^Jd@h(z~Che(>erVy!aITUf!J22+6I=mDa07+^<2$dYo{HTvG7M z``?XfrXwv=Z^jrZqXQ(RyZK_*xaC{=5d<|4KBd?M}2=52vzzusgW)vP8r@ z`!nTC(~SxQ0t12JN32FNm+ToJ zU$TGsGFzs;%I8o5C91xPMibfY&3Kh9iD|tnMQ?~l5L8++0Z+g$ZG7j$@N^R4pnB-D|6r-XRHInA1@Uz(4mvVw*t49{^0LPH(0F{aSJoU(B z;vYW3@q-RsFy9+~;=Aq?X{>$^P6%ZpdLr7rKCporrA*!m`Zz>K+Ey#uj`R0FIcd zrhML<@~Ey+>#{RPbS2^6j*W>%v0BT^sXH)iqZ`E>4Zf)ou{ejGd@i2avNIzp9pte#W=qAq}9QI#3>= zC*XwB`ps)PA;FEzbM&`XTrLDK?W7%}DQddKOudxj`myQSiqo>)Y^E1T#CVH*cml_* zVW~Zqk>Z!aB`h22pJUxcmyaZ+A-y^+H83TOAN>_QBDZ+rx6a^flW<8;nac_f)+?Mx z@DbfvY731~HapEU$Zz+u9lu8}v*N`w+ zX2E!Q*v5mALbxhBZwYrK(ArWwFX+n~R{uP3twUe3k)G3ppc;(v{E3on4Ik zTUVZ@{CI_?D@miQiX>{+Iz5h&t$2)Ce5Q75a&*664DYv1o*73?sKkxsblujU93FRt z2{^321;{%w}~RrMHdV;9;cu0QSO%ovdwy^c%RsUL~E zvs8_eP(C2O+)EvhSIAppQ>D1W#ZSy#`=V%CEKUxu_Zaa-`A5lC1}+xH<<97=@`>!_ z&W%AtiZ~XHlF-RY)1%o$!?gyFv$$}PQJkR#GQW`4h#m)7pr@%g#o%l0RAk&VX|c^% zs&IITk8lya;Cbh)>L2V%C{+^K3dMF|}Ar2FK+kTUP|T zR{>D6q&001Uc!*P>-%GQd)oT{(PK)W@g{t!M>7Obrbj;*>Q2fU;~Gs3K|txNFn4dS6^vszzUuG zc~zmgLC2oeTE#dRmHo(lY`y?#^b$;nWE9)FVtc|5jm2Gk?;$k18PR?k^xDu__;`Jft6J5-(hoHbj(o!TEMNN0by09^su5H7v-EJ+QA_n2ziV zx|E6oh5dE^%yhJPP z$h6nw;r?#m{9|xeQ_5To?yl&rc3?@PH!gi}3ijQ7#T{5Red}DG!#9XN!LUp<0BOY|! zB-Va}>;6h>2&=A-h4iajAk!3;#6#@~78Rp%5;QH1VzcJ~XhQ$+;i%k~`XE!~bg6@u ziS*1E{FZYVkpTx#f*q!dpxcXWGGR9D7R*Ht7fp`)DFbegp@?>Xo2Z;9u_iDvseub0 z=V_=q$Cdm_NgU~~;5xlWoYuk`WypeX?PKKs@R?$h{>9 zhl|*!R=VBtftm~^iqF|HI1pbb^cizRZR?KEvl_9$si>%srldu7i`_ysN_AO@Zmt&n z8+>#pSNxc?(hSX}oP8qw`!%m=IXfwcK8VCVWi`@h%XOXmqMLK}pW1NZ{6B(#mxQ9Z zRNuO)_VB&6Fm0l_=dS=(MmPG*f*bl`L?5TJsM(;c~X2N5}Gc zu9&+Q1p<{y8@Ct)Is?P!FI0ELAk>Xmq=;BGq_1;cUfvd$N4qb&%6A(~a`Q?~r5END zOle!Vd?kr^MYQljU7Ul^$N6!h=2vWvD%I9#^eHj6Noonh(B*?(l!FHZ?mVS{(d{=S zStu}y-3??Uvj7wpIG`Z{K@W!fhb*{}G08$127THn-IfY} zBE5hIp2V0P70Fu_uH_`MH6SazLuXvhlF=Biul$(or43gNkG=M9$WO)*Qi!_9)nD2C zS0!k8*Gk1_+Hox>@Ty45Ce)Slo8JiA_5tjAIY~L+?JCS>advJlO*xY%J$f4e(Bq6e z)yYwBZp(}+y4k`#H}0!vaBoN>K7H!Jc>KcX zz5~hX-GtIVwLs*;d%NLIFNX*_2a#BaZRgq!vt`!KPt7qVz9I?qg(H;MwBZ0pz8aHW zZYLV9#=nep+!}hcxdto=S$PF&>z?BV;&9=7o*aiz;QO%H>#|U)rXbfhl@X=A1m4+$ zC#MyehsZH!f_aH_E!ARtgfF1Ke@;vell?zV{#yG>Nn>^d#r`EI7!kR6u}>@EEs(tW z`AQ6#^V?*GMP(?gtub-={t;G8N%|D~M45%;0cdOn4Z|UGo0t9qq`#jVOU_-( zse4KtAZ^g(_r|s-(`&S;-MZOGW_XTLX{E>b8AJ(V(oQz`>i*`>QB@H`NhH8YC9Jgr;@$uQoxT5#7)kv_ta$0F&fD_sdgPX zXDTzkFZy+i;xoe}>}x%7EI%hflc5S<{@*p=srBKZ39wnJ+NBDGQdl|d6mr53KESQu z=8&$QHds0{{<1#AGqISHYbYlV~5*cT4yW1o)AmW>R0Ii?Hdy*Oq zHP@KkY+T$Yqr+f4iU#UqR>gY3=ZKQ; z7=3=&QI-gnpS9rLyxyIuC-`69+ysUnL3wOyqQysv15ibb6iAV^ z*D#Vy&uGMGw264@Gn6cX@+QCO(?WH<^%sh5;*lPQMr|2>pbj>?b`Uh{xH~aD-0hLuAbQ6!I>^eVV|I4vuSFE=PzEscaA){$ zFiRS^C}J9ra>1XFcttTPr7#gSJ^)=X{bUgIMb0y$o4ah>_k8@s)b^U?DAiCsCZ)ME zj&jjQ5Y2g&M-&0DjGrppEiO`lI4 z=uw~fX;A_RJ1Gn<_=OR`Ap{-36};U!>+94?sKke1e>wbV%DAZkrs$wrIeZg79Kt0V zH~hu$M|I9Cc`-zbq-?tXY|*KqhPj#1ZBk|5$cP5V`Cc(lx`n8*ii5T$hV*+Q-d7C> z=WQr!=;mf(Ihxn|tZKgiBLN&M={fXl`jr$?u_5gyDtp`sp!F7R;3O-zkCe7I-dUKx zSD}Gzm~a)12IzDBs#Q&LCbDadju{w@vRZM8h=MZv`;%IY;Oy;xDi+QlfWu$p=Lc-) zj9j>6gvF!l{%u}LL`mRmmy8BsSFcs*+T)!unp{|4!1>lhNI6}gQ12GlNu*OhLTrH4 z9e)?n)^(<$mA@r_aEJe{U~oNoko)fd$S=yQe|iE-vyAD-I8vxJe;#Ri4)2_o3Vr=` ziRCvs;%$*@aLle_Mifsz5B(>H@=U(JU4N1DN!f2Ab7^L}9ADhphMG(hXCy!Ke*lza zR=^m;%m_NMx7bk~2xd*6dcG;;>wUQk0IG3;F5ka4-40CFR>?Ecg zOpe}KAYyi>D53TRbvU$)Z%*Y0M3l%$cp-WRU7`xPvuS@LUGIr(KU(hvq2A3agGFUa zq;P@c^z*IXDX2@1;{7rj{~0K`1BJT)({+CVZBWxZ<6u2XVq#J#$5+s*BVf7PWb3CK zVVoq^HlVEwRDS=bUFZ4-Cx#v~_1WH=bNA##_AH5b#z!n_w72d2b$|QK)`0zyRKbB> zMnQDYxcN$Qzz;T>BrC`T#|>U6h0x_F!Rl?J-MHx(Pd?330@c5+vt$IkS~yF3?~ng# z;tLmC(&O;g^$qTnAhunKifynLOW&~v7oRKU&k}=Dz5V|kNYVS1KdK5Jkw)C~of-eh zN&NFE1{yIU;z7rdPNz88>Z)&-4M+SK#^3Ov`smu&lBCge3Zyes$<(niA9zj_>#(s2 zI0+p4bekOUeoXvu+~~st#Z!YD)N1s>oVVBNq2b>?3%-un;MXf9@P0N?)$wewH7(9>4A76>jU^SU>1=sAq>reL5UOw<{np{$G)UzWr)c(h~ z*k!N6Z$o45Rsdjpm$mn_Fi*SMA|X~bN(}U*Uy7~DKfAQq+W&SDiVD1*ft`9tsT2wh zt=)nE+s!J`(3IRuGfQr!jw<)A`qrVM0Ghe>}VzI0CiZ2$tw>(>v-1x&n zY)o{wj27Yf+&7yDY7I8o*8Ft;e%m!@T$-17&I^zvVf|pA*+n`2plR2c?#vqLG)2&oNn(l*MsQ8=w-Y@CN$=YqJuV2ADNBp(@L8LAe zNKt}hS$Tke+cFq|>5vXU#yXthH#GISMpP?!?T7I03|pbE^|{Ek2+S04EXaqM@n}v? z1cCjRl+kwbCvFN#OQT@O>jjTe=Q6c7;ovikEZwL-xRQ>q%U0&l`UHu6jinNMPXt4x zl)!N1q6*_lIaChr^)*&qt}U=h34@E&i-V{0mAhrD#U#?$KOwv;M0^i9eh(Cz5Z1IQ zv)XwZ#-3TxSo~u8u?$R{JRz7*VhqoS{svSW6k>M$@b*zmziyLNsGeSW9I1Ap^^}Ej zl%+_B)Nop~QO(6PX1xM@6rz+k7hRrw0rvOgUh;8Tl|((ernZsiCu$^Sb?|nv?KRM;(fHh zkD&NWQ|ht4CIq*}&TNeHlQcJu_GSiv;`l@QVbaBKJr~<$s*~*z)8ppjn0?#NGs#xf zA8o)8D`M|s_Zi#oI^Y#JbnV_FW5uuhfp>05BaQQC9_xXn{_w4YFC5r@FwCgk|!bk%$U+aEF_NO%)+Y)2@|k24QBB*7Xap@ODubDAV{>b*lz+KPY{`?_PaKMX@3lr-NzcV$PkWmn@#*f9 zEq4EA{fI^5OEPy&^bZ)a0kBEbKCMdp-}B$P8@VmHu8=)z5XNOv?pk|w?K&Yz0(8Em zu%Rgs`K-ZR7R2ivqC#l(9ljxd3sT7X z8a|kMw9L+OlMlno^yq}W2_5b7E{WR{J5TuoWxb`dAkD5d3(xvC*gxtHTc7q-$F!|z z!a~jbk(%KCXZn)om;qvmM4U0`-))y7!FD_rVOOf(Ag88|LMLL0)6>?jq$A_8%9x8w zw>f;Bl#ELtRk#{FdF_c90Dl_!UcCFfVKF(4W<9<@O3+^lHbHG&oajpIx`6!=E97i%0Mg9v)tS zL9>v-S0SRW-d9NY`1obl+tW2VN8|gi4wq1%L*ZrgY^9Q>Z z&U<#XtBo=kTs$90>F7AbMw5muPQ7or*bEvF-4;G;#r6k^D5F#xJz`>FYAbQG zF!}lXAR{9~yl_T|k$~#M>4E#7t8JAQuPcRXe*0STi9E&b&)pFZRUOkjSYL$PUK~4* zwp-Nd{}>$|9PFIuUIOvyOYPHYSii?j^RSA6_`<@{@+)e*X;bhMdnj5RKqTmQ!qx=IH?rrEs7O2FXgIQmfH&OS8a- zHTs;m0@WJyvc@thorNFp`VH@8hIMMncD4`Z8%YYYWlc|>rm73`d_rYTcXMC-O3Yx+ z3me>iw|jZCoh!`(wMsvNGLE@?Eqmxe90D)B7w_J^JG?F~Un_pv5*TN#ZIZ3hoj!;ED?8^|( zDadyue)Y}NJ5~Z=_pibcAbJH4#f4w=Ja0Qze*|kQa3xDUU1%Ni3FjPODae<~E+3R+ z$ETZ%m}(~!_&vD)!hae9n~%2x`|f>z&tyO<6mJ4+d zV$?uKlgdB8Faaka-);Xab?oA(x59Q4-DPJ|<*MGwNdbdRs|l6aw1-BB@kPxcK~C2X z;J+hrbME-m{sQN?CqI1bumLx;sTgB1iidx5Zq&+xE$oOc)7r zFSZMuRBXlYJ1?R}$vq19_mm)ruXrr`X=O^&pdGX?abVOe2py(-E_vTD9i?Abvwn>v zV&&rFRj)xN*(Mi0jS1!(i{HG?{f1C6U9%kHyno3?>lk3|yxb(?te7Nl%v2*V+Yi5Bk82kT*vTE!tLoXJ~x$ zr`KnDiBCToTGi;VKAEvSuujp#Dv0-DRV#o3?_CU+hmyI$ zK7Wk3nI?{^DJvv;@2vT+_WxnoHw4z_5;t>7nG}dE*FFbO@aA(XFmw(~@#d)HPBqzM zT>iVq;7DUp(`5iW$N1?}ev)#f^hkUCgU;{EK5tmgPjrPjbgC}>b%ldd$;tS-rcbt5 z=2qZpXg8jKa)%M#*e>-C-&#wM=z9fG)BL@4ye?RMv^DRLZ9P?FZjdU^Eha_BLi~tT zV{PgC@54Vs+Ng-|^4&{o3B+1;W?ZVhpVXaX9Q*a92^|h;Xd9B~pG9Q12Y^Qs~3hk#VG{zUTW}fpv8nn#TyRryGXwb#uG4ATid9dQ1L63dHL{ zc#m-(J<`imXhC3Xcm~%>P3?P$H&^pEAXg!QiKr1|AL!!WYZg?!d!>q>P^R@Mv%k}* zQcI0B!~wDE6^yd%O_gc>R=t1uMaZ>?9-O3nm^v88*&5zV)O2yyX4ysr+-dOQ<`d=4 zY%>bzXre){RXAhEM=pBhf(@V`J{3#Pub_YlQ%SjJ&0H+QyjY_s=qY4;zJhQcJX-N! zdlV-Jp0JQkQ5;~eVku*nMRI@R!Fx%`Nz@3#v1@V%qmd`o4^`da#b zF0Duer4IfP@ih8%Y`*g|+q0iRp3k(d;RG7OqF)9~p{D!Y;>+ELr?k1CJnigQ3G-%% zrBgjawBW{hs5(EuqUy=XTN!JYqKGS2YnAW@bpwx|--eiu-$pM`29cRz%lkRW@6VrM zjF2hOD|RmJL6kSSpMPd6@2?-I2d;Yy^`fcD({Z{xt;!X%biec>Zbsu{kL3eL~QJ&@!-_ zE+y{E2&(wOa7vK&!H~3sgr90<>JX#wTqA$F=lzGSo}PElh{h{a9(!>+Q2j>>+Y~a7 z&)c0UHtkY)8b3?5kQ)cphI?~)^`R4aVY-kT5a%+zW4oCGyq5d-93aolkJXPlTtHF| z5XtkoGkrYz1#^Ydbj^qcz#|zQ1LN7UTvwZkFyVO9)2j2+8)Nx)zqD4){b1sZR7cptI* zqoo_G)JfQ|OQ87Z%|UOtdhsE!xVf)>_*yv)vS0d)OP+e}GMhgH?HAcvT=lsuX zvEDuwIWMf()KwmR92iAtMX-R+bH4Qv6a4~|a06e;5B2o}U;2Famav!$|EUGB96PtH z@q%B6f{jT5)dt8*FLpse^?M@qd5yj@9Oya;_kCthF;r!vG>*9=k+H~(I SJWhtw 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/StandaloneDialog.qml qml/StyleDialog.qml - qml/images/ignition_logo_50x50.png + qml/images/gazebo_logo.png qml/images/drawer.png qml/images/menu.png qml/images/export_icon.png diff --git a/include/ignition/gui/qml/Main.qml b/include/ignition/gui/qml/Main.qml index 67aa99e87..15d5ba89e 100644 --- a/include/ignition/gui/qml/Main.qml +++ b/include/ignition/gui/qml/Main.qml @@ -24,7 +24,7 @@ import "qrc:/qml" ApplicationWindow { - title: qsTr("Ignition GUI") + title: qsTr("Gazebo GUI") width: 1200 height: 1000 minimumWidth: 300 @@ -255,7 +255,7 @@ ApplicationWindow id: aboutDialog modal: true focus: true - title: "Ignition GUI" + title: "Gazebo GUI" x: (window.width - width) / 2 y: window.height / 6 width: Math.min(window.width, window.height) / 3 * 2 diff --git a/include/ignition/gui/qml/images/ignition_logo_50x50.png b/include/ignition/gui/qml/images/ignition_logo_50x50.png deleted file mode 100644 index 61ea6b9d2f9940b314a111d842fd025a0c1b34cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4336 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/StandaloneDialog.qml qml/StyleDialog.qml - qml/images/ignition_logo_50x50.png + qml/images/gazebo_logo.png qml/images/drawer.png qml/images/menu.png qml/images/export_icon.png diff --git a/src/Application.cc b/src/Application.cc index 69b8a2ddd..188a9daa5 100644 --- a/src/Application.cc +++ b/src/Application.cc @@ -93,9 +93,9 @@ Application::Application(int &_argc, char **_argv, const WindowType _type) { igndbg << "Initializing application." << std::endl; - this->setOrganizationName("Ignition"); - this->setOrganizationDomain("ignitionrobotics.org"); - this->setApplicationName("Ignition GUI"); + this->setOrganizationName("Gazebo"); + this->setOrganizationDomain("gazebosim.org"); + this->setApplicationName("Gazebo GUI"); #if __APPLE__ // Use the Metal graphics API on macOS. diff --git a/src/Conversions_TEST.cc b/src/Conversions_TEST.cc index 266ca0709..1f87a2de4 100644 --- a/src/Conversions_TEST.cc +++ b/src/Conversions_TEST.cc @@ -30,7 +30,7 @@ using namespace gui; ///////////////////////////////////////////////// TEST(ConversionsTest, Color) { - // Ignition to Qt to Ignition + // Gazebo to Qt to Gazebo { double red = 0.1; double green = 0.3; @@ -48,7 +48,7 @@ TEST(ConversionsTest, Color) EXPECT_NEAR(newColor.A(), newColor.A(), tol); } - // Qt to Ignition to Qt + // Qt to Gazebo to Qt { int red = 100; int green = 150; @@ -66,13 +66,13 @@ TEST(ConversionsTest, Point2d) double x = -0.5; double y = 123; - // Ignition to Qt to Ignition + // Gazebo to Qt to Gazebo { math::Vector2d point(x, y); EXPECT_EQ(convert(convert(point)), point); } - // Qt to Ignition to Qt + // Qt to Gazebo to Qt { QPointF point(x, y); EXPECT_EQ(convert(convert(point)), point); @@ -86,13 +86,13 @@ TEST(ConversionsTest, Vector3d) double y = 0; double z = 1234; - // Ignition to Qt to Ignition + // Gazebo to Qt to Gazebo { math::Vector3d vec(x, y, z); EXPECT_EQ(convert(convert(vec)), vec); } - // Qt to Ignition to Qt + // Qt to Gazebo to Qt { QVector3D vec(x, y, z); EXPECT_EQ(convert(convert(vec)), vec); diff --git a/src/MainWindow.cc b/src/MainWindow.cc index d78093217..ed3927e71 100644 --- a/src/MainWindow.cc +++ b/src/MainWindow.cc @@ -118,7 +118,7 @@ MainWindow::MainWindow() return; } - App()->setWindowIcon(QIcon(":/qml/images/ignition_logo_50x50.png")); + App()->setWindowIcon(QIcon(":/qml/images/gazebo_logo.png")); } ///////////////////////////////////////////////// diff --git a/src/cmd/cmdgui.rb.in b/src/cmd/cmdgui.rb.in index 2b766662f..c924127ec 100644 --- a/src/cmd/cmdgui.rb.in +++ b/src/cmd/cmdgui.rb.in @@ -37,7 +37,7 @@ COMMON_OPTIONS = " \n" + ' --versions Show the available versions.' COMMANDS = { 'gui' => - "Ignition GUI tool.\n\n" + + "Gazebo GUI tool.\n\n" + " ign gui [options]\n\n" + "Options:\n\n" + " -l [ --list ] List all available plugins.\n" + @@ -56,7 +56,7 @@ COMMANDS = { 'gui' => } # -# Class for the Ignition gui command line tools. +# Class for the Gazebo gui command line tools. # class Cmd # diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index d6a9efb7e..4882f2237 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -4,7 +4,7 @@ # [PUBLIC_LINK_LIBS ] # [PRIVATE_LINK_LIBS ]) # -# Add a plugin library to Ignition GUI. +# Add a plugin library to Gazebo GUI. # # Required. Name of the library # @@ -46,7 +46,7 @@ endfunction() # [PUBLIC_LINK_LIBS ] # [PRIVATE_LINK_LIBS ]) # -# Add a plugin to Ignition GUI. +# Add a plugin to Gazebo GUI. # # Required. Name of the plugin. # diff --git a/src/plugins/grid_config/GridConfig.hh b/src/plugins/grid_config/GridConfig.hh index e825de7b8..a9b71d8b0 100644 --- a/src/plugins/grid_config/GridConfig.hh +++ b/src/plugins/grid_config/GridConfig.hh @@ -29,7 +29,7 @@ namespace gui { class GridConfigPrivate; - /// \brief Manages grids in an Ignition Rendering scene. This plugin can be + /// \brief Manages grids in an Gazebo Rendering scene. This plugin can be /// used for: /// * Introspecting grids /// * Editing grids diff --git a/src/plugins/image_display/ImageDisplay.hh b/src/plugins/image_display/ImageDisplay.hh index c445a9b4e..88f68ab81 100644 --- a/src/plugins/image_display/ImageDisplay.hh +++ b/src/plugins/image_display/ImageDisplay.hh @@ -37,7 +37,7 @@ namespace plugins { class ImageDisplayPrivate; - /// \brief Display images coming through an Ignition transport topic. + /// \brief Display images coming through an Gazebo Transport topic. /// /// ## Configuration /// diff --git a/src/plugins/image_display/ImageDisplay.qml b/src/plugins/image_display/ImageDisplay.qml index b36bdb3e4..fa78102e1 100644 --- a/src/plugins/image_display/ImageDisplay.qml +++ b/src/plugins/image_display/ImageDisplay.qml @@ -83,7 +83,7 @@ Rectangle { ToolTip.visible: hovered ToolTip.delay: tooltipDelay ToolTip.timeout: tooltipTimeout - ToolTip.text: qsTr("Ignition transport topics publishing Image messages") + ToolTip.text: qsTr("Gazebo Transport topics publishing Image messages") } } Image { diff --git a/src/plugins/marker_manager/MarkerManager.cc b/src/plugins/marker_manager/MarkerManager.cc index bc4ba1db0..cb98c67f2 100644 --- a/src/plugins/marker_manager/MarkerManager.cc +++ b/src/plugins/marker_manager/MarkerManager.cc @@ -122,7 +122,7 @@ class ignition::gui::plugins::MarkerManagerPrivate public: std::map> visuals; - /// \brief Ignition node + /// \brief Gazebo node public: ignition::transport::Node node; /// \brief Topic name for the marker service diff --git a/src/plugins/minimal_scene/MinimalScene.hh b/src/plugins/minimal_scene/MinimalScene.hh index cf76c1cfe..a083d3923 100644 --- a/src/plugins/minimal_scene/MinimalScene.hh +++ b/src/plugins/minimal_scene/MinimalScene.hh @@ -43,7 +43,7 @@ namespace plugins /// It is possible to orbit the camera around the scene with /// the mouse. Use other plugins to manage objects in the scene. /// - /// Only one plugin displaying an Ignition Rendering scene can be used at a + /// Only one plugin displaying an Gazebo Rendering scene can be used at a /// time. /// /// ## Configuration diff --git a/src/plugins/navsat_map/NavSatMap.hh b/src/plugins/navsat_map/NavSatMap.hh index eadddbb88..e9c739b04 100644 --- a/src/plugins/navsat_map/NavSatMap.hh +++ b/src/plugins/navsat_map/NavSatMap.hh @@ -37,7 +37,7 @@ namespace plugins { class NavSatMapPrivate; - /// \brief Display NavSat messages coming through an Ignition transport topic + /// \brief Display NavSat messages coming through an Gazebo Transport topic /// on top of a map. /// /// ## Configuration diff --git a/src/plugins/navsat_map/NavSatMap.qml b/src/plugins/navsat_map/NavSatMap.qml index 9977fad9e..3e7659b29 100644 --- a/src/plugins/navsat_map/NavSatMap.qml +++ b/src/plugins/navsat_map/NavSatMap.qml @@ -65,7 +65,7 @@ Item { } ToolTip.visible: hovered ToolTip.delay: Qt.styleHints.mousePressAndHoldInterval - ToolTip.text: qsTr("Ignition Transport topics publishing NavSat messages") + ToolTip.text: qsTr("Gazebo Transport topics publishing NavSat messages") } } diff --git a/src/plugins/plotting/TransportPlotting.hh b/src/plugins/plotting/TransportPlotting.hh index 3b3da6336..96c214672 100644 --- a/src/plugins/plotting/TransportPlotting.hh +++ b/src/plugins/plotting/TransportPlotting.hh @@ -30,7 +30,7 @@ namespace gui namespace plugins { -/// \brief Plots fields from Ignition Transport topics. +/// \brief Plots fields from Gazebo Transport topics. /// Fields can be dragged from the Topic Viewer or the Component Inspector. class TransportPlotting : public ignition::gui::Plugin { diff --git a/src/plugins/point_cloud/PointCloud.qml b/src/plugins/point_cloud/PointCloud.qml index 5a4ef1eab..41bbafdd0 100644 --- a/src/plugins/point_cloud/PointCloud.qml +++ b/src/plugins/point_cloud/PointCloud.qml @@ -89,7 +89,7 @@ ColumnLayout { } ToolTip.visible: hovered ToolTip.delay: Qt.styleHints.mousePressAndHoldInterval - ToolTip.text: qsTr("Ignition transport topics publishing PointCloudPacked messages") + ToolTip.text: qsTr("Gazebo Transport topics publishing PointCloudPacked messages") } Label { @@ -110,7 +110,7 @@ ColumnLayout { } ToolTip.visible: hovered ToolTip.delay: Qt.styleHints.mousePressAndHoldInterval - ToolTip.text: qsTr("Ignition transport topics publishing FloatV messages, used to color each point on the cloud") + ToolTip.text: qsTr("Gazebo Transport topics publishing FloatV messages, used to color each point on the cloud") } Label { diff --git a/src/plugins/publisher/Publisher.hh b/src/plugins/publisher/Publisher.hh index f5ec11cdc..2ff95415f 100644 --- a/src/plugins/publisher/Publisher.hh +++ b/src/plugins/publisher/Publisher.hh @@ -40,7 +40,7 @@ namespace plugins { class PublisherPrivate; - /// \brief Widget which publishes a custom Ignition transport message. + /// \brief Widget which publishes a custom Gazebo Transport message. /// /// ## Configuration /// This plugin doesn't accept any custom configuration. diff --git a/src/plugins/scene3d/Scene3D.hh b/src/plugins/scene3d/Scene3D.hh index 0053da51b..980b0b729 100644 --- a/src/plugins/scene3d/Scene3D.hh +++ b/src/plugins/scene3d/Scene3D.hh @@ -46,7 +46,7 @@ namespace plugins /// It is possible to orbit the camera around the scene with /// the mouse. Use other plugins to manage objects in the scene. /// - /// Only one plugin displaying an Ignition Rendering scene can be used at a + /// Only one plugin displaying an Gazebo Rendering scene can be used at a /// time. /// /// ## Configuration diff --git a/src/plugins/tape_measure/TapeMeasure.cc b/src/plugins/tape_measure/TapeMeasure.cc index 86fb81464..422226dbc 100644 --- a/src/plugins/tape_measure/TapeMeasure.cc +++ b/src/plugins/tape_measure/TapeMeasure.cc @@ -37,7 +37,7 @@ namespace ignition::gui { class TapeMeasurePrivate { - /// \brief Ignition communication node. + /// \brief Gazebo communication node. public: transport::Node node; /// \brief True if currently measuring, else false. diff --git a/src/plugins/topic_echo/TopicEcho.hh b/src/plugins/topic_echo/TopicEcho.hh index 9a53638c0..94f42e088 100644 --- a/src/plugins/topic_echo/TopicEcho.hh +++ b/src/plugins/topic_echo/TopicEcho.hh @@ -38,7 +38,7 @@ namespace plugins { class TopicEchoPrivate; - /// \brief Echo messages coming through an Ignition transport topic. + /// \brief Echo messages coming through an Gazebo Transport topic. /// /// ## Configuration /// This plugin doesn't accept any custom configuration. diff --git a/src/plugins/transport_scene_manager/TransportSceneManager.hh b/src/plugins/transport_scene_manager/TransportSceneManager.hh index b13a9bfbd..478ad9b71 100644 --- a/src/plugins/transport_scene_manager/TransportSceneManager.hh +++ b/src/plugins/transport_scene_manager/TransportSceneManager.hh @@ -30,7 +30,7 @@ namespace plugins { class TransportSceneManagerPrivate; - /// \brief Provides an Ignition Transport interface to + /// \brief Provides a Gazebo Transport interface to /// `ignition::gui::plugins::MinimalScene`. /// /// ## Configuration From 96db6c510b79626e5b41042314e43a14cb036afd Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Thu, 19 May 2022 16:27:35 -0700 Subject: [PATCH 2/2] More Gazebo Signed-off-by: Louise Poubel --- include/gz/gui/Conversions.hh | 2 +- include/gz/gui/Helpers.hh | 4 ++-- src/plugins/minimal_scene/MinimalScene.hh | 2 +- src/plugins/scene3d/Scene3D.hh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/gz/gui/Conversions.hh b/include/gz/gui/Conversions.hh index 322768e90..f32bd6652 100644 --- a/include/gz/gui/Conversions.hh +++ b/include/gz/gui/Conversions.hh @@ -96,7 +96,7 @@ namespace ignition IGNITION_GUI_VISIBLE common::MouseEvent convert(const QWheelEvent &_e); - /// \brief Return the equivalent ignition key event. + /// \brief Return the equivalent Gazebo key event. /// /// \param[in] _e Qt key event /// \return Gazebo key event diff --git a/include/gz/gui/Helpers.hh b/include/gz/gui/Helpers.hh index d25b5c759..72e95912f 100644 --- a/include/gz/gui/Helpers.hh +++ b/include/gz/gui/Helpers.hh @@ -91,9 +91,9 @@ namespace ignition /// \brief Import path for ign-gui QML modules added to the Qt resource /// system. This helper function returns the QRC resource path where custom - /// ignition QML modules can be imported from. To import an ignition QML + /// Gazebo QML modules can be imported from. To import a Gazebo QML /// module, add this path to the QML engine's import path list before - /// attempting to load a QML file that imports ignition QML modules. + /// attempting to load a QML file that imports Gazebo QML modules. /// \return Resousrce path prefix as a string IGNITION_GUI_VISIBLE const QString qmlQrcImportPath(); diff --git a/src/plugins/minimal_scene/MinimalScene.hh b/src/plugins/minimal_scene/MinimalScene.hh index a083d3923..525f92c75 100644 --- a/src/plugins/minimal_scene/MinimalScene.hh +++ b/src/plugins/minimal_scene/MinimalScene.hh @@ -39,7 +39,7 @@ namespace gui { namespace plugins { - /// \brief Creates an ignition rendering scene and user camera. + /// \brief Creates a Gazebo rendering scene and user camera. /// It is possible to orbit the camera around the scene with /// the mouse. Use other plugins to manage objects in the scene. /// diff --git a/src/plugins/scene3d/Scene3D.hh b/src/plugins/scene3d/Scene3D.hh index 980b0b729..8844d2503 100644 --- a/src/plugins/scene3d/Scene3D.hh +++ b/src/plugins/scene3d/Scene3D.hh @@ -42,7 +42,7 @@ namespace plugins class RenderWindowItemPrivate; class Scene3DPrivate; - /// \brief Creates an ignition rendering scene and user camera. + /// \brief Creates a Gazebo rendering scene and user camera. /// It is possible to orbit the camera around the scene with /// the mouse. Use other plugins to manage objects in the scene. ///