From 4af7221a70664f0fcc39681cf53f7a8783c4db65 Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 26 Nov 2012 12:24:01 +0100 Subject: [PATCH] Resort sketcher commands --- src/Mod/Complete/Gui/Workbench.cpp | 173 ++++++++++++++++----------- src/Mod/PartDesign/Gui/Workbench.cpp | 44 +++---- src/Mod/Sketcher/Gui/Workbench.cpp | 49 ++++---- 3 files changed, 152 insertions(+), 114 deletions(-) diff --git a/src/Mod/Complete/Gui/Workbench.cpp b/src/Mod/Complete/Gui/Workbench.cpp index 24cd909354..6ccb6b12b4 100644 --- a/src/Mod/Complete/Gui/Workbench.cpp +++ b/src/Mod/Complete/Gui/Workbench.cpp @@ -233,6 +233,53 @@ Gui::MenuItem* Workbench::setupMenuBar() const << "Mesh_Segmentation" << "Mesh_VertexCurvature"; + // Sketch ************************************************************************************************** + + Gui::MenuItem* sketch = new Gui::MenuItem(menuBar); + sketch->setCommand("S&ketch"); + + Gui::MenuItem* geom = new Gui::MenuItem(); + geom->setCommand("Sketcher geometries"); + *geom << "Sketcher_CreatePoint" + << "Sketcher_CreateArc" + << "Sketcher_CreateCircle" + << "Sketcher_CreateLine" + << "Sketcher_CreatePolyline" + << "Sketcher_CreateRectangle" + << "Separator" + << "Sketcher_CreateFillet" + << "Sketcher_Trimming" + << "Sketcher_External" + << "Sketcher_ToggleConstruction"; + + Gui::MenuItem* cons = new Gui::MenuItem(); + cons->setCommand("Sketcher constraints"); + *cons << "Sketcher_ConstrainCoincident" + << "Sketcher_ConstrainPointOnObject" + << "Sketcher_ConstrainVertical" + << "Sketcher_ConstrainHorizontal" + << "Sketcher_ConstrainParallel" + << "Sketcher_ConstrainPerpendicular" + << "Sketcher_ConstrainTangent" + << "Sketcher_ConstrainEqual" + << "Sketcher_ConstrainSymmetric" + << "Separator" + << "Sketcher_ConstrainLock" + << "Sketcher_ConstrainDistanceX" + << "Sketcher_ConstrainDistanceY" + << "Sketcher_ConstrainDistance" + << "Sketcher_ConstrainRadius" + << "Sketcher_ConstrainAngle"; + + *sketch + << "Sketcher_NewSketch" + << "Sketcher_LeaveSketch" + << "Sketcher_ViewSketch" + << "Sketcher_MapSketch" + << geom + << cons + ; + // Part **************************************************************************************************** Gui::MenuItem* part = new Gui::MenuItem(menuBar); @@ -251,44 +298,16 @@ Gui::MenuItem* Workbench::setupMenuBar() const Gui::MenuItem* PartDesign = new Gui::MenuItem(); PartDesign->setCommand("Part design"); - *PartDesign << "Sketcher_NewSketch" - << "Sketcher_LeaveSketch" - << "Sketcher_ViewSketch" - << "Sketcher_MapSketch" - << "Separator" - << "Sketcher_CreatePoint" - << "Sketcher_CreateArc" - << "Sketcher_CreateCircle" - << "Sketcher_CreateLine" - << "Sketcher_CreatePolyline" - << "Sketcher_CreateRectangle" - << "Sketcher_CreateFillet" - << "Sketcher_Trimming" - << "Sketcher_External" - << "Sketcher_ToggleConstruction" - << "Separator" - << "Sketcher_ConstrainLock" - << "Sketcher_ConstrainCoincident" - << "Sketcher_ConstrainPointOnObject" - << "Sketcher_ConstrainDistanceX" - << "Sketcher_ConstrainDistanceY" - << "Sketcher_ConstrainVertical" - << "Sketcher_ConstrainHorizontal" - << "Sketcher_ConstrainDistance" - << "Sketcher_ConstrainRadius" - << "Sketcher_ConstrainParallel" - << "Sketcher_ConstrainPerpendicular" - << "Sketcher_ConstrainAngle" - << "Sketcher_ConstrainTangent" - << "Sketcher_ConstrainEqual" - << "Sketcher_ConstrainSymmetric" - << "Separator" - << "PartDesign_Pad" + *PartDesign << "PartDesign_Pad" << "PartDesign_Pocket" << "PartDesign_Revolution" + << "PartDesign_Groove" << "PartDesign_Fillet" - << "PartDesign_Chamfer"; - + << "PartDesign_Chamfer" + << "PartDesign_Mirrored" + << "PartDesign_LinearPattern" + << "PartDesign_PolarPattern" + << "PartDesign_MultiTransform"; *part << para << PartDesign @@ -478,46 +497,58 @@ Gui::ToolBarItem* Workbench::setupToolBars() const << "Part_Chamfer" ; - // Sketch based - Gui::ToolBarItem* sketch_based = new Gui::ToolBarItem( root ); - sketch_based->setCommand("Sketch based"); - *sketch_based - << "Sketcher_NewSketch" - << "Sketcher_LeaveSketch" - << "Separator" - << "Sketcher_CreatePoint" - << "Sketcher_CreateArc" - << "Sketcher_CreateCircle" - << "Sketcher_CreateLine" - << "Sketcher_CreatePolyline" - << "Sketcher_CreateRectangle" - << "Sketcher_CreateFillet" - << "Sketcher_Trimming" - << "Sketcher_External" - << "Sketcher_ToggleConstruction" - << "Separator" - << "Sketcher_ConstrainLock" - << "Sketcher_ConstrainCoincident" - << "Sketcher_ConstrainPointOnObject" - << "Sketcher_ConstrainDistanceX" - << "Sketcher_ConstrainDistanceY" - << "Sketcher_ConstrainVertical" - << "Sketcher_ConstrainHorizontal" - << "Sketcher_ConstrainDistance" - << "Sketcher_ConstrainRadius" - << "Sketcher_ConstrainParallel" - << "Sketcher_ConstrainPerpendicular" - << "Sketcher_ConstrainAngle" - << "Sketcher_ConstrainTangent" - << "Sketcher_ConstrainEqual" - << "Sketcher_ConstrainSymmetric" - << "Separator" + Gui::ToolBarItem* geom = new Gui::ToolBarItem(root); + geom->setCommand("Sketcher geometries"); + *geom << "Sketcher_NewSketch" + << "Sketcher_LeaveSketch" + << "Separator" + << "Sketcher_CreatePoint" + << "Sketcher_CreateArc" + << "Sketcher_CreateCircle" + << "Sketcher_CreateLine" + << "Sketcher_CreatePolyline" + << "Sketcher_CreateRectangle" + << "Separator" + << "Sketcher_CreateFillet" + << "Sketcher_Trimming" + << "Sketcher_External" + << "Sketcher_ToggleConstruction" + /*<< "Sketcher_CreateText"*/ + /*<< "Sketcher_CreateDraftLine"*/; + + Gui::ToolBarItem* cons = new Gui::ToolBarItem(root); + cons->setCommand("Sketcher constraints"); + *cons << "Sketcher_ConstrainCoincident" + << "Sketcher_ConstrainPointOnObject" + << "Sketcher_ConstrainVertical" + << "Sketcher_ConstrainHorizontal" + << "Sketcher_ConstrainParallel" + << "Sketcher_ConstrainPerpendicular" + << "Sketcher_ConstrainTangent" + << "Sketcher_ConstrainEqual" + << "Sketcher_ConstrainSymmetric" + << "Separator" + << "Sketcher_ConstrainLock" + << "Sketcher_ConstrainDistanceX" + << "Sketcher_ConstrainDistanceY" + << "Sketcher_ConstrainDistance" + << "Sketcher_ConstrainRadius" + << "Sketcher_ConstrainAngle"; + + // Part Design + Gui::ToolBarItem* partdesign = new Gui::ToolBarItem(root); + partdesign->setCommand("Part Design"); + *partdesign << "PartDesign_Pad" << "PartDesign_Pocket" << "PartDesign_Revolution" + << "PartDesign_Groove" << "PartDesign_Fillet" - << "PartDesign_Chamfer"; - + << "PartDesign_Chamfer" + << "PartDesign_Mirrored" + << "PartDesign_LinearPattern" + << "PartDesign_PolarPattern" + << "PartDesign_MultiTransform"; // Drawing Gui::ToolBarItem* drawing = new Gui::ToolBarItem( root ); diff --git a/src/Mod/PartDesign/Gui/Workbench.cpp b/src/Mod/PartDesign/Gui/Workbench.cpp index 9814cc5670..92236c459f 100644 --- a/src/Mod/PartDesign/Gui/Workbench.cpp +++ b/src/Mod/PartDesign/Gui/Workbench.cpp @@ -167,6 +167,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const << "Sketcher_CreateLine" << "Sketcher_CreatePolyline" << "Sketcher_CreateRectangle" + << "Separator" << "Sketcher_CreateFillet" << "Sketcher_Trimming" << "Sketcher_External" @@ -176,22 +177,22 @@ Gui::MenuItem* Workbench::setupMenuBar() const Gui::MenuItem* cons = new Gui::MenuItem(); cons->setCommand("Sketcher constraints"); - *cons << "Sketcher_ConstrainLock" - << "Sketcher_ConstrainCoincident" + *cons << "Sketcher_ConstrainCoincident" << "Sketcher_ConstrainPointOnObject" - << "Sketcher_ConstrainDistanceX" - << "Sketcher_ConstrainDistanceY" << "Sketcher_ConstrainVertical" << "Sketcher_ConstrainHorizontal" - << "Sketcher_ConstrainDistance" - << "Sketcher_ConstrainRadius" << "Sketcher_ConstrainParallel" << "Sketcher_ConstrainPerpendicular" - << "Sketcher_ConstrainAngle" << "Sketcher_ConstrainTangent" << "Sketcher_ConstrainEqual" << "Sketcher_ConstrainSymmetric" - ; + << "Separator" + << "Sketcher_ConstrainLock" + << "Sketcher_ConstrainDistanceX" + << "Sketcher_ConstrainDistanceY" + << "Sketcher_ConstrainDistance" + << "Sketcher_ConstrainRadius" + << "Sketcher_ConstrainAngle"; Gui::MenuItem* part = new Gui::MenuItem; root->insertItem(item, part); @@ -238,14 +239,15 @@ Gui::ToolBarItem* Workbench::setupToolBars() const // << "PartDesign_Scaled" << "PartDesign_MultiTransform"; - part = new Gui::ToolBarItem(root); - part->setCommand("Sketcher geometries"); - *part << "Sketcher_CreatePoint" + Gui::ToolBarItem* geom = new Gui::ToolBarItem(root); + geom->setCommand("Sketcher geometries"); + *geom << "Sketcher_CreatePoint" << "Sketcher_CreateArc" << "Sketcher_CreateCircle" << "Sketcher_CreateLine" << "Sketcher_CreatePolyline" << "Sketcher_CreateRectangle" + << "Separator" << "Sketcher_CreateFillet" << "Sketcher_Trimming" << "Sketcher_External" @@ -253,24 +255,24 @@ Gui::ToolBarItem* Workbench::setupToolBars() const /*<< "Sketcher_CreateText"*/ /*<< "Sketcher_CreateDraftLine"*/; - part = new Gui::ToolBarItem(root); - part->setCommand("Sketcher constraints"); - *part << "Sketcher_ConstrainLock" - << "Sketcher_ConstrainCoincident" + Gui::ToolBarItem* cons = new Gui::ToolBarItem(root); + cons->setCommand("Sketcher constraints"); + *cons << "Sketcher_ConstrainCoincident" << "Sketcher_ConstrainPointOnObject" - << "Sketcher_ConstrainDistanceX" - << "Sketcher_ConstrainDistanceY" << "Sketcher_ConstrainVertical" << "Sketcher_ConstrainHorizontal" - << "Sketcher_ConstrainDistance" - << "Sketcher_ConstrainRadius" << "Sketcher_ConstrainParallel" << "Sketcher_ConstrainPerpendicular" - << "Sketcher_ConstrainAngle" << "Sketcher_ConstrainTangent" << "Sketcher_ConstrainEqual" << "Sketcher_ConstrainSymmetric" - ; + << "Separator" + << "Sketcher_ConstrainLock" + << "Sketcher_ConstrainDistanceX" + << "Sketcher_ConstrainDistanceY" + << "Sketcher_ConstrainDistance" + << "Sketcher_ConstrainRadius" + << "Sketcher_ConstrainAngle"; return root; } diff --git a/src/Mod/Sketcher/Gui/Workbench.cpp b/src/Mod/Sketcher/Gui/Workbench.cpp index c00a259edd..f7b2a6535d 100644 --- a/src/Mod/Sketcher/Gui/Workbench.cpp +++ b/src/Mod/Sketcher/Gui/Workbench.cpp @@ -66,29 +66,33 @@ Gui::MenuItem* Workbench::setupMenuBar() const << "Sketcher_CreateLine" << "Sketcher_CreatePolyline" << "Sketcher_CreateRectangle" + << "Separator" << "Sketcher_CreateFillet" << "Sketcher_Trimming" << "Sketcher_External" << "Sketcher_ToggleConstruction" /*<< "Sketcher_CreateText"*/ /*<< "Sketcher_CreateDraftLine"*/; + Gui::MenuItem* cons = new Gui::MenuItem(); cons->setCommand("Sketcher constraints"); - *cons << "Sketcher_ConstrainLock" - << "Sketcher_ConstrainCoincident" + *cons << "Sketcher_ConstrainCoincident" << "Sketcher_ConstrainPointOnObject" - << "Sketcher_ConstrainDistanceX" - << "Sketcher_ConstrainDistanceY" << "Sketcher_ConstrainVertical" << "Sketcher_ConstrainHorizontal" - << "Sketcher_ConstrainDistance" - << "Sketcher_ConstrainRadius" << "Sketcher_ConstrainParallel" << "Sketcher_ConstrainPerpendicular" - << "Sketcher_ConstrainAngle" << "Sketcher_ConstrainTangent" << "Sketcher_ConstrainEqual" - << "Sketcher_ConstrainSymmetric"; + << "Sketcher_ConstrainSymmetric" + << "Separator" + << "Sketcher_ConstrainLock" + << "Sketcher_ConstrainDistanceX" + << "Sketcher_ConstrainDistanceY" + << "Sketcher_ConstrainDistance" + << "Sketcher_ConstrainRadius" + << "Sketcher_ConstrainAngle"; + *sketch << "Sketcher_NewSketch" << "Sketcher_LeaveSketch" @@ -96,7 +100,6 @@ Gui::MenuItem* Workbench::setupMenuBar() const << "Sketcher_MapSketch" << geom << cons - << "Separator" ; return root; @@ -110,14 +113,15 @@ Gui::ToolBarItem* Workbench::setupToolBars() const part->setCommand("Sketcher"); *part << "Sketcher_NewSketch"<< "Sketcher_LeaveSketch"; - part = new Gui::ToolBarItem(root); - part->setCommand("Sketcher geometries"); - *part << "Sketcher_CreatePoint" + Gui::ToolBarItem* geom = new Gui::ToolBarItem(root); + geom->setCommand("Sketcher geometries"); + *geom << "Sketcher_CreatePoint" << "Sketcher_CreateArc" << "Sketcher_CreateCircle" << "Sketcher_CreateLine" << "Sketcher_CreatePolyline" << "Sketcher_CreateRectangle" + << "Separator" << "Sketcher_CreateFillet" << "Sketcher_Trimming" << "Sketcher_External" @@ -125,23 +129,24 @@ Gui::ToolBarItem* Workbench::setupToolBars() const /*<< "Sketcher_CreateText"*/ /*<< "Sketcher_CreateDraftLine"*/; - part = new Gui::ToolBarItem(root); - part->setCommand("Sketcher constraints"); - *part << "Sketcher_ConstrainLock" - << "Sketcher_ConstrainCoincident" + Gui::ToolBarItem* cons = new Gui::ToolBarItem(root); + cons->setCommand("Sketcher constraints"); + *cons << "Sketcher_ConstrainCoincident" << "Sketcher_ConstrainPointOnObject" - << "Sketcher_ConstrainDistanceX" - << "Sketcher_ConstrainDistanceY" << "Sketcher_ConstrainVertical" << "Sketcher_ConstrainHorizontal" - << "Sketcher_ConstrainDistance" - << "Sketcher_ConstrainRadius" << "Sketcher_ConstrainParallel" << "Sketcher_ConstrainPerpendicular" - << "Sketcher_ConstrainAngle" << "Sketcher_ConstrainTangent" << "Sketcher_ConstrainEqual" - << "Sketcher_ConstrainSymmetric"; + << "Sketcher_ConstrainSymmetric" + << "Separator" + << "Sketcher_ConstrainLock" + << "Sketcher_ConstrainDistanceX" + << "Sketcher_ConstrainDistanceY" + << "Sketcher_ConstrainDistance" + << "Sketcher_ConstrainRadius" + << "Sketcher_ConstrainAngle"; return root; }