From cc41e6cfff45909682b89d27964e68a607736afe Mon Sep 17 00:00:00 2001
From: Samuel Abels <knipknap@gmail.com>
Date: Tue, 20 May 2025 00:28:46 +0200
Subject: [PATCH] CAM: Show shape ID on shape buttons

---
 src/Mod/CAM/Path/Tool/shape/ui/shapebutton.py | 44 ++++++++++++++++---
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/Mod/CAM/Path/Tool/shape/ui/shapebutton.py b/src/Mod/CAM/Path/Tool/shape/ui/shapebutton.py
index 75855ca7fc..e39280e1cc 100644
--- a/src/Mod/CAM/Path/Tool/shape/ui/shapebutton.py
+++ b/src/Mod/CAM/Path/Tool/shape/ui/shapebutton.py
@@ -27,21 +27,53 @@ class ShapeButton(QtGui.QToolButton):
         super(ShapeButton, self).__init__(parent)
         self.shape = shape
 
-        self.setToolButtonStyle(QtCore.Qt.ToolButtonTextUnderIcon)
-        self.setText(shape.label)
+        # Remove default text handling and use a custom layout
+        # self.setToolButtonStyle(QtCore.Qt.ToolButtonTextUnderIcon)
+        # self.setText(f"{shape.label}\n{shape.id}")
+
+        self.vbox = QtGui.QVBoxLayout(self)
+        self.vbox.setAlignment(QtCore.Qt.AlignHCenter | QtCore.Qt.AlignVCenter) # Align all items centrally
+        self.vbox.setContentsMargins(0, 0, 0, 0)
+        self.vbox.setSpacing(0)
+
+        self.icon_widget = QtGui.QLabel()
+        self.icon_widget.setAlignment(QtCore.Qt.AlignHCenter | QtCore.Qt.AlignVCenter)
+
+        self.label_widget = QtGui.QLabel(shape.label)
+        self.label_widget.setAlignment(QtCore.Qt.AlignHCenter | QtCore.Qt.AlignVCenter)
+
+        self.id_widget = QtGui.QLabel(shape.id)
+        self.id_widget.setAlignment(QtCore.Qt.AlignHCenter | QtCore.Qt.AlignVCenter)
+        self.id_widget.setContentsMargins(0, 0, 0, 0)
+        font = self.id_widget.font()
+        font.setPointSize(font.pointSize()*0.9)
+        self.id_widget.setFont(font)
+
+        # Add widgets to the new layout
+        self.vbox.addWidget(self.icon_widget)
+        self.vbox.addWidget(self.label_widget)
+        self.vbox.addWidget(self.id_widget)
+
+        self.setLayout(self.vbox)
 
         self.setFixedSize(128, 128)
         self.setBaseSize(128, 128)
-        self.icon_size = QtCore.QSize(71, 100)
-        self.setIconSize(self.icon_size)
+        # Adjust icon size to make space for text.
+        # Total height is 128. Let's allocate 70 for icon, 25 for label, 25 for ID.
+        self.icon_size = QtCore.QSize(71, 70)
+        # self.setIconSize(self.icon_size) # Removed as custom layout handles sizing
 
         self._update_icon()
 
     def set_text(self, text):
-        self.label.setText(text)
+        # Update the text of the label widget
+        self.label_widget.setText(text)
 
     def _update_icon(self):
         icon = self.shape.get_icon()
         if icon:
+            # Set the pixmap on the icon_widget QLabel
             pixmap = icon.get_qpixmap(self.icon_size)
-            self.setIcon(QtGui.QIcon(pixmap))
+            self.icon_widget.setPixmap(pixmap)
+        else:
+            self.icon_widget.clear() # Clear pixmap if no icon