From 7d6852211e4047d474a02014fd26f9e98dd22a10 Mon Sep 17 00:00:00 2001 From: Billy Date: Fri, 12 Sep 2025 17:45:36 -0400 Subject: [PATCH] CAM: Consistently rename "Tool" to "Toolbit" in UI and code - Updated all user-facing strings from "Tool" to "Toolbit" for clarity and consistency. - Changed combo box filtering logic to use index for "All Toolbit Types" (localization-safe). - Improved visual distinction for "All Toolbits" in library editor (bold/italic). - Reduced default SVG icon size in ShapeWidget for a more compact display. - Updated window titles, labels, tooltips, and placeholder texts to use "Toolbit". - Removed obsolete string comparisons in filtering logic. - Change the Menu item from "Toolbit Library Editor" to "Toolbit Library Manager" --- src/Mod/CAM/Gui/Resources/panels/ShapeSelector.ui | 2 +- src/Mod/CAM/Gui/Resources/panels/ToolBitEditor.ui | 4 ++-- src/Mod/CAM/Path/Tool/library/ui/browser.py | 5 ++--- src/Mod/CAM/Path/Tool/library/ui/cmd.py | 2 +- src/Mod/CAM/Path/Tool/library/ui/dock.py | 2 +- src/Mod/CAM/Path/Tool/library/ui/editor.py | 13 +++++++++---- src/Mod/CAM/Path/Tool/shape/ui/shapewidget.py | 2 +- src/Mod/CAM/Path/Tool/toolbit/models/bullnose.py | 2 +- src/Mod/CAM/Path/Tool/toolbit/ui/browser.py | 4 ++-- src/Mod/CAM/Path/Tool/toolbit/ui/cmd.py | 2 +- src/Mod/CAM/Path/Tool/toolbit/ui/editor.py | 2 +- src/Mod/CAM/Path/Tool/toolbit/ui/selector.py | 2 +- 12 files changed, 23 insertions(+), 19 deletions(-) diff --git a/src/Mod/CAM/Gui/Resources/panels/ShapeSelector.ui b/src/Mod/CAM/Gui/Resources/panels/ShapeSelector.ui index 86103f5d06..741e952ec4 100644 --- a/src/Mod/CAM/Gui/Resources/panels/ShapeSelector.ui +++ b/src/Mod/CAM/Gui/Resources/panels/ShapeSelector.ui @@ -11,7 +11,7 @@ - Tool Shape Selection + Toolbit Shape Selection diff --git a/src/Mod/CAM/Gui/Resources/panels/ToolBitEditor.ui b/src/Mod/CAM/Gui/Resources/panels/ToolBitEditor.ui index eff7e73369..12cc1b8a7a 100644 --- a/src/Mod/CAM/Gui/Resources/panels/ToolBitEditor.ui +++ b/src/Mod/CAM/Gui/Resources/panels/ToolBitEditor.ui @@ -11,7 +11,7 @@ - Tool Parameter Editor + Toolbit Parameter Editor @@ -62,7 +62,7 @@ - Tool + Toolbit diff --git a/src/Mod/CAM/Path/Tool/library/ui/browser.py b/src/Mod/CAM/Path/Tool/library/ui/browser.py index 13d5019eb2..15fc49f403 100644 --- a/src/Mod/CAM/Path/Tool/library/ui/browser.py +++ b/src/Mod/CAM/Path/Tool/library/ui/browser.py @@ -204,7 +204,7 @@ class LibraryBrowserWidget(ToolBitBrowserWidget): def _get_filtered_assets(self): """Get assets filtered by tool type if a specific type is selected.""" - if not self._selected_tool_type or self._selected_tool_type == "All Tool Types": + if self._tool_type_combo.currentIndex() == 0: # "All Toolbit Types" return self._all_assets filtered_assets = [] @@ -575,7 +575,7 @@ class LibraryBrowserWidget(ToolBitBrowserWidget): self._tool_type_combo.blockSignals(True) try: self._tool_type_combo.clear() - self._tool_type_combo.addItem("All Tool Types") + self._tool_type_combo.addItem(FreeCAD.Qt.translate("CAM", "All Toolbit Types")) for tool_type in self._get_available_tool_types(): self._tool_type_combo.addItem(tool_type) @@ -586,7 +586,6 @@ class LibraryBrowserWidget(ToolBitBrowserWidget): self._tool_type_combo.setCurrentIndex(index) else: self._tool_type_combo.setCurrentIndex(0) - self._selected_tool_type = "All Tool Types" finally: self._tool_type_combo.blockSignals(False) diff --git a/src/Mod/CAM/Path/Tool/library/ui/cmd.py b/src/Mod/CAM/Path/Tool/library/ui/cmd.py index c845af7846..d70303ac90 100644 --- a/src/Mod/CAM/Path/Tool/library/ui/cmd.py +++ b/src/Mod/CAM/Path/Tool/library/ui/cmd.py @@ -75,7 +75,7 @@ class CommandLibraryEditorOpen: def GetResources(self): return { "Pixmap": "CAM_ToolTable", - "MenuText": QT_TRANSLATE_NOOP("CAM_ToolBitLibraryOpen", "Toolbit Library Editor"), + "MenuText": QT_TRANSLATE_NOOP("CAM_ToolBitLibraryOpen", "Toolbit Library Manager"), "ToolTip": QT_TRANSLATE_NOOP( "CAM_ToolBitLibraryOpen", "Opens an editor to manage toolbit libraries" ), diff --git a/src/Mod/CAM/Path/Tool/library/ui/dock.py b/src/Mod/CAM/Path/Tool/library/ui/dock.py index ff92275ed2..6e9a930250 100644 --- a/src/Mod/CAM/Path/Tool/library/ui/dock.py +++ b/src/Mod/CAM/Path/Tool/library/ui/dock.py @@ -56,7 +56,7 @@ class ToolBitLibraryDock(object): self.autoClose = autoClose self.form = QtWidgets.QDialog() self.form.setObjectName("ToolSelector") - self.form.setWindowTitle(translate("CAM_ToolBit", "Tool Selector")) + self.form.setWindowTitle(translate("CAM_ToolBit", "Toolbit Selector")) self.form.setMinimumSize(600, 400) self.form.resize(800, 600) self.form.adjustSize() diff --git a/src/Mod/CAM/Path/Tool/library/ui/editor.py b/src/Mod/CAM/Path/Tool/library/ui/editor.py index 2572a65bc2..0bb1f7cf55 100644 --- a/src/Mod/CAM/Path/Tool/library/ui/editor.py +++ b/src/Mod/CAM/Path/Tool/library/ui/editor.py @@ -155,7 +155,7 @@ class LibraryEditor(QWidget): self._clear_highlight() return True - # Prevent drop into "All Tools" + # Prevent drop into "All Toolbits" item = self.listModel.itemFromIndex(index) if not item or item.data(_LibraryRole) == "all_tools": self._clear_highlight() @@ -286,10 +286,15 @@ class LibraryEditor(QWidget): Path.Log.track() self.listModel.clear() - # Add "All Tools" item - all_tools_item = QStandardItem(translate("CAM", "All Tools")) + # Add "All Toolbits" item + all_tools_item = QStandardItem(translate("CAM", "All Toolbits")) all_tools_item.setData("all_tools", _LibraryRole) - all_tools_item.setIcon(QPixmap(":/icons/CAM_ToolTable.svg")) + # all_tools_item.setIcon(QPixmap(":/icons/CAM_ToolTable.svg")) + # Make the "All Toolbits" item bold and italic + font = all_tools_item.font() + font.setBold(True) + font.setItalic(True) + all_tools_item.setFont(font) self.listModel.appendRow(all_tools_item) # Use AssetManager to fetch library assets (depth=0 for shallow fetch) diff --git a/src/Mod/CAM/Path/Tool/shape/ui/shapewidget.py b/src/Mod/CAM/Path/Tool/shape/ui/shapewidget.py index bcbc505178..e6f4a1ff00 100644 --- a/src/Mod/CAM/Path/Tool/shape/ui/shapewidget.py +++ b/src/Mod/CAM/Path/Tool/shape/ui/shapewidget.py @@ -44,7 +44,7 @@ class ShapeWidget(QtGui.QWidget): self.layout.setAlignment(QtCore.Qt.AlignHCenter) self.shape = shape - self.icon_size = icon_size or QtCore.QSize(200, 235) + self.icon_size = icon_size or QtCore.QSize(140, 165) # 200 x 235 self.icon_widget = QtGui.QLabel() self.layout.addWidget(self.icon_widget) diff --git a/src/Mod/CAM/Path/Tool/toolbit/models/bullnose.py b/src/Mod/CAM/Path/Tool/toolbit/models/bullnose.py index 3033c02ebf..aa7c7bbdbf 100644 --- a/src/Mod/CAM/Path/Tool/toolbit/models/bullnose.py +++ b/src/Mod/CAM/Path/Tool/toolbit/models/bullnose.py @@ -39,7 +39,7 @@ class ToolBitBullnose(ToolBit, CuttingToolMixin, RotaryToolBitMixin): diameter = self.get_property_str("Diameter", "?", precision=3) flutes = self.get_property("Flutes") cutting_edge_height = self.get_property_str("CuttingEdgeHeight", "?", precision=3) - #flat_radius = self.get_property_str("FlatRadius", "?", precision=3) + # flat_radius = self.get_property_str("FlatRadius", "?", precision=3) corner_radius = self.get_property_str("CornerRadius", "?", precision=3) return FreeCAD.Qt.translate( diff --git a/src/Mod/CAM/Path/Tool/toolbit/ui/browser.py b/src/Mod/CAM/Path/Tool/toolbit/ui/browser.py index 4a8f756b00..e6f6991c6a 100644 --- a/src/Mod/CAM/Path/Tool/toolbit/ui/browser.py +++ b/src/Mod/CAM/Path/Tool/toolbit/ui/browser.py @@ -79,12 +79,12 @@ class ToolBitBrowserWidget(QtGui.QWidget): # UI Elements self._search_edit = QtGui.QLineEdit() - self._search_edit.setPlaceholderText("Search tools...") + self._search_edit.setPlaceholderText("Search toolbits...") # Sorting dropdown self._sort_combo = QtGui.QComboBox() if self._tool_no_factory: - self._sort_combo.addItem("Sort by Tool Number", "tool_no") + self._sort_combo.addItem("Sort by Toolbit Number", "tool_no") self._sort_combo.addItem("Sort by Label", "label") self._sort_combo.setCurrentIndex(0) self._sort_combo.setVisible(self._tool_no_factory is not None) # Hide if no tool_no_factory diff --git a/src/Mod/CAM/Path/Tool/toolbit/ui/cmd.py b/src/Mod/CAM/Path/Tool/toolbit/ui/cmd.py index e417120e0a..061b5eef3c 100644 --- a/src/Mod/CAM/Path/Tool/toolbit/ui/cmd.py +++ b/src/Mod/CAM/Path/Tool/toolbit/ui/cmd.py @@ -49,7 +49,7 @@ class CommandToolBitCreate: def GetResources(self): return { "Pixmap": "CAM_ToolBit", - "MenuText": QT_TRANSLATE_NOOP("CAM_ToolBitCreate", "New Tool"), + "MenuText": QT_TRANSLATE_NOOP("CAM_ToolBitCreate", "New Toolbit"), "ToolTip": QT_TRANSLATE_NOOP("CAM_ToolBitCreate", "Creates a new toolbit object"), } diff --git a/src/Mod/CAM/Path/Tool/toolbit/ui/editor.py b/src/Mod/CAM/Path/Tool/toolbit/ui/editor.py index 26c60a10f8..9353ff373d 100644 --- a/src/Mod/CAM/Path/Tool/toolbit/ui/editor.py +++ b/src/Mod/CAM/Path/Tool/toolbit/ui/editor.py @@ -68,7 +68,7 @@ class ToolBitPropertiesWidget(QtGui.QWidget): self._shape_widget = None # Will be created in load_toolbit # Layout - toolbit_group_box = QtGui.QGroupBox(translate("CAM", "Tool Bit")) + toolbit_group_box = QtGui.QGroupBox(translate("CAM", "Toolbit")) form_layout = QtGui.QFormLayout(toolbit_group_box) form_layout.addRow(translate("CAM", "Label:"), self._label_edit) form_layout.addRow(translate("CAM", "ID:"), self._id_label) diff --git a/src/Mod/CAM/Path/Tool/toolbit/ui/selector.py b/src/Mod/CAM/Path/Tool/toolbit/ui/selector.py index 40d73f6a7b..27d8d5e94c 100644 --- a/src/Mod/CAM/Path/Tool/toolbit/ui/selector.py +++ b/src/Mod/CAM/Path/Tool/toolbit/ui/selector.py @@ -41,7 +41,7 @@ class ToolBitSelector(QtWidgets.QDialog): self.setMinimumSize(600, 400) - self.setWindowTitle(FreeCAD.Qt.translate("CAM", "Select Tool Bit")) + self.setWindowTitle(FreeCAD.Qt.translate("CAM", "Select Toolbit")) self._browser_widget = ToolBitBrowserWidget(cam_assets, compact=compact)