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

- UI changes in the AppTextEditor and in CNCJob properties tab and in GCoe Editor

Browse Source 
- some changes in strings; updated all the translation strings to the latest changes
- finished the Romanian translation
This commit is contained in:
Marius Stanciu
2020-10-24 15:58:20 +03:00
committed by Marius
parent c0671b7754
commit 8a341de4ca
34 changed files with 6041 additions and 6039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
appObjects/FlatCAMCNCJob.py
View File

@@ -579,7 +579,7 @@ class CNCJobObject(FlatCAMObj, CNCjob):
self.ui.updateplot_button.clicked.connect(self.on_updateplot_button_click)
self.ui.export_gcode_button.clicked.connect(self.on_exportgcode_button_click)
self.ui.review_gcode_button.clicked.connect(self.on_edit_code_click)
self.ui.review_gcode_button.clicked.connect(self.on_review_code_click)
# Editor Signal
self.ui.editor_button.clicked.connect(lambda: self.app.object2editor())
@@ -1703,7 +1703,7 @@ class CNCJobObject(FlatCAMObj, CNCjob):
try:
self.gcode_viewer_tab.load_text(gco, move_to_start=True, clear_text=True)
except Exception as e:
log.debug('FlatCAMCNCJob.on_edit_code_click() -->%s' % str(e))
log.debug('FlatCAMCNCJob.on_edit_probing_gcode() -->%s' % str(e))
return
self.gcode_viewer_tab.t_frame.show()
@@ -1954,7 +1954,7 @@ class CNCJobObject(FlatCAMObj, CNCjob):
self.app.file_saved.emit("gcode", filename)
self.app.inform.emit('[success] %s: %s' % (_("File saved to"), filename))
def on_edit_code_click(self, *args):
def on_review_code_click(self, *args):
"""
Handler activated by a button clicked when reviewing GCode.
@@ -1994,7 +1994,7 @@ class CNCJobObject(FlatCAMObj, CNCjob):
try:
self.gcode_editor_tab.load_text(self.app.gcode_edited.getvalue(), move_to_start=True, clear_text=True)
except Exception as e:
log.debug('FlatCAMCNCJob.on_edit_code_click() -->%s' % str(e))
log.debug('FlatCAMCNCJob.on_review_code_click() -->%s' % str(e))
return
self.gcode_editor_tab.t_frame.show()
@@ -2002,8 +2002,8 @@ class CNCJobObject(FlatCAMObj, CNCjob):
self.gcode_editor_tab.buttonSave.hide()
self.gcode_editor_tab.buttonOpen.hide()
self.gcode_editor_tab.buttonPrint.hide()
self.gcode_editor_tab.buttonPreview.hide()
# self.gcode_editor_tab.buttonPrint.hide()
# self.gcode_editor_tab.buttonPreview.hide()
self.gcode_editor_tab.buttonReplace.hide()
self.gcode_editor_tab.sel_all_cb.hide()
self.gcode_editor_tab.entryReplace.hide()

2
appObjects/FlatCAMGeometry.py
View File

@@ -1915,7 +1915,7 @@ class GeometryObject(FlatCAMObj, Geometry):
log.debug("FlatCAMObj.GeometryObject.mtool_gen_cncjob() --> %s\n" % str(e))
msg = '[ERROR] %s' % _("An internal error has occurred. See shell.\n")
msg += '%s %s' % ('FlatCAMObj.GeometryObject.mtool_gen_cncjob() -->', str(e))
msg += '%s' % str(e)
msg += traceback.format_exc()
self.app.inform.emit(msg)
return