diff --git a/FlatCAMApp.py b/FlatCAMApp.py index e4c098c4..7245a1e0 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -12727,7 +12727,7 @@ class App(QtCore.QObject): ) return - if act_name == _("Transparency"): + if act_name == _("Opacity"): alpha_level, ok_button = QtWidgets.QInputDialog.getInt( self.ui, _("Set alpha level ..."), '%s:' % _("Value"), min=0, max=255, step=1, value=191) diff --git a/README.md b/README.md index b57d51ea..458acf99 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ CAD program, and create G-Code for Isolation routing. 13.03.2020 - fixed a bug in CNCJob generation out of a Excellon object; the plot failed in case some of the geometry of the CNCJob was invalid +- fixed Properties Tool due of recent changes to the FCTree widget 12.03.2020 diff --git a/flatcamGUI/FlatCAMGUI.py b/flatcamGUI/FlatCAMGUI.py index 82d55bcf..35b9ae2a 100644 --- a/flatcamGUI/FlatCAMGUI.py +++ b/flatcamGUI/FlatCAMGUI.py @@ -703,7 +703,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow): self.menuprojectcolor.addSeparator() self.menuproject_custom = self.menuprojectcolor.addAction( - QtGui.QIcon(self.app.resource_location + '/set_color32.png'), _('Transparency')) + QtGui.QIcon(self.app.resource_location + '/set_color32.png'), _('Opacity')) self.menuproject_custom = self.menuprojectcolor.addAction( QtGui.QIcon(self.app.resource_location + '/set_color32.png'), _('Default')) diff --git a/flatcamGUI/GUIElements.py b/flatcamGUI/GUIElements.py index f9c7b814..fbfd739e 100644 --- a/flatcamGUI/GUIElements.py +++ b/flatcamGUI/GUIElements.py @@ -187,7 +187,11 @@ class FCTree(QtWidgets.QTreeWidget): header.resizeSection(column, width) def is_editable(self, tested_col): - return False if tested_col in self.protected_column else True + try: + ret_val = False if tested_col in self.protected_column else True + except TypeError: + ret_val = False + return ret_val def addParent(self, parent, title, expanded=False, color=None, font=None): item = QtWidgets.QTreeWidgetItem(parent, [title]) diff --git a/flatcamTools/ToolProperties.py b/flatcamTools/ToolProperties.py index b09d6e19..da783097 100644 --- a/flatcamTools/ToolProperties.py +++ b/flatcamTools/ToolProperties.py @@ -129,6 +129,10 @@ class Properties(FlatCAMTool): for obj in obj_list: self.addItems(obj) self.app.inform.emit('[success] %s' % _("Object Properties are displayed.")) + + # make sure that the FCTree widget columns are resized to content + self.treeWidget.resize_sig.emit() + self.app.ui.notebook.setTabText(2, _("Properties Tool")) def addItems(self, obj):