Update status message by removing colon or adjust colon position (#624)

Signed-off-by: Chen Lihui <lihui.chen@sony.com>
ros2 · Nov 6, 2020 · 5ec2e5a · 5ec2e5a
1 parent a49fc7c
commit 5ec2e5a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/rviz_default_plugins/src/rviz_default_plugins/view_controllers/fps/fps_view_controller.cpp b/rviz_default_plugins/src/rviz_default_plugins/view_controllers/fps/fps_view_controller.cpp
@@ -118,13 +118,13 @@ void FPSViewController::handleMouseEvent(rviz_common::ViewportMouseEvent & event
 void FPSViewController::setCursorStatus(rviz_common::ViewportMouseEvent & event)
 {
   if (event.shift()) {
-    setStatus("<b>Left-Click:</b> Move X/Y.  <b>Right-Click:</b>: Move Z.");
+    setStatus("<b>Left-Click:</b> Move X/Y.  <b>Right-Click:</b> Move Z.");
   } else {
     setStatus(
       "<b>Left-Click:</b> Rotate.  "
       "<b>Middle-Click:</b> Move X/Y.  "
-      "<b>Right-Click:</b>: Zoom.  "
-      "<b>Shift</b>: More options.");
+      "<b>Right-Click:</b> Zoom.  "
+      "<b>Shift:</b> More options.");
   }
 }
 

diff --git a/...default_plugins/src/rviz_default_plugins/view_controllers/orbit/orbit_view_controller.cpp b/...default_plugins/src/rviz_default_plugins/view_controllers/orbit/orbit_view_controller.cpp
@@ -165,17 +165,17 @@ void OrbitViewController::setShiftOrbitStatus()
 {
   setStatus(
     "<b>Left-Click:</b> Move X/Y.  "
-    "<b>Right-Click:</b>: Move Z.  "
-    "<b>Mouse Wheel:</b>: Zoom.");
+    "<b>Right-Click:</b> Move Z.  "
+    "<b>Mouse Wheel:</b> Zoom.");
 }
 
 void OrbitViewController::setDefaultOrbitStatus()
 {
   setStatus(
     "<b>Left-Click:</b> Rotate.  "
     "<b>Middle-Click:</b> Move X/Y.  "
-    "<b>Right-Click/Mouse Wheel:</b>: Zoom.  "
-    "<b>Shift</b>: More options.");
+    "<b>Right-Click/Mouse Wheel:</b> Zoom.  "
+    "<b>Shift:</b> More options.");
 }
 
 bool OrbitViewController::setMouseMovementFromEvent(

diff --git a/...c/rviz_default_plugins/view_controllers/ortho/fixed_orientation_ortho_view_controller.cpp b/...c/rviz_default_plugins/view_controllers/ortho/fixed_orientation_ortho_view_controller.cpp
@@ -88,7 +88,7 @@ void FixedOrientationOrthoViewController::handleMouseEvent(rviz_common::Viewport
   } else {
     setStatus(
       "<b>Left-Click:</b> Rotate.  <b>Middle-Click:</b> Move X/Y. "
-      " <b>Right-Click:</b>: Zoom.  <b>Shift</b>: More options.");
+      " <b>Right-Click:</b> Zoom.  <b>Shift:</b> More options.");
   }
 
   int32_t diff_x = 0;

diff --git a/...t_plugins/src/rviz_default_plugins/view_controllers/xy_orbit/xy_orbit_view_controller.cpp b/...t_plugins/src/rviz_default_plugins/view_controllers/xy_orbit/xy_orbit_view_controller.cpp
@@ -135,7 +135,7 @@ void XYOrbitViewController::lookAt(const Ogre::Vector3 & point)
 
 void XYOrbitViewController::setShiftOrbitStatus()
 {
-  setStatus("<b>Left-Click:</b> Move X/Y.  <b>Right-Click:</b>: Zoom.");
+  setStatus("<b>Left-Click:</b> Move X/Y.  <b>Right-Click:</b> Zoom.");
 }
 
 void XYOrbitViewController::moveFocalPoint(