From b40fe64db38930e1f52807ddbb3a11c63d331acb Mon Sep 17 00:00:00 2001 From: hlorus <64740362+hlorus@users.noreply.github.com> Date: Thu, 16 May 2024 13:00:57 +0200 Subject: [PATCH] PartGui: Remove remaining measure "clear all" and "toggle delta" commands --- src/Gui/CommandView.cpp | 60 ------------------- src/Gui/PreferencePackTemplates/Shortcuts.cfg | 2 - src/Gui/Workbench.cpp | 10 +--- 3 files changed, 2 insertions(+), 70 deletions(-) diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp index f4cb50cd8c..8e39ce0a8a 100644 --- a/src/Gui/CommandView.cpp +++ b/src/Gui/CommandView.cpp @@ -3311,64 +3311,6 @@ void StdCmdDemoMode::activated(int iMsg) dlg->show(); } -//=========================================================================== -// Part_Measure_Clear_All -//=========================================================================== - -DEF_STD_CMD(CmdViewMeasureClearAll) - -CmdViewMeasureClearAll::CmdViewMeasureClearAll() - : Command("View_Measure_Clear_All") -{ - sGroup = "Measure"; - sMenuText = QT_TR_NOOP("Clear measurement"); - sToolTipText = QT_TR_NOOP("Clear all visible measurements"); - sWhatsThis = "View_Measure_Clear_All"; - sStatusTip = sToolTipText; - sPixmap = "Part_Measure_Clear_All"; -} - -void CmdViewMeasureClearAll::activated(int iMsg) -{ - Q_UNUSED(iMsg); - auto view = dynamic_cast(Gui::Application::Instance-> - activeDocument()->getActiveView()); - if (!view) - return; - Gui::View3DInventorViewer *viewer = view->getViewer(); - if (!viewer) - return; - viewer->eraseAllDimensions(); -} - -//=========================================================================== -// Part_Measure_Toggle_All -//=========================================================================== - -DEF_STD_CMD(CmdViewMeasureToggleAll) - -CmdViewMeasureToggleAll::CmdViewMeasureToggleAll() - : Command("View_Measure_Toggle_All") -{ - sGroup = "Measure"; - sMenuText = QT_TR_NOOP("Toggle measurement"); - sToolTipText = QT_TR_NOOP("Turn on or off the display of all measurements"); - sWhatsThis = "View_Measure_Toggle_All"; - sStatusTip = sToolTipText; - sPixmap = "Part_Measure_Toggle_All"; -} - -void CmdViewMeasureToggleAll::activated(int iMsg) -{ - Q_UNUSED(iMsg); - ParameterGrp::handle group = App::GetApplication().GetUserParameter(). - GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("View"); - bool visibility = group->GetBool("DimensionsVisible", true); - if (visibility) - group->SetBool("DimensionsVisible", false); - else - group->SetBool("DimensionsVisible", true); -} //=========================================================================== // Std_SelBack @@ -4156,8 +4098,6 @@ void CreateViewStdCommands() rcCmdMgr.addCommand(new StdCmdDemoMode()); rcCmdMgr.addCommand(new StdCmdToggleNavigation()); rcCmdMgr.addCommand(new StdCmdAxisCross()); - rcCmdMgr.addCommand(new CmdViewMeasureClearAll()); - rcCmdMgr.addCommand(new CmdViewMeasureToggleAll()); rcCmdMgr.addCommand(new StdCmdSelBoundingBox()); rcCmdMgr.addCommand(new StdCmdTreeViewActions()); rcCmdMgr.addCommand(new StdCmdDockOverlay()); diff --git a/src/Gui/PreferencePackTemplates/Shortcuts.cfg b/src/Gui/PreferencePackTemplates/Shortcuts.cfg index 666df29c14..089b2a81c0 100644 --- a/src/Gui/PreferencePackTemplates/Shortcuts.cfg +++ b/src/Gui/PreferencePackTemplates/Shortcuts.cfg @@ -947,8 +947,6 @@ - - diff --git a/src/Gui/Workbench.cpp b/src/Gui/Workbench.cpp index dcc97d9561..f7049aa52f 100644 --- a/src/Gui/Workbench.cpp +++ b/src/Gui/Workbench.cpp @@ -590,13 +590,8 @@ void StdWorkbench::setupContextMenu(const char* recipient, MenuItem* item) const << "Std_ViewRear" << "Std_ViewBottom" << "Std_ViewLeft" << "Separator" << "Std_ViewRotateLeft" << "Std_ViewRotateRight"; - auto measure = new MenuItem(); - measure->setCommand("Measure"); - *measure << "View_Measure_Toggle_All" << "View_Measure_Clear_All"; - - *item << "Std_ViewFitAll" << "Std_ViewFitSelection" << "Std_DrawStyle" - << StdViews << measure << "Separator" + << StdViews << "Separator" << "Std_ViewDockUndockFullscreen"; if (Gui::Selection().countObjectsOfType(App::DocumentObject::getClassTypeId()) > 0) { @@ -684,8 +679,7 @@ MenuItem* StdWorkbench::setupMenuBar() const *visu << "Std_ToggleVisibility" << "Std_ShowSelection" << "Std_HideSelection" << "Std_SelectVisibleObjects" << "Separator" << "Std_ToggleObjects" << "Std_ShowObjects" << "Std_HideObjects" - << "Separator" << "Std_ToggleSelectability" - << "Separator" << "View_Measure_Toggle_All" << "View_Measure_Clear_All"; + << "Separator" << "Std_ToggleSelectability"; // View auto view = new MenuItem( menuBar );