Просмотр исходного кода

- fixed Properties Tool due of recent changes to the FCTree widget

Marius Stanciu 5 лет назад
Родитель
Сommit
e6917ba1ab
5 измененных файлов с 12 добавлено и 3 удалено
  1. 1 1
      FlatCAMApp.py
  2. 1 0
      README.md
  3. 1 1
      flatcamGUI/FlatCAMGUI.py
  4. 5 1
      flatcamGUI/GUIElements.py
  5. 4 0
      flatcamTools/ToolProperties.py

+ 1 - 1
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)
 

+ 1 - 0
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
 

+ 1 - 1
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'))

+ 5 - 1
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])

+ 4 - 0
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):