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

- trimmed the application strings

Browse Source
This commit is contained in:
Marius Stanciu
2020-11-03 22:37:39 +02:00
committed by Marius Stanciu
parent 77c66862c5
commit f5310148eb
77 changed files with 15407 additions and 15204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
appObjects/FlatCAMCNCJob.py
View File

@@ -643,16 +643,13 @@ class CNCJobObject(FlatCAMObj, CNCjob):
# Show/Hide Advanced Options
if self.app.defaults["global_app_level"] == 'b':
self.ui.level.setText(_(
'<span style="color:green;"><b>Basic</b></span>'
))
self.ui.level.setText('<span style="color:green;"><b>%s</b></span>' % _("Basic"))
self.ui.sal_btn.hide()
self.ui.sal_btn.setChecked(False)
else:
self.ui.level.setText(_(
'<span style="color:red;"><b>Advanced</b></span>'
))
self.ui.level.setText('<span style="color:red;"><b>%s</b></span>' % _("Advanced"))
if 'Roland' in self.pp_excellon_name or 'Roland' in self.pp_geometry_name or 'hpgl' in \
self.pp_geometry_name:
self.ui.sal_btn.hide()

8
appObjects/FlatCAMDocument.py
View File

@@ -67,13 +67,9 @@ class DocumentObject(FlatCAMObj):
# Show/Hide Advanced Options
if self.app.defaults["global_app_level"] == 'b':
self.ui.level.setText(_(
'<span style="color:green;"><b>Basic</b></span>'
))
self.ui.level.setText('<span style="color:green;"><b>%s</b></span>' % _("Basic"))
else:
self.ui.level.setText(_(
'<span style="color:red;"><b>Advanced</b></span>'
))
self.ui.level.setText('<span style="color:red;"><b>%s</b></span>' % _("Advanced"))
self.document_editor_tab = AppTextEditor(app=self.app)
stylesheet = """

10
appObjects/FlatCAMGeometry.py
View File

@@ -2371,7 +2371,7 @@ class GeometryObject(FlatCAMObj, Geometry):
# ])
try:
dia_cnc_dict['solid_geometry'] = deepcopy(tool_solid_geometry)
app_obj.inform.emit('[success] %s' % _("Finished G-Code processing..."))
app_obj.inform.emit('[success] %s...' % _("Finished G-Code processing"))
except Exception as ee:
app_obj.inform.emit('[ERROR] %s: %s' % (_("G-Code processing failed with error"), str(ee)))
@@ -2542,7 +2542,7 @@ class GeometryObject(FlatCAMObj, Geometry):
# source of gcode
job_obj.toolchange_xy_type = "geometry"
job_obj.gcode_parse()
app_obj.inform.emit('[success] %s' % _("Finished G-Code processing..."))
app_obj.inform.emit('[success] %s...' % _("Finished G-Code processing"))
if use_thread:
# To be run in separate thread
@@ -2641,7 +2641,7 @@ class GeometryObject(FlatCAMObj, Geometry):
except Exception as e:
log.debug("Could not Paint the polygons. %s" % str(e))
mssg = '[ERROR] %s\n%s' % (_("Could not do Paint. Try a different combination of parameters. "
"Or a different strategy of paint"), str(e))
"Or a different method of Paint"), str(e))
self.app.inform.emit(mssg)
return
@@ -2742,7 +2742,7 @@ class GeometryObject(FlatCAMObj, Geometry):
return
self.app.proc_container.new_text = ''
self.app.inform.emit('[success] %s' % _("Geometry Scale done."))
self.app.inform.emit('[success] %s' % _("Done."))
def offset(self, vect):
"""
@@ -2815,7 +2815,7 @@ class GeometryObject(FlatCAMObj, Geometry):
self.solid_geometry = translate_recursion(self.solid_geometry)
self.app.proc_container.new_text = ''
self.app.inform.emit('[success] %s' % _("Geometry Offset done."))
self.app.inform.emit('[success] %s' % _("Done."))
def convert_units(self, units):
log.debug("FlatCAMObj.GeometryObject.convert_units()")

2
appObjects/FlatCAMGerber.py
View File

@@ -369,7 +369,7 @@ class GerberObject(FlatCAMObj, Gerber):
output = self.app.pool.apply_async(self.buffer_handler, args=([self.solid_geometry]))
self.solid_geometry = output.get()
self.app.inform.emit('[success] %s.' % _("Done"))
self.app.inform.emit('[success] %s' % _("Done."))
self.plot_single_object.emit()
self.app.worker_task.emit({'fcn': buffer_task, 'params': []})

8
appObjects/FlatCAMScript.py
View File

@@ -77,13 +77,9 @@ class ScriptObject(FlatCAMObj):
# Show/Hide Advanced Options
if self.app.defaults["global_app_level"] == 'b':
self.ui.level.setText(_(
'<span style="color:green;"><b>Basic</b></span>'
))
self.ui.level.setText('<span style="color:green;"><b>%s</b></span>' % _("Basic"))
else:
self.ui.level.setText(_(
'<span style="color:red;"><b>Advanced</b></span>'
))
self.ui.level.setText('<span style="color:red;"><b>%s</b></span>' % _("Advanced"))
self.script_editor_tab = AppTextEditor(app=self.app, plain_text=True, parent=self.app.ui)