bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- changed some confusing strings regarding the 'Properties'

Browse Source 
- Properties Tool is now ObjectReport Tool
- fixed some attributes in Milling Slots Excellon Object utilities functionality
- fixed some issues in the translated strings .po files
This commit is contained in:
Marius Stanciu
2021-02-26 16:26:30 +02:00
committed by Marius
parent 8ae0049ed4
commit f480bafb66
29 changed files with 62216 additions and 57885 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
appObjects/FlatCAMCNCJob.py
View File

@@ -479,7 +479,7 @@ class CNCJobObject(FlatCAMObj, CNCjob):
self.ui.editor_button.clicked.connect(lambda: self.app.object2editor())
# Properties
self.ui.properties_button.toggled.connect(self.on_properties)
self.ui.info_button.toggled.connect(self.on_properties)
self.calculations_finished.connect(self.update_area_chull)
self.ui.treeWidget.itemExpanded.connect(self.on_properties_expanded)
self.ui.treeWidget.itemCollapsed.connect(self.on_properties_expanded)
@@ -579,9 +579,9 @@ class CNCJobObject(FlatCAMObj, CNCjob):
def on_properties(self, state):
if state:
self.ui.properties_frame.show()
self.ui.info_frame.show()
else:
self.ui.properties_frame.hide()
self.ui.info_frame.hide()
return
self.ui.treeWidget.clear()

8
appObjects/FlatCAMExcellon.py
View File

@@ -167,7 +167,7 @@ class ExcellonObject(FlatCAMObj, Excellon):
self.ui.editor_button.clicked.connect(lambda: self.app.object2editor())
# Properties
self.ui.properties_button.toggled.connect(self.on_properties)
self.ui.info_button.toggled.connect(self.on_properties)
self.calculations_finished.connect(self.update_area_chull)
self.ui.treeWidget.itemExpanded.connect(self.on_properties_expanded)
self.ui.treeWidget.itemCollapsed.connect(self.on_properties_expanded)
@@ -667,9 +667,9 @@ class ExcellonObject(FlatCAMObj, Excellon):
def on_properties(self, state):
if state:
self.ui.properties_frame.show()
self.ui.info_frame.show()
else:
self.ui.properties_frame.hide()
self.ui.info_frame.hide()
return
self.ui.treeWidget.clear()
@@ -1064,7 +1064,7 @@ class ExcellonObject(FlatCAMObj, Excellon):
geo_obj.options['Tools_in_use'] = plugin_table_items
geo_obj.options['type'] = 'Excellon Geometry'
geo_obj.options["tools_mill_tooldia"] = str(tooldia)
geo_obj.options["multidepth"] = app_obj.defaults["geometry_multidepth"]
geo_obj.options["tools_mill_multidepth"] = app_obj.defaults["tools_mill_multidepth"]
geo_obj.solid_geometry = []
# in case that the tool used has the same diameter with the hole, and since the maximum resolution

6
appObjects/FlatCAMGeometry.py
View File

@@ -644,7 +644,7 @@ class GeometryObject(FlatCAMObj, Geometry):
self.ui.editor_button.clicked.connect(self.app.object2editor)
# Properties
self.ui.properties_button.toggled.connect(self.on_properties)
self.ui.info_button.toggled.connect(self.on_properties)
self.calculations_finished.connect(self.update_area_chull)
self.ui.treeWidget.itemExpanded.connect(self.on_properties_expanded)
self.ui.treeWidget.itemCollapsed.connect(self.on_properties_expanded)
@@ -734,9 +734,9 @@ class GeometryObject(FlatCAMObj, Geometry):
def on_properties(self, state):
if state:
self.ui.properties_frame.show()
self.ui.info_frame.show()
else:
self.ui.properties_frame.hide()
self.ui.info_frame.hide()
return
self.ui.treeWidget.clear()

6
appObjects/FlatCAMGerber.py
View File

@@ -154,7 +154,7 @@ class GerberObject(FlatCAMObj, Gerber):
self.ui.editor_button.clicked.connect(lambda: self.app.object2editor())
# Properties
self.ui.properties_button.toggled.connect(self.on_properties)
self.ui.info_button.toggled.connect(self.on_properties)
self.calculations_finished.connect(self.update_area_chull)
self.ui.treeWidget.itemExpanded.connect(self.on_properties_expanded)
self.ui.treeWidget.itemCollapsed.connect(self.on_properties_expanded)
@@ -408,9 +408,9 @@ class GerberObject(FlatCAMObj, Gerber):
def on_properties(self, state):
if state:
self.ui.properties_frame.show()
self.ui.info_frame.show()
else:
self.ui.properties_frame.hide()
self.ui.info_frame.hide()
return
self.ui.treeWidget.clear()