- fixed Properties Tool due of recent changes to the FCTree widget
This commit is contained in:
parent
98f4a82ad4
commit
e6917ba1ab
|
@ -12727,7 +12727,7 @@ class App(QtCore.QObject):
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
if act_name == _("Transparency"):
|
if act_name == _("Opacity"):
|
||||||
alpha_level, ok_button = QtWidgets.QInputDialog.getInt(
|
alpha_level, ok_button = QtWidgets.QInputDialog.getInt(
|
||||||
self.ui, _("Set alpha level ..."), '%s:' % _("Value"), min=0, max=255, step=1, value=191)
|
self.ui, _("Set alpha level ..."), '%s:' % _("Value"), min=0, max=255, step=1, value=191)
|
||||||
|
|
||||||
|
|
|
@ -12,6 +12,7 @@ CAD program, and create G-Code for Isolation routing.
|
||||||
13.03.2020
|
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 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
|
12.03.2020
|
||||||
|
|
||||||
|
|
|
@ -703,7 +703,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
|
||||||
self.menuprojectcolor.addSeparator()
|
self.menuprojectcolor.addSeparator()
|
||||||
|
|
||||||
self.menuproject_custom = self.menuprojectcolor.addAction(
|
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(
|
self.menuproject_custom = self.menuprojectcolor.addAction(
|
||||||
QtGui.QIcon(self.app.resource_location + '/set_color32.png'), _('Default'))
|
QtGui.QIcon(self.app.resource_location + '/set_color32.png'), _('Default'))
|
||||||
|
|
|
@ -187,7 +187,11 @@ class FCTree(QtWidgets.QTreeWidget):
|
||||||
header.resizeSection(column, width)
|
header.resizeSection(column, width)
|
||||||
|
|
||||||
def is_editable(self, tested_col):
|
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):
|
def addParent(self, parent, title, expanded=False, color=None, font=None):
|
||||||
item = QtWidgets.QTreeWidgetItem(parent, [title])
|
item = QtWidgets.QTreeWidgetItem(parent, [title])
|
||||||
|
|
|
@ -129,6 +129,10 @@ class Properties(FlatCAMTool):
|
||||||
for obj in obj_list:
|
for obj in obj_list:
|
||||||
self.addItems(obj)
|
self.addItems(obj)
|
||||||
self.app.inform.emit('[success] %s' % _("Object Properties are displayed."))
|
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"))
|
self.app.ui.notebook.setTabText(2, _("Properties Tool"))
|
||||||
|
|
||||||
def addItems(self, obj):
|
def addItems(self, obj):
|
||||||
|
|
Loading…
Reference in New Issue