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

- some message strings cleanup

Browse Source
This commit is contained in:
Marius Stanciu
2020-04-24 07:23:14 +03:00
committed by Marius
parent 26dd29e7dd
commit 7df7e17569
19 changed files with 102 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
flatcamEditors/FlatCAMExcEditor.py
View File

@@ -1021,8 +1021,7 @@ class FCDrillResize(FCShapeTool):
self.geometry.append(DrawToolShape(new_poly))
else:
# unexpected geometry so we cancel
self.draw_app.app.inform.emit('[ERROR_NOTCL] %s' %
_("Cancelled."))
self.draw_app.app.inform.emit('[ERROR_NOTCL] %s' % _("Cancelled."))
return
# remove the geometry with the old size
@@ -1090,8 +1089,7 @@ class FCDrillResize(FCShapeTool):
except KeyError:
# if the exception happen here then we are not dealing with slots neither
# therefore something else is not OK so we return
self.draw_app.app.inform.emit('[ERROR_NOTCL] %s' %
_("Cancelled."))
self.draw_app.app.inform.emit('[ERROR_NOTCL] %s' % _("Cancelled."))
return
# this simple hack is used so we can delete form self.draw_app.selected but

13
flatcamEditors/FlatCAMGeoEditor.py
View File

@@ -581,7 +581,7 @@ class PaintOptionsTool(FlatCAMTool):
def on_paint(self):
if not self.fcdraw.selected:
self.app.inform.emit('[WARNING_NOTCL] %s' % _("Paint cancelled. No shape selected."))
self.app.inform.emit('[WARNING_NOTCL] %s' % _("Cancelled. No shape selected."))
return
tooldia = self.painttooldia_entry.get_value()
@@ -1053,7 +1053,7 @@ class TransformEditorTool(FlatCAMTool):
def template(self):
if not self.draw_app.selected:
self.app.inform.emit('[WARNING_NOTCL] %s' % _("Transformation cancelled. No shape selected."))
self.app.inform.emit('[WARNING_NOTCL] %s' % _("Cancelled. No shape selected."))
return
self.draw_app.select_tool("select")
@@ -3022,7 +3022,7 @@ class FCBuffer(FCShapeTool):
def on_buffer(self):
if not self.draw_app.selected:
self.app.inform.emit('[WARNING_NOTCL] %s' % _("Buffer cancelled. No shape selected."))
self.app.inform.emit('[WARNING_NOTCL] %s' % _("Cancelled. No shape selected."))
return
try:
@@ -3050,7 +3050,7 @@ class FCBuffer(FCShapeTool):
def on_buffer_int(self):
if not self.draw_app.selected:
self.app.inform.emit('[WARNING_NOTCL] %s' % _("Buffer cancelled. No shape selected."))
self.app.inform.emit('[WARNING_NOTCL] %s' % _("Cancelled. No shape selected."))
return
try:
@@ -3078,7 +3078,7 @@ class FCBuffer(FCShapeTool):
def on_buffer_ext(self):
if not self.draw_app.selected:
self.app.inform.emit('[WARNING_NOTCL] %s' % _("Buffer cancelled. No shape selected."))
self.app.inform.emit('[WARNING_NOTCL] %s' % _("Cancelled. No shape selected."))
return
try:
@@ -4499,8 +4499,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
def on_copy_click(self):
if not self.selected:
self.app.inform.emit('[WARNING_NOTCL] %s' %
_("Copy cancelled. No shape selected."))
self.app.inform.emit('[WARNING_NOTCL] %s' % _("Cancelled. No shape selected."))
return
self.app.ui.geo_copy_btn.setChecked(True)

6
flatcamEditors/FlatCAMGrbEditor.py
View File

@@ -4262,8 +4262,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
# self.draw_app.select_tool('select')
self.complete = True
current_tool = 'select'
self.app.inform.emit('[WARNING_NOTCL] %s' %
_("Cancelled. No aperture is selected"))
self.app.inform.emit('[WARNING_NOTCL] %s' % _("Cancelled. No aperture is selected"))
# This is to make the group behave as radio group
if current_tool in self.tools_gerber:
@@ -5599,8 +5598,7 @@ class TransformEditorTool(FlatCAMTool):
def template(self):
if not self.fcdraw.selected:
self.app.inform.emit('[WARNING_NOTCL] %s' %
_("Transformation cancelled. No shape selected."))
self.app.inform.emit('[WARNING_NOTCL] %s' % _("Cancelled. No shape selected."))
return
self.draw_app.select_tool("select")

2
flatcamEditors/FlatCAMTextEditor.py
View File

@@ -220,7 +220,7 @@ class TextEditor(QtWidgets.QWidget):
filename = str(FCFileSaveDialog.get_saved_filename(caption=_("Export Code ..."), filter=_filter_)[0])
if filename == "":
self.app.inform.emit('[WARNING_NOTCL] %s' % _("Export Code cancelled."))
self.app.inform.emit('[WARNING_NOTCL] %s' % _("Cancelled."))
return
else:
try: