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

CAM: Consistently rename "Tool" to "Toolbit" in UI and code

Browse Source 
- 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"
This commit is contained in:
Billy
2025-09-12 17:45:36 -04:00
parent 420bd63f76
commit 7d6852211e
12 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/CAM/Gui/Resources/panels/ShapeSelector.ui
View File

@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Tool Shape Selection</string>
<string>Toolbit Shape Selection</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="1,0">
<item>

4
src/Mod/CAM/Gui/Resources/panels/ToolBitEditor.ui
View File

@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Tool Parameter Editor</string>
<string>Toolbit Parameter Editor</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
@@ -62,7 +62,7 @@
</sizepolicy>
</property>
<attribute name="title">
<string>Tool</string>
<string>Toolbit</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,1">
<item>

5
src/Mod/CAM/Path/Tool/library/ui/browser.py
View File

@@ -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)

2
src/Mod/CAM/Path/Tool/library/ui/cmd.py
View File

@@ -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"
),

2
src/Mod/CAM/Path/Tool/library/ui/dock.py
View File

@@ -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()

13
src/Mod/CAM/Path/Tool/library/ui/editor.py
View File

@@ -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)

2
src/Mod/CAM/Path/Tool/shape/ui/shapewidget.py
View File

@@ -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)

2
src/Mod/CAM/Path/Tool/toolbit/models/bullnose.py
View File

@@ -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(

4
src/Mod/CAM/Path/Tool/toolbit/ui/browser.py
View File

@@ -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

2
src/Mod/CAM/Path/Tool/toolbit/ui/cmd.py
View File

@@ -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"),
}

2
src/Mod/CAM/Path/Tool/toolbit/ui/editor.py
View File

@@ -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)

2
src/Mod/CAM/Path/Tool/toolbit/ui/selector.py
View File

@@ -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)