kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge branch 'master' of https://github.com/MisterMakerNL/FreeCAD_MisterMaker

Browse Source
This commit is contained in:
Haas
2023-06-06 20:08:03 +02:00
parent a4232ad557 6931b47167
commit 3175cce339
5 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake
View File

@@ -31,7 +31,6 @@ macro(CheckInterModuleDependencies)
REQUIRES_MODS(BUILD_PART_DESIGN BUILD_SKETCHER)
# REQUIRES_MODS(BUILD_PATH BUILD_PART BUILD_MESH BUILD_ROBOT)
REQUIRES_MODS(BUILD_PATH BUILD_PART BUILD_MESH)
REQUIRES_MODS(BUILD_RAYTRACING BUILD_PART)
REQUIRES_MODS(BUILD_REVERSEENGINEERING BUILD_PART BUILD_MESH)
REQUIRES_MODS(BUILD_ROBOT BUILD_PART)
REQUIRES_MODS(BUILD_SANDBOX BUILD_PART BUILD_MESH)

1
cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake
View File

@@ -119,7 +119,6 @@ macro(InitializeFreeCADBuildOptions)
option(BUILD_PATH "Build the FreeCAD path module" ON)
option(BUILD_PLOT "Build the FreeCAD plot module" ON)
option(BUILD_POINTS "Build the FreeCAD points module" ON)
option(BUILD_RAYTRACING "Build the FreeCAD ray tracing module" ON)
option(BUILD_REVERSEENGINEERING "Build the FreeCAD reverse engineering module" ON)
option(BUILD_ROBOT "Build the FreeCAD robot module" ON)
option(BUILD_SHOW "Build the FreeCAD Show module (helper module for visibility automation)" ON)

2
src/Mod/Arch/Resources/ui/ArchSchedule.ui
View File

File diff suppressed because one or more lines are too long

2
src/Mod/Fem/Gui/Workbench.cpp
View File

@@ -50,6 +50,8 @@ using namespace FemGui;
qApp->translate("Workbench", "&Electrostatic Constraints");
qApp->translate("Workbench", "Fluid Constraints");
qApp->translate("Workbench", "&Fluid Constraints");
qApp->translate("Workbench", "Electromagnetic Constraints");
qApp->translate("Workbench", "&Electromagnetic Constraints");
qApp->translate("Workbench", "Geometrical Constraints");
qApp->translate("Workbench", "&Geometrical Constraints");
qApp->translate("Workbench", "Mechanical Constraints");

4
src/Mod/Sketcher/Gui/Workbench.cpp
View File

@@ -37,11 +37,13 @@ using namespace SketcherGui;
qApp->translate("Workbench","P&rofiles");
qApp->translate("Workbench","S&ketch");
qApp->translate("Workbench", "Sketcher");
qApp->translate("Workbench", "Sketcher edit mode");
qApp->translate("Workbench", "Sketcher geometries");
qApp->translate("Workbench", "Sketcher constraints");
qApp->translate("Workbench", "Sketcher tools");
qApp->translate("Workbench", "Sketcher B-spline tools");
qApp->translate("Workbench", "Sketcher virtual space");
qApp->translate("Workbench", "Sketcher edit tools");
#endif
/// @namespace SketcherGui @class Workbench
@@ -109,7 +111,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
Gui::ToolBarItem* sketcherEditMode =
new Gui::ToolBarItem(root, Gui::ToolBarItem::DefaultVisibility::Unavailable);
sketcherEditMode->setCommand("Sketcher Edit Mode");
sketcherEditMode->setCommand("Sketcher edit mode");
addSketcherWorkbenchSketchEditModeActions(*sketcherEditMode);
Gui::ToolBarItem* geom =