additional places for measurement commands

FreeCAD · Dec 19, 2013 · 50a2c1a · 50a2c1a
1 parent 3f4f5c8
commit 50a2c1a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp
@@ -2225,8 +2225,8 @@ CmdViewMeasureClearAll::CmdViewMeasureClearAll()
   : Command("View_Measure_Clear_All")
 {
     sGroup        = QT_TR_NOOP("Measure");
-    sMenuText     = QT_TR_NOOP("Clear All");
-    sToolTipText  = QT_TR_NOOP("Clear All");
+    sMenuText     = QT_TR_NOOP("Clear measurement");
+    sToolTipText  = QT_TR_NOOP("Clear measurement");
     sWhatsThis    = sToolTipText;
     sStatusTip    = sToolTipText;
     sPixmap       = "Part_Measure_Clear_All";
@@ -2254,8 +2254,8 @@ CmdViewMeasureToggleAll::CmdViewMeasureToggleAll()
   : Command("View_Measure_Toggle_All")
 {
   sGroup        = QT_TR_NOOP("Measure");
-  sMenuText     = QT_TR_NOOP("Toggle All");
-  sToolTipText  = QT_TR_NOOP("Toggle All");
+  sMenuText     = QT_TR_NOOP("Toggle measurement");
+  sToolTipText  = QT_TR_NOOP("Toggle measurement");
   sWhatsThis    = sToolTipText;
   sStatusTip    = sToolTipText;
   sPixmap       = "Part_Measure_Toggle_All";

diff --git a/src/Gui/Workbench.cpp b/src/Gui/Workbench.cpp
@@ -475,7 +475,8 @@ MenuItem* StdWorkbench::setupMenuBar() const
     visu->setCommand("Visibility");
     *visu << "Std_ToggleVisibility" << "Std_ShowSelection" << "Std_HideSelection"
           << "Separator" << "Std_ToggleObjects" << "Std_ShowObjects" << "Std_HideObjects" 
-          << "Separator" << "Std_ToggleSelectability";
+          << "Separator" << "Std_ToggleSelectability"
+          << "Separator" << "View_Measure_Toggle_All" << "View_Measure_Clear_All";
 
     // View
     MenuItem* view = new MenuItem( menuBar );

diff --git a/src/Mod/Part/Gui/Workbench.cpp b/src/Mod/Part/Gui/Workbench.cpp
@@ -67,10 +67,6 @@ Gui::MenuItem* Workbench::setupMenuBar() const
     bop->setCommand("Boolean");
     *bop << "Part_Boolean" << "Part_Cut" << "Part_Fuse" << "Part_Common";
 
-    Gui::MenuItem* measure = new Gui::MenuItem;
-    measure->setCommand("Measure");
-    *measure << "Part_Measure_Linear" << "Part_Measure_Angular" << "Part_Measure_Clear_All" << "Part_Measure_Toggle_All" <<
-      "Part_Measure_Toggle_3d" << "Part_Measure_Toggle_Delta";
 
     Gui::MenuItem* part = new Gui::MenuItem;
     root->insertItem(item, part);
@@ -79,12 +75,18 @@ Gui::MenuItem* Workbench::setupMenuBar() const
     *part << prim << "Part_Primitives" << "Part_Builder" << "Separator"
           << "Part_ShapeFromMesh" << "Part_MakeSolid" << "Part_ReverseShape"
           << "Part_SimpleCopy" << "Part_RefineShape" << "Part_CheckGeometry"
-	  << measure << "Separator" << bop << "Separator"
+	      << "Separator" << bop << "Separator"
           << "Part_CrossSections" << "Part_Compound" << "Part_Extrude"
           << "Part_Revolve" << "Part_Mirror" << "Part_Fillet" << "Part_Chamfer"
           << "Part_RuledSurface" << "Part_Loft" << "Part_Sweep"
           << "Part_Offset" << "Part_Thickness";
 
+    Gui::MenuItem* measure = new Gui::MenuItem;
+    root->insertItem(item,measure);
+    measure->setCommand("Measure");
+    *measure << "Part_Measure_Linear" << "Part_Measure_Angular" << "Separator" << "Part_Measure_Clear_All" << "Part_Measure_Toggle_All" <<
+      "Part_Measure_Toggle_3d" << "Part_Measure_Toggle_Delta";
+
     // leave this for 0.14 until #0000477 is fixed
 #if 0
     Gui::MenuItem* view = root->findItem("&View");
@@ -122,7 +124,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
 
     Gui::ToolBarItem* measure = new Gui::ToolBarItem(root);
     measure->setCommand("Measure");
-    *measure << "Part_Measure_Linear" << "Part_Measure_Angular" << "Part_Measure_Clear_All" << "Part_Measure_Toggle_All"
+    *measure << "Part_Measure_Linear" << "Part_Measure_Angular"  << "Separator" << "Part_Measure_Clear_All" << "Part_Measure_Toggle_All"
              << "Part_Measure_Toggle_3d" << "Part_Measure_Toggle_Delta";
 
     return root;