Forráskód Böngészése

- changed all the info messages that are of type warning, error or success so they have a space added after the keyword
- changed the Romanian translation by adding more diacritics

Marius Stanciu 6 éve
szülő
commit
ecc2c90f2a

+ 39 - 39
FlatCAMApp.py

@@ -2221,7 +2221,7 @@ class App(QtCore.QObject):
             # set call source to the Editor we go into
             # set call source to the Editor we go into
             self.call_source = 'exc_editor'
             self.call_source = 'exc_editor'
         else:
         else:
-            self.inform.emit(_("[WARNING_NOTCL]Select a Geometry or Excellon Object to edit."))
+            self.inform.emit(_("[WARNING_NOTCL] Select a Geometry or Excellon Object to edit."))
             return
             return
 
 
         # make sure that we can't select another object while in Editor Mode:
         # make sure that we can't select another object while in Editor Mode:
@@ -2232,7 +2232,7 @@ class App(QtCore.QObject):
 
 
         self.ui.plot_tab_area.setTabText(0, "EDITOR Area")
         self.ui.plot_tab_area.setTabText(0, "EDITOR Area")
         self.ui.plot_tab_area.protectTab(0)
         self.ui.plot_tab_area.protectTab(0)
-        self.inform.emit(_("[WARNING_NOTCL]Editor is activated ..."))
+        self.inform.emit(_("[WARNING_NOTCL] Editor is activated ..."))
 
 
         self.should_we_save = True
         self.should_we_save = True
 
 
@@ -2280,7 +2280,7 @@ class App(QtCore.QObject):
                 self.exc_editor.deactivate()
                 self.exc_editor.deactivate()
 
 
             else:
             else:
-                self.inform.emit(_("[WARNING_NOTCL]Select a Geometry or Excellon Object to update."))
+                self.inform.emit(_("[WARNING_NOTCL] Select a Geometry or Excellon Object to update."))
                 return
                 return
 
 
             # if notebook is hidden we show it
             # if notebook is hidden we show it
@@ -2657,7 +2657,7 @@ class App(QtCore.QObject):
         filename = str(filename)
         filename = str(filename)
 
 
         if filename == "":
         if filename == "":
-            self.inform.emit(_("[WARNING_NOTCL]FlatCAM preferences import cancelled."))
+            self.inform.emit(_("[WARNING_NOTCL] FlatCAM preferences import cancelled."))
         else:
         else:
             try:
             try:
                 f = open(filename)
                 f = open(filename)
@@ -2676,7 +2676,7 @@ class App(QtCore.QObject):
                 self.inform.emit(_("[ERROR_NOTCL] Failed to parse defaults file."))
                 self.inform.emit(_("[ERROR_NOTCL] Failed to parse defaults file."))
                 return
                 return
             self.defaults.update(defaults_from_file)
             self.defaults.update(defaults_from_file)
-            self.inform.emit(_("[success]Imported Defaults from %s") %filename)
+            self.inform.emit(_("[success] Imported Defaults from %s") %filename)
 
 
     def on_export_preferences(self):
     def on_export_preferences(self):
 
 
@@ -2696,7 +2696,7 @@ class App(QtCore.QObject):
         defaults_from_file = {}
         defaults_from_file = {}
 
 
         if filename == "":
         if filename == "":
-            self.inform.emit(_("[WARNING_NOTCL]FlatCAM preferences export cancelled."))
+            self.inform.emit(_("[WARNING_NOTCL] FlatCAM preferences export cancelled."))
             return
             return
         else:
         else:
             try:
             try:
@@ -2712,7 +2712,7 @@ class App(QtCore.QObject):
                 e = sys.exc_info()[0]
                 e = sys.exc_info()[0]
                 App.log.error("Could not load defaults file.")
                 App.log.error("Could not load defaults file.")
                 App.log.error(str(e))
                 App.log.error(str(e))
-                self.inform.emit(_("[ERROR_NOTCL]Could not load defaults file."))
+                self.inform.emit(_("[ERROR_NOTCL] Could not load defaults file."))
                 return
                 return
 
 
             try:
             try:
@@ -2735,7 +2735,7 @@ class App(QtCore.QObject):
                 return
                 return
 
 
         self.file_saved.emit("preferences", filename)
         self.file_saved.emit("preferences", filename)
-        self.inform.emit("[success]Exported Defaults to %s" % filename)
+        self.inform.emit("[success] Exported Defaults to %s" % filename)
 
 
     def on_preferences_open_folder(self):
     def on_preferences_open_folder(self):
         self.report_usage("on_preferences_open_folder()")
         self.report_usage("on_preferences_open_folder()")
@@ -2746,7 +2746,7 @@ class App(QtCore.QObject):
             os.system('open "%s"' % self.data_path)
             os.system('open "%s"' % self.data_path)
         else:
         else:
             subprocess.Popen(['xdg-open', self.data_path])
             subprocess.Popen(['xdg-open', self.data_path])
-        self.inform.emit("[success]FlatCAM Preferences Folder opened.")
+        self.inform.emit("[success] FlatCAM Preferences Folder opened.")
 
 
     def save_geometry(self, x, y, width, height, notebook_width):
     def save_geometry(self, x, y, width, height, notebook_width):
         self.defaults["global_def_win_x"] = x
         self.defaults["global_def_win_x"] = x
@@ -2783,7 +2783,7 @@ class App(QtCore.QObject):
             f = open(self.data_path + '/recent.json', 'w')
             f = open(self.data_path + '/recent.json', 'w')
         except IOError:
         except IOError:
             App.log.error("Failed to open recent items file for writing.")
             App.log.error("Failed to open recent items file for writing.")
-            self.inform.emit(_('[ERROR_NOTCL]Failed to open recent files file for writing.'))
+            self.inform.emit(_('[ERROR_NOTCL] Failed to open recent files file for writing.'))
             return
             return
 
 
         #try:
         #try:
@@ -2947,16 +2947,16 @@ class App(QtCore.QObject):
         # self.inform.emit('[selected] %s created & selected: %s' %
         # self.inform.emit('[selected] %s created & selected: %s' %
         #                  (str(obj.kind).capitalize(), str(obj.options['name'])))
         #                  (str(obj.kind).capitalize(), str(obj.options['name'])))
         if obj.kind == 'gerber':
         if obj.kind == 'gerber':
-            self.inform.emit(_('[selected]{kind} created/selected: <span style="color:{color};">{name}</span>').format(
+            self.inform.emit(_('[selected] {kind} created/selected: <span style="color:{color};">{name}</span>').format(
                 kind=obj.kind.capitalize(), color='green', name=str(obj.options['name'])))
                 kind=obj.kind.capitalize(), color='green', name=str(obj.options['name'])))
         elif obj.kind == 'excellon':
         elif obj.kind == 'excellon':
-            self.inform.emit(_('[selected]{kind} created/selected: <span style="color:{color};">{name}</span>').format(
+            self.inform.emit(_('[selected] {kind} created/selected: <span style="color:{color};">{name}</span>').format(
                 kind=obj.kind.capitalize(), color='brown', name=str(obj.options['name'])))
                 kind=obj.kind.capitalize(), color='brown', name=str(obj.options['name'])))
         elif obj.kind == 'cncjob':
         elif obj.kind == 'cncjob':
-            self.inform.emit(_('[selected]{kind} created/selected: <span style="color:{color};">{name}</span>').format(
+            self.inform.emit(_('[selected] {kind} created/selected: <span style="color:{color};">{name}</span>').format(
                 kind=obj.kind.capitalize(), color='blue', name=str(obj.options['name'])))
                 kind=obj.kind.capitalize(), color='blue', name=str(obj.options['name'])))
         elif obj.kind == 'geometry':
         elif obj.kind == 'geometry':
-            self.inform.emit(_('[selected]{kind} created/selected: <span style="color:{color};">{name}</span>').format(
+            self.inform.emit(_('[selected] {kind} created/selected: <span style="color:{color};">{name}</span>').format(
                 kind=obj.kind.capitalize(), color='red', name=str(obj.options['name'])))
                 kind=obj.kind.capitalize(), color='red', name=str(obj.options['name'])))
 
 
         # update the SHELL auto-completer model with the name of the new object
         # update the SHELL auto-completer model with the name of the new object
@@ -3200,7 +3200,7 @@ class App(QtCore.QObject):
         self.defaults["global_toolbar_view"] = tb_status
         self.defaults["global_toolbar_view"] = tb_status
 
 
         if not silent:
         if not silent:
-            self.inform.emit(_("[success]Defaults saved."))
+            self.inform.emit(_("[success] Defaults saved."))
 
 
     def save_factory_defaults(self, silent=False):
     def save_factory_defaults(self, silent=False):
         """
         """
@@ -3357,7 +3357,7 @@ class App(QtCore.QObject):
 
 
         for obj in objs:
         for obj in objs:
             if not isinstance(obj, FlatCAMExcellon):
             if not isinstance(obj, FlatCAMExcellon):
-                self.inform.emit(_("[ERROR_NOTCL]Failed. Excellon joining works only on Excellon objects."))
+                self.inform.emit(_("[ERROR_NOTCL] Failed. Excellon joining works only on Excellon objects."))
                 return
                 return
 
 
         def initialize(obj, app):
         def initialize(obj, app):
@@ -3379,7 +3379,7 @@ class App(QtCore.QObject):
 
 
         for obj in objs:
         for obj in objs:
             if not isinstance(obj, FlatCAMGerber):
             if not isinstance(obj, FlatCAMGerber):
-                self.inform.emit(_("[ERROR_NOTCL]Failed. Gerber joining works only on Gerber objects."))
+                self.inform.emit(_("[ERROR_NOTCL] Failed. Gerber joining works only on Gerber objects."))
                 return
                 return
 
 
         def initialize(obj, app):
         def initialize(obj, app):
@@ -3394,11 +3394,11 @@ class App(QtCore.QObject):
         obj = self.collection.get_active()
         obj = self.collection.get_active()
 
 
         if obj is None:
         if obj is None:
-            self.inform.emit(_("[ERROR_NOTCL]Failed. Select a Geometry Object and try again."))
+            self.inform.emit(_("[ERROR_NOTCL] Failed. Select a Geometry Object and try again."))
             return
             return
 
 
         if not isinstance(obj, FlatCAMGeometry):
         if not isinstance(obj, FlatCAMGeometry):
-            self.inform.emit(_("[ERROR_NOTCL]Expected a FlatCAMGeometry, got %s") % type(obj))
+            self.inform.emit(_("[ERROR_NOTCL] Expected a FlatCAMGeometry, got %s") % type(obj))
             return
             return
 
 
         obj.multigeo = True
         obj.multigeo = True
@@ -3419,11 +3419,11 @@ class App(QtCore.QObject):
         obj = self.collection.get_active()
         obj = self.collection.get_active()
 
 
         if obj is None:
         if obj is None:
-            self.inform.emit(_("[ERROR_NOTCL]Failed. Select a Geometry Object and try again."))
+            self.inform.emit(_("[ERROR_NOTCL] Failed. Select a Geometry Object and try again."))
             return
             return
 
 
         if not isinstance(obj, FlatCAMGeometry):
         if not isinstance(obj, FlatCAMGeometry):
-            self.inform.emit(_("[ERROR_NOTCL]Expected a FlatCAMGeometry, got %s") % type(obj))
+            self.inform.emit(_("[ERROR_NOTCL] Expected a FlatCAMGeometry, got %s") % type(obj))
             return
             return
 
 
         obj.multigeo = False
         obj.multigeo = False
@@ -3623,7 +3623,7 @@ class App(QtCore.QObject):
                     current.to_form()
                     current.to_form()
 
 
             self.plot_all()
             self.plot_all()
-            self.inform.emit(_("[success]Converted units to %s") % self.defaults["units"])
+            self.inform.emit(_("[success] Converted units to %s") % self.defaults["units"])
             # self.ui.units_label.setText("[" + self.options["units"] + "]")
             # self.ui.units_label.setText("[" + self.options["units"] + "]")
             self.set_screen_units(self.defaults["units"])
             self.set_screen_units(self.defaults["units"])
         else:
         else:
@@ -3634,7 +3634,7 @@ class App(QtCore.QObject):
             else:
             else:
                 self.ui.general_defaults_form.general_app_group.units_radio.set_value('MM')
                 self.ui.general_defaults_form.general_app_group.units_radio.set_value('MM')
             self.toggle_units_ignore = False
             self.toggle_units_ignore = False
-            self.inform.emit(_("[WARNING_NOTCL]Units conversion cancelled."))
+            self.inform.emit(_("[WARNING_NOTCL] Units conversion cancelled."))
 
 
         self.options_read_form()
         self.options_read_form()
         self.defaults_read_form()
         self.defaults_read_form()
@@ -4244,7 +4244,7 @@ class App(QtCore.QObject):
             filename = str(QtWidgets.QFileDialog.getSaveFileName(caption=_("Export G-Code ..."), filter=_filter_)[0])
             filename = str(QtWidgets.QFileDialog.getSaveFileName(caption=_("Export G-Code ..."), filter=_filter_)[0])
 
 
         if filename == "":
         if filename == "":
-            self.inform.emit(_("[WARNING_NOTCL]Export Code cancelled."))
+            self.inform.emit(_("[WARNING_NOTCL] Export Code cancelled."))
             return
             return
         else:
         else:
             try:
             try:
@@ -5014,7 +5014,7 @@ class App(QtCore.QObject):
             name = obj.options["name"]
             name = obj.options["name"]
         except AttributeError:
         except AttributeError:
             log.debug("on_copy_name() --> No object selected to copy it's name")
             log.debug("on_copy_name() --> No object selected to copy it's name")
-            self.inform.emit(_("[WARNING_NOTCL]No object selected to copy it's name"))
+            self.inform.emit(_("[WARNING_NOTCL] No object selected to copy it's name"))
             return
             return
 
 
         self.clipboard.setText(name)
         self.clipboard.setText(name)
@@ -5666,7 +5666,7 @@ class App(QtCore.QObject):
         filenames = [str(filename) for filename in filenames]
         filenames = [str(filename) for filename in filenames]
 
 
         if len(filenames) == 0:
         if len(filenames) == 0:
-            self.inform.emit(_("[WARNING_NOTCL]Open Excellon cancelled."))
+            self.inform.emit(_("[WARNING_NOTCL] Open Excellon cancelled."))
         else:
         else:
             for filename in filenames:
             for filename in filenames:
                 if filename != '':
                 if filename != '':
@@ -5696,7 +5696,7 @@ class App(QtCore.QObject):
         filenames = [str(filename) for filename in filenames]
         filenames = [str(filename) for filename in filenames]
 
 
         if len(filenames) == 0:
         if len(filenames) == 0:
-            self.inform.emit(_("[WARNING_NOTCL]Open G-Code cancelled."))
+            self.inform.emit(_("[WARNING_NOTCL] Open G-Code cancelled."))
         else:
         else:
             for filename in filenames:
             for filename in filenames:
                 if filename != '':
                 if filename != '':
@@ -5725,7 +5725,7 @@ class App(QtCore.QObject):
         filename = str(filename)
         filename = str(filename)
 
 
         if filename == "":
         if filename == "":
-            self.inform.emit(_("[WARNING_NOTCL]Open Project cancelled."))
+            self.inform.emit(_("[WARNING_NOTCL] Open Project cancelled."))
         else:
         else:
             # self.worker_task.emit({'fcn': self.open_project,
             # self.worker_task.emit({'fcn': self.open_project,
             #                        'params': [filename]})
             #                        'params': [filename]})
@@ -5751,7 +5751,7 @@ class App(QtCore.QObject):
                                                                  filter = _filter_)
                                                                  filter = _filter_)
 
 
         if filename == "":
         if filename == "":
-            self.inform.emit(_("[WARNING_NOTCL]Open Config cancelled."))
+            self.inform.emit(_("[WARNING_NOTCL Open Config cancelled."))
         else:
         else:
             self.open_config_file(filename)
             self.open_config_file(filename)
 
 
@@ -5800,7 +5800,7 @@ class App(QtCore.QObject):
         filename = str(filename)
         filename = str(filename)
 
 
         if filename == "":
         if filename == "":
-            self.inform.emit(_("[WARNING_NOTCL]Export SVG cancelled."))
+            self.inform.emit(_("[WARNING_NOTCL] Export SVG cancelled."))
             return
             return
         else:
         else:
             self.export_svg(name, filename)
             self.export_svg(name, filename)
@@ -5946,7 +5946,7 @@ class App(QtCore.QObject):
         filename = str(filename)
         filename = str(filename)
 
 
         if filename == "":
         if filename == "":
-            self.inform.emit(_("[WARNING_NOTCL]Export Excellon cancelled."))
+            self.inform.emit(_("[WARNING_NOTCL] Export Excellon cancelled."))
             return
             return
         else:
         else:
             self.export_excellon(name, filename)
             self.export_excellon(name, filename)
@@ -6055,7 +6055,7 @@ class App(QtCore.QObject):
         filenames = [str(filename) for filename in filenames]
         filenames = [str(filename) for filename in filenames]
 
 
         if len(filenames) == 0:
         if len(filenames) == 0:
-            self.inform.emit(_("[WARNING_NOTCL]Open DXF cancelled."))
+            self.inform.emit(_("[WARNING_NOTCL] Open DXF cancelled."))
         else:
         else:
             for filename in filenames:
             for filename in filenames:
                 if filename != '':
                 if filename != '':
@@ -6179,7 +6179,7 @@ class App(QtCore.QObject):
         filename = str(filename)
         filename = str(filename)
 
 
         if filename == "":
         if filename == "":
-            self.inform.emit(_("[WARNING_NOTCL]Open TCL script cancelled."))
+            self.inform.emit(_("[WARNING_NOTCL] Open TCL script cancelled."))
         else:
         else:
             self.on_filenewscript()
             self.on_filenewscript()
 
 
@@ -6228,7 +6228,7 @@ class App(QtCore.QObject):
         filename = str(filename)
         filename = str(filename)
 
 
         if filename == "":
         if filename == "":
-            self.inform.emit(_("[WARNING_NOTCL]Run TCL script cancelled."))
+            self.inform.emit(_("[WARNING_NOTCL] Run TCL script cancelled."))
         else:
         else:
             try:
             try:
                 with open(filename, "r") as tcl_script:
                 with open(filename, "r") as tcl_script:
@@ -6392,7 +6392,7 @@ class App(QtCore.QObject):
             return "Could not retrieve object: %s" % box_name
             return "Could not retrieve object: %s" % box_name
 
 
         if box is None:
         if box is None:
-            self.inform.emit(_("[WARNING_NOTCL]No object Box. Using instead %s") % obj)
+            self.inform.emit(_("[WARNING_NOTCL] No object Box. Using instead %s") % obj)
             box = obj
             box = obj
 
 
         def make_negative_film():
         def make_negative_film():
@@ -6512,7 +6512,7 @@ class App(QtCore.QObject):
             return "Could not retrieve object: %s" % box_name
             return "Could not retrieve object: %s" % box_name
 
 
         if box is None:
         if box is None:
-            self.inform.emit(_("[WARNING_NOTCL]No object Box. Using instead %s") % obj)
+            self.inform.emit(_("[WARNING_NOTCL] No object Box. Using instead %s") % obj)
             box = obj
             box = obj
 
 
         def make_black_film():
         def make_black_film():
@@ -7791,19 +7791,19 @@ The normal flow when working in FlatCAM is the following:</span></p>
         self.report_usage("disable_all_plots()")
         self.report_usage("disable_all_plots()")
 
 
         self.disable_plots(self.collection.get_list())
         self.disable_plots(self.collection.get_list())
-        self.inform.emit(_("[success]All plots disabled."))
+        self.inform.emit(_("[success] All plots disabled."))
 
 
     def disable_other_plots(self):
     def disable_other_plots(self):
         self.report_usage("disable_other_plots()")
         self.report_usage("disable_other_plots()")
 
 
         self.disable_plots(self.collection.get_non_selected())
         self.disable_plots(self.collection.get_non_selected())
-        self.inform.emit(_("[success]All non selected plots disabled."))
+        self.inform.emit(_("[success] All non selected plots disabled."))
 
 
     def enable_all_plots(self):
     def enable_all_plots(self):
         self.report_usage("enable_all_plots()")
         self.report_usage("enable_all_plots()")
 
 
         self.enable_plots(self.collection.get_list())
         self.enable_plots(self.collection.get_list())
-        self.inform.emit(_("[success]All plots enabled."))
+        self.inform.emit(_("[success] All plots enabled."))
 
 
     # TODO: FIX THIS
     # TODO: FIX THIS
     '''
     '''

+ 45 - 45
FlatCAMEditor.py

@@ -1057,7 +1057,7 @@ class TransformEditorTool(FlatCAMTool):
                 try:
                 try:
                     value = float(self.rotate_entry.get_value().replace(',', '.'))
                     value = float(self.rotate_entry.get_value().replace(',', '.'))
                 except ValueError:
                 except ValueError:
-                    self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered for Rotate, "
+                    self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered for Rotate, "
                                          "use a number."))
                                          "use a number."))
                     return
                     return
         self.app.worker_task.emit({'fcn': self.on_rotate_action,
         self.app.worker_task.emit({'fcn': self.on_rotate_action,
@@ -1094,7 +1094,7 @@ class TransformEditorTool(FlatCAMTool):
                 try:
                 try:
                     value = float(self.skewx_entry.get_value().replace(',', '.'))
                     value = float(self.skewx_entry.get_value().replace(',', '.'))
                 except ValueError:
                 except ValueError:
-                    self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered for Skew X, "
+                    self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered for Skew X, "
                                          "use a number."))
                                          "use a number."))
                     return
                     return
 
 
@@ -1115,7 +1115,7 @@ class TransformEditorTool(FlatCAMTool):
                 try:
                 try:
                     value = float(self.skewy_entry.get_value().replace(',', '.'))
                     value = float(self.skewy_entry.get_value().replace(',', '.'))
                 except ValueError:
                 except ValueError:
-                    self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered for Skew Y, "
+                    self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered for Skew Y, "
                                          "use a number."))
                                          "use a number."))
                     return
                     return
 
 
@@ -1136,7 +1136,7 @@ class TransformEditorTool(FlatCAMTool):
                 try:
                 try:
                     xvalue = float(self.scalex_entry.get_value().replace(',', '.'))
                     xvalue = float(self.scalex_entry.get_value().replace(',', '.'))
                 except ValueError:
                 except ValueError:
-                    self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered for Scale X, "
+                    self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered for Scale X, "
                                          "use a number."))
                                          "use a number."))
                     return
                     return
 
 
@@ -1173,7 +1173,7 @@ class TransformEditorTool(FlatCAMTool):
                 try:
                 try:
                     yvalue = float(self.scaley_entry.get_value().replace(',', '.'))
                     yvalue = float(self.scaley_entry.get_value().replace(',', '.'))
                 except ValueError:
                 except ValueError:
-                    self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered for Scale Y, "
+                    self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered for Scale Y, "
                                          "use a number."))
                                          "use a number."))
                     return
                     return
 
 
@@ -1205,7 +1205,7 @@ class TransformEditorTool(FlatCAMTool):
                 try:
                 try:
                     value = float(self.offx_entry.get_value().replace(',', '.'))
                     value = float(self.offx_entry.get_value().replace(',', '.'))
                 except ValueError:
                 except ValueError:
-                    self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered for Offset X, "
+                    self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered for Offset X, "
                                          "use a number."))
                                          "use a number."))
                     return
                     return
 
 
@@ -1226,7 +1226,7 @@ class TransformEditorTool(FlatCAMTool):
                 try:
                 try:
                     value = float(self.offy_entry.get_value().replace(',', '.'))
                     value = float(self.offy_entry.get_value().replace(',', '.'))
                 except ValueError:
                 except ValueError:
-                    self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered for Offset Y, "
+                    self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered for Offset Y, "
                                          "use a number."))
                                          "use a number."))
                     return
                     return
 
 
@@ -1922,7 +1922,7 @@ class FCCircle(FCShapeTool):
         radius = distance(p1, p2)
         radius = distance(p1, p2)
         self.geometry = DrawToolShape(Point(p1).buffer(radius, int(self.steps_per_circ / 4)))
         self.geometry = DrawToolShape(Point(p1).buffer(radius, int(self.steps_per_circ / 4)))
         self.complete = True
         self.complete = True
-        self.draw_app.app.inform.emit(_("[success]Done. Adding Circle completed."))
+        self.draw_app.app.inform.emit(_("[success] Done. Adding Circle completed."))
 
 
 
 
 class FCArc(FCShapeTool):
 class FCArc(FCShapeTool):
@@ -2108,7 +2108,7 @@ class FCArc(FCShapeTool):
             self.geometry = DrawToolShape(LineString(arc(center, radius, startangle, stopangle,
             self.geometry = DrawToolShape(LineString(arc(center, radius, startangle, stopangle,
                                                          self.direction, self.steps_per_circ)))
                                                          self.direction, self.steps_per_circ)))
         self.complete = True
         self.complete = True
-        self.draw_app.app.inform.emit(_("[success]Done. Arc completed."))
+        self.draw_app.app.inform.emit(_("[success] Done. Arc completed."))
 
 
 
 
 class FCRectangle(FCShapeTool):
 class FCRectangle(FCShapeTool):
@@ -2148,7 +2148,7 @@ class FCRectangle(FCShapeTool):
         # self.geometry = LinearRing([p1, (p2[0], p1[1]), p2, (p1[0], p2[1])])
         # self.geometry = LinearRing([p1, (p2[0], p1[1]), p2, (p1[0], p2[1])])
         self.geometry = DrawToolShape(Polygon([p1, (p2[0], p1[1]), p2, (p1[0], p2[1])]))
         self.geometry = DrawToolShape(Polygon([p1, (p2[0], p1[1]), p2, (p1[0], p2[1])]))
         self.complete = True
         self.complete = True
-        self.draw_app.app.inform.emit(_("[success]Done. Rectangle completed."))
+        self.draw_app.app.inform.emit(_("[success] Done. Rectangle completed."))
 
 
 
 
 class FCPolygon(FCShapeTool):
 class FCPolygon(FCShapeTool):
@@ -2190,7 +2190,7 @@ class FCPolygon(FCShapeTool):
         self.geometry = DrawToolShape(Polygon(self.points))
         self.geometry = DrawToolShape(Polygon(self.points))
         self.draw_app.in_action = False
         self.draw_app.in_action = False
         self.complete = True
         self.complete = True
-        self.draw_app.app.inform.emit(_("[success]Done. Polygon completed."))
+        self.draw_app.app.inform.emit(_("[success] Done. Polygon completed."))
 
 
     def on_key(self, key):
     def on_key(self, key):
         if key == 'backspace':
         if key == 'backspace':
@@ -2209,7 +2209,7 @@ class FCPath(FCPolygon):
 
 
         self.draw_app.in_action = False
         self.draw_app.in_action = False
         self.complete = True
         self.complete = True
-        self.draw_app.app.inform.emit(_("[success]Done. Path completed."))
+        self.draw_app.app.inform.emit(_("[success] Done. Path completed."))
 
 
     def utility_geometry(self, data=None):
     def utility_geometry(self, data=None):
         if len(self.points) > 0:
         if len(self.points) > 0:
@@ -2507,7 +2507,7 @@ class FCMove(FCShapeTool):
         #     self.draw_app.set_selected(g)
         #     self.draw_app.set_selected(g)
 
 
         self.complete = True
         self.complete = True
-        self.draw_app.app.inform.emit(_("[success]Done. Geometry(s) Move completed."))
+        self.draw_app.app.inform.emit(_("[success] Done. Geometry(s) Move completed."))
 
 
     def utility_geometry(self, data=None):
     def utility_geometry(self, data=None):
         """
         """
@@ -2552,7 +2552,7 @@ class FCCopy(FCMove):
         self.geometry = [DrawToolShape(affinity.translate(geom.geo, xoff=dx, yoff=dy))
         self.geometry = [DrawToolShape(affinity.translate(geom.geo, xoff=dx, yoff=dy))
                          for geom in self.draw_app.get_selected()]
                          for geom in self.draw_app.get_selected()]
         self.complete = True
         self.complete = True
-        self.draw_app.app.inform.emit(_("[success]Done. Geometry(s) Copy completed."))
+        self.draw_app.app.inform.emit(_("[success] Done. Geometry(s) Copy completed."))
 
 
 
 
 class FCText(FCShapeTool):
 class FCText(FCShapeTool):
@@ -2588,7 +2588,7 @@ class FCText(FCShapeTool):
         self.text_gui.text_path = []
         self.text_gui.text_path = []
         self.text_gui.hide_tool()
         self.text_gui.hide_tool()
         self.complete = True
         self.complete = True
-        self.draw_app.app.inform.emit(_("[success]Done. Adding Text completed."))
+        self.draw_app.app.inform.emit(_("[success] Done. Adding Text completed."))
 
 
     def utility_geometry(self, data=None):
     def utility_geometry(self, data=None):
         """
         """
@@ -2649,7 +2649,7 @@ class FCBuffer(FCShapeTool):
         self.draw_app.app.ui.splitter.setSizes([0, 1])
         self.draw_app.app.ui.splitter.setSizes([0, 1])
 
 
         self.disactivate()
         self.disactivate()
-        self.draw_app.app.inform.emit(_("[success]Done. Buffer Tool completed."))
+        self.draw_app.app.inform.emit(_("[success] Done. Buffer Tool completed."))
 
 
     def on_buffer_int(self):
     def on_buffer_int(self):
         if not self.draw_app.selected:
         if not self.draw_app.selected:
@@ -2675,7 +2675,7 @@ class FCBuffer(FCShapeTool):
         self.draw_app.app.ui.splitter.setSizes([0, 1])
         self.draw_app.app.ui.splitter.setSizes([0, 1])
 
 
         self.disactivate()
         self.disactivate()
-        self.draw_app.app.inform.emit(_("[success]Done. Buffer Int Tool completed."))
+        self.draw_app.app.inform.emit(_("[success] Done. Buffer Int Tool completed."))
 
 
     def on_buffer_ext(self):
     def on_buffer_ext(self):
         if not self.draw_app.selected:
         if not self.draw_app.selected:
@@ -2701,7 +2701,7 @@ class FCBuffer(FCShapeTool):
         self.draw_app.app.ui.splitter.setSizes([0, 1])
         self.draw_app.app.ui.splitter.setSizes([0, 1])
 
 
         self.disactivate()
         self.disactivate()
-        self.draw_app.app.inform.emit(_("[success]Done. Buffer Ext Tool completed."))
+        self.draw_app.app.inform.emit(_("[success] Done. Buffer Ext Tool completed."))
 
 
     def activate(self):
     def activate(self):
         self.buff_tool.buffer_button.clicked.disconnect()
         self.buff_tool.buffer_button.clicked.disconnect()
@@ -2822,7 +2822,7 @@ class FCDrillAdd(FCShapeTool):
         self.draw_app.current_storage = self.draw_app.storage_dict[self.selected_dia]
         self.draw_app.current_storage = self.draw_app.storage_dict[self.selected_dia]
         self.geometry = DrawToolShape(self.util_shape(self.points))
         self.geometry = DrawToolShape(self.util_shape(self.points))
         self.complete = True
         self.complete = True
-        self.draw_app.app.inform.emit(_("[success]Done. Drill added."))
+        self.draw_app.app.inform.emit(_("[success] Done. Drill added."))
 
 
 
 
 class FCDrillArray(FCShapeTool):
 class FCDrillArray(FCShapeTool):
@@ -3007,7 +3007,7 @@ class FCDrillArray(FCShapeTool):
                 self.geometry.append(DrawToolShape(geo))
                 self.geometry.append(DrawToolShape(geo))
         else:
         else:
             if (self.drill_angle * self.drill_array_size) > 360:
             if (self.drill_angle * self.drill_array_size) > 360:
-                self.draw_app.app.inform.emit(_("[WARNING_NOTCL]Too many drills for the selected spacing angle."))
+                self.draw_app.app.inform.emit(_("[WARNING_NOTCL] Too many drills for the selected spacing angle."))
                 return
                 return
 
 
             radius = distance(self.destination, self.origin)
             radius = distance(self.destination, self.origin)
@@ -3024,7 +3024,7 @@ class FCDrillArray(FCShapeTool):
                 geo = self.util_shape((x, y))
                 geo = self.util_shape((x, y))
                 self.geometry.append(DrawToolShape(geo))
                 self.geometry.append(DrawToolShape(geo))
         self.complete = True
         self.complete = True
-        self.draw_app.app.inform.emit(_("[success]Done. Drill Array added."))
+        self.draw_app.app.inform.emit(_("[success] Done. Drill Array added."))
         self.draw_app.in_action = True
         self.draw_app.in_action = True
         self.draw_app.array_frame.hide()
         self.draw_app.array_frame.hide()
         return
         return
@@ -3055,7 +3055,7 @@ class FCDrillResize(FCShapeTool):
         try:
         try:
             new_dia = self.draw_app.resdrill_entry.get_value()
             new_dia = self.draw_app.resdrill_entry.get_value()
         except:
         except:
-            self.draw_app.app.inform.emit(_("[ERROR_NOTCL]Resize drill(s) failed. Please enter a diameter for resize."))
+            self.draw_app.app.inform.emit(_("[ERROR_NOTCL] Resize drill(s) failed. Please enter a diameter for resize."))
             return
             return
 
 
         if new_dia not in self.draw_app.olddia_newdia:
         if new_dia not in self.draw_app.olddia_newdia:
@@ -3127,7 +3127,7 @@ class FCDrillResize(FCShapeTool):
 
 
         self.draw_app.resize_frame.hide()
         self.draw_app.resize_frame.hide()
         self.complete = True
         self.complete = True
-        self.draw_app.app.inform.emit(_("[success]Done. Drill Resize completed."))
+        self.draw_app.app.inform.emit(_("[success] Done. Drill Resize completed."))
 
 
         # MS: always return to the Select Tool
         # MS: always return to the Select Tool
         self.draw_app.select_tool("select")
         self.draw_app.select_tool("select")
@@ -3202,7 +3202,7 @@ class FCDrillMove(FCShapeTool):
             sel_shapes_to_be_deleted = []
             sel_shapes_to_be_deleted = []
 
 
         self.draw_app.build_ui()
         self.draw_app.build_ui()
-        self.draw_app.app.inform.emit(_("[success]Done. Drill(s) Move completed."))
+        self.draw_app.app.inform.emit(_("[success] Done. Drill(s) Move completed."))
 
 
     def utility_geometry(self, data=None):
     def utility_geometry(self, data=None):
         """
         """
@@ -3255,7 +3255,7 @@ class FCDrillCopy(FCDrillMove):
             sel_shapes_to_be_deleted = []
             sel_shapes_to_be_deleted = []
 
 
         self.draw_app.build_ui()
         self.draw_app.build_ui()
-        self.draw_app.app.inform.emit(_("[success]Done. Drill(s) copied."))
+        self.draw_app.app.inform.emit(_("[success] Done. Drill(s) copied."))
 
 
 
 
 ########################
 ########################
@@ -3916,7 +3916,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
                             self.active_tool.make()
                             self.active_tool.make()
                             if self.active_tool.complete:
                             if self.active_tool.complete:
                                 self.on_shape_complete()
                                 self.on_shape_complete()
-                                self.app.inform.emit(_("[success]Done."))
+                                self.app.inform.emit(_("[success] Done."))
 
 
                                 # MS: always return to the Select Tool if modifier key is not pressed
                                 # MS: always return to the Select Tool if modifier key is not pressed
                                 # else return to the current tool
                                 # else return to the current tool
@@ -4304,7 +4304,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
             results = shapes[0].geo
             results = shapes[0].geo
         except Exception as e:
         except Exception as e:
             log.debug("FlatCAMGeoEditor.intersection() --> %s" % str(e))
             log.debug("FlatCAMGeoEditor.intersection() --> %s" % str(e))
-            self.app.inform.emit(_("[WARNING_NOTCL]A selection of at least 2 geo items is required to do Intersection."))
+            self.app.inform.emit(_("[WARNING_NOTCL] A selection of at least 2 geo items is required to do Intersection."))
             self.select_tool('select')
             self.select_tool('select')
             return
             return
 
 
@@ -4342,7 +4342,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
 
 
         if buf_distance < 0:
         if buf_distance < 0:
             self.app.inform.emit(
             self.app.inform.emit(
-               _( "[ERROR_NOTCL]Negative buffer value is not accepted. Use Buffer interior to generate an 'inside' shape"))
+               _( "[ERROR_NOTCL] Negative buffer value is not accepted. Use Buffer interior to generate an 'inside' shape"))
 
 
             # deselect everything
             # deselect everything
             self.selected = []
             self.selected = []
@@ -4364,7 +4364,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
         pre_buffer = cascaded_union([t.geo for t in selected])
         pre_buffer = cascaded_union([t.geo for t in selected])
         results = pre_buffer.buffer(buf_distance - 1e-10, resolution=32, join_style=join_style)
         results = pre_buffer.buffer(buf_distance - 1e-10, resolution=32, join_style=join_style)
         if results.is_empty:
         if results.is_empty:
-            self.app.inform.emit(_("[ERROR_NOTCL]Failed, the result is empty. Choose a different buffer value."))
+            self.app.inform.emit(_("[ERROR_NOTCL] Failed, the result is empty. Choose a different buffer value."))
             # deselect everything
             # deselect everything
             self.selected = []
             self.selected = []
             self.replot()
             self.replot()
@@ -4372,14 +4372,14 @@ class FlatCAMGeoEditor(QtCore.QObject):
         self.add_shape(DrawToolShape(results))
         self.add_shape(DrawToolShape(results))
 
 
         self.replot()
         self.replot()
-        self.app.inform.emit(_("[success]Full buffer geometry created."))
+        self.app.inform.emit(_("[success] Full buffer geometry created."))
 
 
     def buffer_int(self, buf_distance, join_style):
     def buffer_int(self, buf_distance, join_style):
         selected = self.get_selected()
         selected = self.get_selected()
 
 
         if buf_distance < 0:
         if buf_distance < 0:
             self.app.inform.emit(
             self.app.inform.emit(
-                _("[ERROR_NOTCL]Negative buffer value is not accepted. "
+                _("[ERROR_NOTCL] Negative buffer value is not accepted. "
                     "Use Buffer interior to generate an 'inside' shape")
                     "Use Buffer interior to generate an 'inside' shape")
             )
             )
             # deselect everything
             # deselect everything
@@ -4401,7 +4401,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
         pre_buffer = cascaded_union([t.geo for t in selected])
         pre_buffer = cascaded_union([t.geo for t in selected])
         results = pre_buffer.buffer(-buf_distance + 1e-10, resolution=32, join_style=join_style)
         results = pre_buffer.buffer(-buf_distance + 1e-10, resolution=32, join_style=join_style)
         if results.is_empty:
         if results.is_empty:
-            self.app.inform.emit(_("[ERROR_NOTCL]Failed, the result is empty. Choose a smaller buffer value."))
+            self.app.inform.emit(_("[ERROR_NOTCL] Failed, the result is empty. Choose a smaller buffer value."))
             # deselect everything
             # deselect everything
             self.selected = []
             self.selected = []
             self.replot()
             self.replot()
@@ -4413,7 +4413,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
             self.add_shape(DrawToolShape(results.exterior))
             self.add_shape(DrawToolShape(results.exterior))
 
 
         self.replot()
         self.replot()
-        self.app.inform.emit(_("[success]Exterior buffer geometry created."))
+        self.app.inform.emit(_("[success] Exterior buffer geometry created."))
         # selected = self.get_selected()
         # selected = self.get_selected()
         #
         #
         # if len(selected) == 0:
         # if len(selected) == 0:
@@ -4451,7 +4451,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
         selected = self.get_selected()
         selected = self.get_selected()
 
 
         if buf_distance < 0:
         if buf_distance < 0:
-            self.app.inform.emit(_("[ERROR_NOTCL]Negative buffer value is not accepted. "
+            self.app.inform.emit(_("[ERROR_NOTCL] Negative buffer value is not accepted. "
                                  "Use Buffer interior to generate an 'inside' shape"))
                                  "Use Buffer interior to generate an 'inside' shape"))
             # deselect everything
             # deselect everything
             self.selected = []
             self.selected = []
@@ -4472,7 +4472,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
         pre_buffer = cascaded_union([t.geo for t in selected])
         pre_buffer = cascaded_union([t.geo for t in selected])
         results = pre_buffer.buffer(buf_distance - 1e-10, resolution=32, join_style=join_style)
         results = pre_buffer.buffer(buf_distance - 1e-10, resolution=32, join_style=join_style)
         if results.is_empty:
         if results.is_empty:
-            self.app.inform.emit(_("[ERROR_NOTCL]Failed, the result is empty. Choose a different buffer value."))
+            self.app.inform.emit(_("[ERROR_NOTCL] Failed, the result is empty. Choose a different buffer value."))
             # deselect everything
             # deselect everything
             self.selected = []
             self.selected = []
             self.replot()
             self.replot()
@@ -4484,7 +4484,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
             self.add_shape(DrawToolShape(results.exterior))
             self.add_shape(DrawToolShape(results.exterior))
 
 
         self.replot()
         self.replot()
-        self.app.inform.emit(_("[success]Exterior buffer geometry created."))
+        self.app.inform.emit(_("[success] Exterior buffer geometry created."))
 
 
     # def paint(self, tooldia, overlap, margin, method):
     # def paint(self, tooldia, overlap, margin, method):
     #     selected = self.get_selected()
     #     selected = self.get_selected()
@@ -4548,7 +4548,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
         selected = self.get_selected()
         selected = self.get_selected()
 
 
         if len(selected) == 0:
         if len(selected) == 0:
-            self.app.inform.emit(_("[WARNING_NOTCL]Nothing selected for painting."))
+            self.app.inform.emit(_("[WARNING_NOTCL] Nothing selected for painting."))
             return
             return
 
 
         for param in [tooldia, overlap, margin]:
         for param in [tooldia, overlap, margin]:
@@ -5331,7 +5331,7 @@ class FlatCAMExcEditor(QtCore.QObject):
                 try:
                 try:
                     tool_dia = float(self.addtool_entry.get_value().replace(',', '.'))
                     tool_dia = float(self.addtool_entry.get_value().replace(',', '.'))
                 except ValueError:
                 except ValueError:
-                    self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
+                    self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, "
                                          "use a number.")
                                          "use a number.")
                                          )
                                          )
                     return
                     return
@@ -5344,7 +5344,7 @@ class FlatCAMExcEditor(QtCore.QObject):
             # each time a tool diameter is edited or added
             # each time a tool diameter is edited or added
             self.olddia_newdia[tool_dia] = tool_dia
             self.olddia_newdia[tool_dia] = tool_dia
         else:
         else:
-            self.app.inform.emit(_("[WARNING_NOTCL]Tool already in the original or actual tool list.\n"
+            self.app.inform.emit(_("[WARNING_NOTCL] Tool already in the original or actual tool list.\n"
                                  "Save and reedit Excellon if you need to add this tool. ")
                                  "Save and reedit Excellon if you need to add this tool. ")
                                  )
                                  )
             return
             return
@@ -5353,7 +5353,7 @@ class FlatCAMExcEditor(QtCore.QObject):
         # we add a new entry in the tool2tooldia dict
         # we add a new entry in the tool2tooldia dict
         self.tool2tooldia[len(self.olddia_newdia)] = tool_dia
         self.tool2tooldia[len(self.olddia_newdia)] = tool_dia
 
 
-        self.app.inform.emit(_("[success]Added new tool with dia: {dia} {units}").format(dia=str(tool_dia), units=str(self.units)))
+        self.app.inform.emit(_("[success] Added new tool with dia: {dia} {units}").format(dia=str(tool_dia), units=str(self.units)))
 
 
         self.build_ui()
         self.build_ui()
 
 
@@ -5384,7 +5384,7 @@ class FlatCAMExcEditor(QtCore.QObject):
                 else:
                 else:
                     deleted_tool_dia_list.append(float('%.4f' % dia))
                     deleted_tool_dia_list.append(float('%.4f' % dia))
         except:
         except:
-            self.app.inform.emit(_("[WARNING_NOTCL]Select a tool in Tool Table"))
+            self.app.inform.emit(_("[WARNING_NOTCL] Select a tool in Tool Table"))
             return
             return
 
 
         for deleted_tool_dia in deleted_tool_dia_list:
         for deleted_tool_dia in deleted_tool_dia_list:
@@ -5417,7 +5417,7 @@ class FlatCAMExcEditor(QtCore.QObject):
 
 
             self.olddia_newdia.pop(deleted_tool_dia, None)
             self.olddia_newdia.pop(deleted_tool_dia, None)
 
 
-            self.app.inform.emit(_("[success]Deleted tool with dia: {del_dia} {units}").format(del_dia=str(deleted_tool_dia), units=str(self.units)))
+            self.app.inform.emit(_("[success] Deleted tool with dia: {del_dia} {units}").format(del_dia=str(deleted_tool_dia), units=str(self.units)))
 
 
         self.replot()
         self.replot()
         # self.app.inform.emit("Could not delete selected tool")
         # self.app.inform.emit("Could not delete selected tool")
@@ -5832,7 +5832,7 @@ class FlatCAMExcEditor(QtCore.QObject):
                 self.app.progress.emit(100)
                 self.app.progress.emit(100)
                 return
                 return
 
 
-            self.app.inform.emit(_("[success]Excellon editing finished."))
+            self.app.inform.emit(_("[success] Excellon editing finished."))
             # self.progress.emit(100)
             # self.progress.emit(100)
 
 
     def on_tool_select(self, tool):
     def on_tool_select(self, tool):
@@ -5849,7 +5849,7 @@ class FlatCAMExcEditor(QtCore.QObject):
             # self.draw_app.select_tool('select')
             # self.draw_app.select_tool('select')
             self.complete = True
             self.complete = True
             current_tool = 'select'
             current_tool = 'select'
-            self.app.inform.emit(_("[WARNING_NOTCL]Cancelled. There is no Tool/Drill selected"))
+            self.app.inform.emit(_("[WARNING_NOTCL] Cancelled. There is no Tool/Drill selected"))
 
 
         # This is to make the group behave as radio group
         # This is to make the group behave as radio group
         if current_tool in self.tools_exc:
         if current_tool in self.tools_exc:
@@ -6331,7 +6331,7 @@ class FlatCAMExcEditor(QtCore.QObject):
 
 
         self.selected = []
         self.selected = []
         self.build_ui()
         self.build_ui()
-        self.app.inform.emit(_("[success]Done. Drill(s) deleted."))
+        self.app.inform.emit(_("[success] Done. Drill(s) deleted."))
 
 
     def delete_shape(self, shape):
     def delete_shape(self, shape):
         self.is_modified = True
         self.is_modified = True

+ 41 - 41
FlatCAMObj.py

@@ -191,7 +191,7 @@ class FlatCAMObj(QtCore.QObject):
             log.debug("on_name_activate() --> Could not remove the old object name from auto-completer model list")
             log.debug("on_name_activate() --> Could not remove the old object name from auto-completer model list")
 
 
         self.options["name"] = self.ui.name_entry.get_value()
         self.options["name"] = self.ui.name_entry.get_value()
-        self.app.inform.emit(_("[success]Name changed from {old} to {new}").format(old=old_name, new=new_name))
+        self.app.inform.emit(_("[success] Name changed from {old} to {new}").format(old=old_name, new=new_name))
 
 
     def on_offset_button_click(self):
     def on_offset_button_click(self):
         self.app.report_usage("obj_on_offset_button")
         self.app.report_usage("obj_on_offset_button")
@@ -907,7 +907,7 @@ class FlatCAMGerber(FlatCAMObj, Gerber):
                 for g in geo_obj.solid_geometry:
                 for g in geo_obj.solid_geometry:
                     if g:
                     if g:
                         app_obj.inform.emit(_(
                         app_obj.inform.emit(_(
-                            "[success]Isolation geometry created: %s"
+                            "[success] Isolation geometry created: %s"
                         ) % geo_obj.options["name"])
                         ) % geo_obj.options["name"])
                         break
                         break
                     else:
                     else:
@@ -962,7 +962,7 @@ class FlatCAMGerber(FlatCAMObj, Gerber):
                     for g in geo_obj.solid_geometry:
                     for g in geo_obj.solid_geometry:
                         if g:
                         if g:
                             app_obj.inform.emit(_(
                             app_obj.inform.emit(_(
-                                "[success]Isolation geometry created: %s"
+                                "[success] Isolation geometry created: %s"
                             ) % geo_obj.options["name"])
                             ) % geo_obj.options["name"])
                             break
                             break
                         else:
                         else:
@@ -1171,7 +1171,7 @@ class FlatCAMGerber(FlatCAMObj, Gerber):
             ret = self.app.new_object("gerber", name, obj_init, autoselected=False)
             ret = self.app.new_object("gerber", name, obj_init, autoselected=False)
             if ret == 'fail':
             if ret == 'fail':
                 self.app.inform.emit(_(
                 self.app.inform.emit(_(
-                    '[ERROR_NOTCL] Cretion of Gerber failed.'
+                    '[ERROR_NOTCL] Creation of Gerber failed.'
                 ))
                 ))
                 return
                 return
 
 
@@ -1985,7 +1985,7 @@ class FlatCAMExcellon(FlatCAMObj, Excellon):
                         self.ui.tools_table.currentItem().text().replace(',', '.'))
                         self.ui.tools_table.currentItem().text().replace(',', '.'))
                 except ValueError:
                 except ValueError:
                     self.app.inform.emit(_(
                     self.app.inform.emit(_(
-                        "[ERROR_NOTCL]Wrong value format entered, use a number."
+                        "[ERROR_NOTCL] Wrong value format entered, use a number."
                     ))
                     ))
                     self.ui.tools_table.currentItem().setText(str(self.tool_offset[dia]))
                     self.ui.tools_table.currentItem().setText(str(self.tool_offset[dia]))
                     return
                     return
@@ -2209,7 +2209,7 @@ class FlatCAMExcellon(FlatCAMObj, Excellon):
 
 
         if len(tools) == 0:
         if len(tools) == 0:
             self.app.inform.emit(_(
             self.app.inform.emit(_(
-                "[ERROR_NOTCL]Please select one or more tools from the list and try again."
+                "[ERROR_NOTCL] Please select one or more tools from the list and try again."
             ))
             ))
             return False, "Error: No tools."
             return False, "Error: No tools."
 
 
@@ -2300,7 +2300,7 @@ class FlatCAMExcellon(FlatCAMObj, Excellon):
 
 
         if len(tools) == 0:
         if len(tools) == 0:
             self.app.inform.emit(_(
             self.app.inform.emit(_(
-                "[ERROR_NOTCL]Please select one or more tools from the list and try again."
+                "[ERROR_NOTCL] Please select one or more tools from the list and try again."
             ))
             ))
             return False, "Error: No tools."
             return False, "Error: No tools."
 
 
@@ -2415,7 +2415,7 @@ class FlatCAMExcellon(FlatCAMObj, Excellon):
                 tools.append(self.ui.tools_table.item(0, 0).text())
                 tools.append(self.ui.tools_table.item(0, 0).text())
             else:
             else:
                 self.app.inform.emit(_(
                 self.app.inform.emit(_(
-                    "[ERROR_NOTCL]Please select one or more tools from the list and try again."
+                    "[ERROR_NOTCL] Please select one or more tools from the list and try again."
                 ))
                 ))
                 return
                 return
 
 
@@ -2475,7 +2475,7 @@ class FlatCAMExcellon(FlatCAMObj, Excellon):
                 except ValueError:
                 except ValueError:
                     self.app.inform.emit(
                     self.app.inform.emit(
                         _(
                         _(
-                            '[ERROR_NOTCL]Wrong value format for self.defaults["z_pdepth"] or self.options["z_pdepth"]'
+                            '[ERROR_NOTCL] Wrong value format for self.defaults["z_pdepth"] or self.options["z_pdepth"]'
                         ))
                         ))
 
 
             try:
             try:
@@ -2487,7 +2487,7 @@ class FlatCAMExcellon(FlatCAMObj, Excellon):
                 except ValueError:
                 except ValueError:
                     self.app.inform.emit(
                     self.app.inform.emit(
                         _(
                         _(
-                            '[ERROR_NOTCL]Wrong value format for self.defaults["feedrate_probe"] '
+                            '[ERROR_NOTCL] Wrong value format for self.defaults["feedrate_probe"] '
                             'or self.options["feedrate_probe"]'
                             'or self.options["feedrate_probe"]'
                         )
                         )
                     )
                     )
@@ -3250,7 +3250,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
                             )
                             )
                         except ValueError:
                         except ValueError:
                             self.app.inform.emit(_(
                             self.app.inform.emit(_(
-                                "[ERROR_NOTCL]Wrong value format entered, "
+                                "[ERROR_NOTCL] Wrong value format entered, "
                                 "use a number."
                                 "use a number."
                             )
                             )
                             )
                             )
@@ -3471,7 +3471,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
         else:
         else:
             change_message = False
             change_message = False
             self.app.inform.emit(_(
             self.app.inform.emit(_(
-                "[ERROR_NOTCL]Default Tool added. Wrong value format entered."
+                "[ERROR_NOTCL] Default Tool added. Wrong value format entered."
             ))
             ))
         self.build_ui()
         self.build_ui()
 
 
@@ -3501,7 +3501,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
                         self.tools[int(max_uid)] = deepcopy(self.tools[tooluid_copy])
                         self.tools[int(max_uid)] = deepcopy(self.tools[tooluid_copy])
                     except AttributeError:
                     except AttributeError:
                         self.app.inform.emit(_(
                         self.app.inform.emit(_(
-                            "[WARNING_NOTCL]Failed. Select a tool to copy."
+                            "[WARNING_NOTCL] Failed. Select a tool to copy."
                         ))
                         ))
                         self.build_ui()
                         self.build_ui()
                         return
                         return
@@ -3511,7 +3511,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
                 # self.ui.geo_tools_table.clearSelection()
                 # self.ui.geo_tools_table.clearSelection()
             else:
             else:
                 self.app.inform.emit(_(
                 self.app.inform.emit(_(
-                    "[WARNING_NOTCL]Failed. Select a tool to copy."
+                    "[WARNING_NOTCL] Failed. Select a tool to copy."
                 ))
                 ))
                 self.build_ui()
                 self.build_ui()
                 return
                 return
@@ -3556,7 +3556,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
                 d = float(self.ui.geo_tools_table.item(current_row, 1).text().replace(',', '.'))
                 d = float(self.ui.geo_tools_table.item(current_row, 1).text().replace(',', '.'))
             except ValueError:
             except ValueError:
                 self.app.inform.emit(_(
                 self.app.inform.emit(_(
-                    "[ERROR_NOTCL]Wrong value format entered, "
+                    "[ERROR_NOTCL] Wrong value format entered, "
                     "use a number."
                     "use a number."
                 ))
                 ))
                 return
                 return
@@ -3604,7 +3604,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
                         temp_tools.clear()
                         temp_tools.clear()
                     except AttributeError:
                     except AttributeError:
                         self.app.inform.emit(_(
                         self.app.inform.emit(_(
-                            "[WARNING_NOTCL]Failed. Select a tool to delete."
+                            "[WARNING_NOTCL] Failed. Select a tool to delete."
                         ))
                         ))
                         self.build_ui()
                         self.build_ui()
                         return
                         return
@@ -3614,7 +3614,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
                 # self.ui.geo_tools_table.clearSelection()
                 # self.ui.geo_tools_table.clearSelection()
             else:
             else:
                 self.app.inform.emit(_(
                 self.app.inform.emit(_(
-                    "[WARNING_NOTCL]Failed. Select a tool to delete."
+                    "[WARNING_NOTCL] Failed. Select a tool to delete."
                 ))
                 ))
                 self.build_ui()
                 self.build_ui()
                 return
                 return
@@ -3743,7 +3743,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
                 vdia = float(self.ui.tipdia_entry.get_value().replace(',', '.'))
                 vdia = float(self.ui.tipdia_entry.get_value().replace(',', '.'))
             except ValueError:
             except ValueError:
                 self.app.inform.emit(_(
                 self.app.inform.emit(_(
-                    "[ERROR_NOTCL]Wrong value format entered, "
+                    "[ERROR_NOTCL] Wrong value format entered, "
                     "use a number."
                     "use a number."
                 ))
                 ))
                 return
                 return
@@ -3756,7 +3756,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
                 half_vangle = float(self.ui.tipangle_entry.get_value().replace(',', '.')) / 2
                 half_vangle = float(self.ui.tipangle_entry.get_value().replace(',', '.')) / 2
             except ValueError:
             except ValueError:
                 self.app.inform.emit(_(
                 self.app.inform.emit(_(
-                    "[ERROR_NOTCL]Wrong value format entered, "
+                    "[ERROR_NOTCL] Wrong value format entered, "
                     "use a number."
                     "use a number."
                 ))
                 ))
                 return
                 return
@@ -3873,7 +3873,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
                                      )
                                      )
             except ValueError:
             except ValueError:
                 self.app.inform.emit(_(
                 self.app.inform.emit(_(
-                    "[ERROR_NOTCL]Wrong value format entered, "
+                    "[ERROR_NOTCL] Wrong value format entered, "
                     "use a number."
                     "use a number."
                 ))
                 ))
                 return
                 return
@@ -4052,7 +4052,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
         try:
         try:
             if self.special_group:
             if self.special_group:
                 self.app.inform.emit(_(
                 self.app.inform.emit(_(
-                    "[WARNING_NOTCL]This Geometry can't be processed because it is %s geometry."
+                    "[WARNING_NOTCL] This Geometry can't be processed because it is %s geometry."
                 ) % str(self.special_group))
                 ) % str(self.special_group))
                 return
                 return
         except AttributeError:
         except AttributeError:
@@ -4069,7 +4069,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
                         tooldia = float(self.ui.geo_tools_table.item(x.row(), 1).text().replace(',', '.'))
                         tooldia = float(self.ui.geo_tools_table.item(x.row(), 1).text().replace(',', '.'))
                     except ValueError:
                     except ValueError:
                         self.app.inform.emit(_(
                         self.app.inform.emit(_(
-                            "[ERROR_NOTCL]Wrong Tool Dia value format entered, "
+                            "[ERROR_NOTCL] Wrong Tool Dia value format entered, "
                             "use a number."
                             "use a number."
                         ))
                         ))
                         return
                         return
@@ -4169,7 +4169,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
                 except ValueError:
                 except ValueError:
                     self.app.inform.emit(
                     self.app.inform.emit(
                         _(
                         _(
-                            '[ERROR_NOTCL]Wrong value format for self.defaults["z_pdepth"] or self.options["z_pdepth"]'
+                            '[ERROR_NOTCL] Wrong value format for self.defaults["z_pdepth"] or self.options["z_pdepth"]'
                         ))
                         ))
 
 
             try:
             try:
@@ -4181,7 +4181,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
                 except ValueError:
                 except ValueError:
                     self.app.inform.emit(
                     self.app.inform.emit(
                         _(
                         _(
-                            '[ERROR_NOTCL]Wrong value format for self.defaults["feedrate_probe"] '
+                            '[ERROR_NOTCL] Wrong value format for self.defaults["feedrate_probe"] '
                             'or self.options["feedrate_probe"]'
                             'or self.options["feedrate_probe"]'
                         ))
                         ))
 
 
@@ -4281,7 +4281,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
                                                  )
                                                  )
                         except ValueError:
                         except ValueError:
                             self.app.inform.emit(_(
                             self.app.inform.emit(_(
-                                "[ERROR_NOTCL]Wrong value format entered, "
+                                "[ERROR_NOTCL] Wrong value format entered, "
                                 "use a number."
                                 "use a number."
                             ))
                             ))
                             return
                             return
@@ -4380,7 +4380,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
                 except ValueError:
                 except ValueError:
                     self.app.inform.emit(
                     self.app.inform.emit(
                         _(
                         _(
-                            '[ERROR_NOTCL]Wrong value format for self.defaults["z_pdepth"] or self.options["z_pdepth"]'
+                            '[ERROR_NOTCL] Wrong value format for self.defaults["z_pdepth"] or self.options["z_pdepth"]'
                         ))
                         ))
 
 
             try:
             try:
@@ -4392,7 +4392,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
                 except ValueError:
                 except ValueError:
                     self.app.inform.emit(
                     self.app.inform.emit(
                         _(
                         _(
-                            '[ERROR_NOTCL]Wrong value format for self.defaults["feedrate_probe"] '
+                            '[ERROR_NOTCL] Wrong value format for self.defaults["feedrate_probe"] '
                             'or self.options["feedrate_probe"]'
                             'or self.options["feedrate_probe"]'
                         ))
                         ))
 
 
@@ -4404,7 +4404,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
                         a += 1
                         a += 1
                 if a == len(self.tools):
                 if a == len(self.tools):
                     self.app.inform.emit(_(
                     self.app.inform.emit(_(
-                        '[ERROR_NOTCL]Cancelled. Empty file, it has no geometry...'
+                        '[ERROR_NOTCL] Cancelled. Empty file, it has no geometry...'
                     ))
                     ))
                     return 'fail'
                     return 'fail'
 
 
@@ -4514,7 +4514,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
                                                   )
                                                   )
                         except ValueError:
                         except ValueError:
                             self.app.inform.emit(_(
                             self.app.inform.emit(_(
-                                "[ERROR_NOTCL]Wrong value format entered, "
+                                "[ERROR_NOTCL] Wrong value format entered, "
                                 "use a number."
                                 "use a number."
                             ))
                             ))
                             return
                             return
@@ -4584,12 +4584,12 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
                 if self.solid_geometry:
                 if self.solid_geometry:
                     with self.app.proc_container.new(_("Generating CNC Code")):
                     with self.app.proc_container.new(_("Generating CNC Code")):
                         if app_obj.new_object("cncjob", outname, job_init_single_geometry) != 'fail':
                         if app_obj.new_object("cncjob", outname, job_init_single_geometry) != 'fail':
-                            app_obj.inform.emit("[success]CNCjob created: %s" % outname)
+                            app_obj.inform.emit("[success] CNCjob created: %s" % outname)
                             app_obj.progress.emit(100)
                             app_obj.progress.emit(100)
                 else:
                 else:
                     with self.app.proc_container.new(_("Generating CNC Code")):
                     with self.app.proc_container.new(_("Generating CNC Code")):
                         if app_obj.new_object("cncjob", outname, job_init_multi_geometry) != 'fail':
                         if app_obj.new_object("cncjob", outname, job_init_multi_geometry) != 'fail':
-                            app_obj.inform.emit("[success]CNCjob created: %s" % outname)
+                            app_obj.inform.emit("[success] CNCjob created: %s" % outname)
                             app_obj.progress.emit(100)
                             app_obj.progress.emit(100)
 
 
             # Create a promise with the name
             # Create a promise with the name
@@ -4695,7 +4695,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
                 except ValueError:
                 except ValueError:
                     self.app.inform.emit(
                     self.app.inform.emit(
                         _(
                         _(
-                            '[ERROR_NOTCL]Wrong value format for self.defaults["z_pdepth"] or self.options["z_pdepth"]'
+                            '[ERROR_NOTCL] Wrong value format for self.defaults["z_pdepth"] or self.options["z_pdepth"]'
                         ))
                         ))
 
 
             try:
             try:
@@ -4707,7 +4707,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
                 except ValueError:
                 except ValueError:
                     self.app.inform.emit(
                     self.app.inform.emit(
                         _(
                         _(
-                            '[ERROR_NOTCL]Wrong value format for self.defaults["feedrate_probe"] '
+                            '[ERROR_NOTCL] Wrong value format for self.defaults["feedrate_probe"] '
                             'or self.options["feedrate_probe"]'
                             'or self.options["feedrate_probe"]'
                         ))
                         ))
 
 
@@ -4735,7 +4735,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
             def job_thread(app_obj):
             def job_thread(app_obj):
                 with self.app.proc_container.new(_("Generating CNC Code")):
                 with self.app.proc_container.new(_("Generating CNC Code")):
                     app_obj.new_object("cncjob", outname, job_init)
                     app_obj.new_object("cncjob", outname, job_init)
-                    app_obj.inform.emit("[success]CNCjob created: %s" % outname)
+                    app_obj.inform.emit("[success] CNCjob created: %s" % outname)
                     app_obj.progress.emit(100)
                     app_obj.progress.emit(100)
 
 
             # Create a promise with the name
             # Create a promise with the name
@@ -4796,7 +4796,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
         # else:
         # else:
         #     self.solid_geometry = affinity.scale(self.solid_geometry, xfactor, yfactor,
         #     self.solid_geometry = affinity.scale(self.solid_geometry, xfactor, yfactor,
         #                                          origin=(px, py))
         #                                          origin=(px, py))
-        # self.app.inform.emit("[success]Geometry Scale done.")
+        # self.app.inform.emit("[success] Geometry Scale done.")
 
 
         def scale_recursion(geom):
         def scale_recursion(geom):
             if type(geom) == list:
             if type(geom) == list:
@@ -4814,7 +4814,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
             self.solid_geometry=scale_recursion(self.solid_geometry)
             self.solid_geometry=scale_recursion(self.solid_geometry)
 
 
         self.app.inform.emit(_(
         self.app.inform.emit(_(
-            "[success]Geometry Scale done."
+            "[success] Geometry Scale done."
         ))
         ))
 
 
     def offset(self, vect):
     def offset(self, vect):
@@ -4831,7 +4831,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
             dx, dy = vect
             dx, dy = vect
         except TypeError:
         except TypeError:
             self.app.inform.emit(_(
             self.app.inform.emit(_(
-                "[ERROR_NOTCL]An (x,y) pair of values are needed. "
+                "[ERROR_NOTCL] An (x,y) pair of values are needed. "
                 "Probable you entered only one value in the Offset field."
                 "Probable you entered only one value in the Offset field."
             ))
             ))
             return
             return
@@ -4851,7 +4851,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
         else:
         else:
             self.solid_geometry=translate_recursion(self.solid_geometry)
             self.solid_geometry=translate_recursion(self.solid_geometry)
         self.app.inform.emit(_(
         self.app.inform.emit(_(
-            "[success]Geometry Offset done."
+            "[success] Geometry Offset done."
         ))
         ))
 
 
     def convert_units(self, units):
     def convert_units(self, units):
@@ -4920,7 +4920,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
                                 )
                                 )
                             except ValueError:
                             except ValueError:
                                 self.app.inform.emit(_(
                                 self.app.inform.emit(_(
-                                    "[ERROR_NOTCL]Wrong value format entered, "
+                                    "[ERROR_NOTCL] Wrong value format entered, "
                                     "use a number."
                                     "use a number."
                                 ))
                                 ))
                                 return
                                 return
@@ -5407,7 +5407,7 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob):
 
 
         if filename == '':
         if filename == '':
             self.app.inform.emit(_(
             self.app.inform.emit(_(
-                "[WARNING_NOTCL]Export Machine Code cancelled ..."))
+                "[WARNING_NOTCL] Export Machine Code cancelled ..."))
             return
             return
 
 
         preamble = str(self.ui.prepend_text.get_value())
         preamble = str(self.ui.prepend_text.get_value())
@@ -5546,7 +5546,7 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob):
 
 
         try:
         try:
             if self.special_group:
             if self.special_group:
-                self.app.inform.emit(_("[WARNING_NOTCL]This CNCJob object can't be processed because "
+                self.app.inform.emit(_("[WARNING_NOTCL] This CNCJob object can't be processed because "
                                      "it is a %s CNCJob object.") % str(self.special_group))
                                      "it is a %s CNCJob object.") % str(self.special_group))
                 return 'fail'
                 return 'fail'
         except AttributeError:
         except AttributeError:

+ 2 - 0
README.md

@@ -13,6 +13,8 @@ CAD program, and create G-Code for Isolation routing.
 
 
 - About 45% progress in German translation
 - About 45% progress in German translation
 - new feature: added ability to edit MultiGeo geometry (geometry from Paint Tool)
 - new feature: added ability to edit MultiGeo geometry (geometry from Paint Tool)
+- changed all the info messages that are of type warning, error or success so they have a space added after the keyword
+- changed the Romanian translation by adding more diacritics  
 
 
 27.03.2019
 27.03.2019
 
 

+ 11 - 11
camlib.py

@@ -1384,7 +1384,7 @@ class Geometry(object):
                     self.tools[tool]['solid_geometry'] = mirror_geom(self.tools[tool]['solid_geometry'])
                     self.tools[tool]['solid_geometry'] = mirror_geom(self.tools[tool]['solid_geometry'])
             else:
             else:
                 self.solid_geometry = mirror_geom(self.solid_geometry)
                 self.solid_geometry = mirror_geom(self.solid_geometry)
-            self.app.inform.emit(_('[success]Object was mirrored ...'))
+            self.app.inform.emit(_('[success] Object was mirrored ...'))
         except AttributeError:
         except AttributeError:
             self.app.inform.emit(_("[ERROR_NOTCL] Failed to mirror. No object selected"))
             self.app.inform.emit(_("[ERROR_NOTCL] Failed to mirror. No object selected"))
 
 
@@ -1422,7 +1422,7 @@ class Geometry(object):
                     self.tools[tool]['solid_geometry'] = rotate_geom(self.tools[tool]['solid_geometry'])
                     self.tools[tool]['solid_geometry'] = rotate_geom(self.tools[tool]['solid_geometry'])
             else:
             else:
                 self.solid_geometry = rotate_geom(self.solid_geometry)
                 self.solid_geometry = rotate_geom(self.solid_geometry)
-            self.app.inform.emit(_('[success]Object was rotated ...'))
+            self.app.inform.emit(_('[success] Object was rotated ...'))
         except AttributeError:
         except AttributeError:
             self.app.inform.emit(_("[ERROR_NOTCL] Failed to rotate. No object selected"))
             self.app.inform.emit(_("[ERROR_NOTCL] Failed to rotate. No object selected"))
 
 
@@ -1458,7 +1458,7 @@ class Geometry(object):
                     self.tools[tool]['solid_geometry'] = skew_geom(self.tools[tool]['solid_geometry'])
                     self.tools[tool]['solid_geometry'] = skew_geom(self.tools[tool]['solid_geometry'])
             else:
             else:
                 self.solid_geometry = skew_geom(self.solid_geometry)
                 self.solid_geometry = skew_geom(self.solid_geometry)
-            self.app.inform.emit(_('[success]Object was skewed ...'))
+            self.app.inform.emit(_('[success] Object was skewed ...'))
         except AttributeError:
         except AttributeError:
             self.app.inform.emit(_("[ERROR_NOTCL] Failed to skew. No object selected"))
             self.app.inform.emit(_("[ERROR_NOTCL] Failed to skew. No object selected"))
 
 
@@ -3264,7 +3264,7 @@ class Gerber (Geometry):
         except Exception as e:
         except Exception as e:
             log.debug('FlatCAMGeometry.scale() --> %s' % str(e))
             log.debug('FlatCAMGeometry.scale() --> %s' % str(e))
 
 
-        self.app.inform.emit(_("[success]Gerber Scale done."))
+        self.app.inform.emit(_("[success] Gerber Scale done."))
 
 
 
 
         ## solid_geometry ???
         ## solid_geometry ???
@@ -3297,7 +3297,7 @@ class Gerber (Geometry):
         try:
         try:
             dx, dy = vect
             dx, dy = vect
         except TypeError:
         except TypeError:
-            self.app.inform.emit(_("[ERROR_NOTCL]An (x,y) pair of values are needed. "
+            self.app.inform.emit(_("[ERROR_NOTCL] An (x,y) pair of values are needed. "
                                  "Probable you entered only one value in the Offset field."))
                                  "Probable you entered only one value in the Offset field."))
             return
             return
 
 
@@ -3321,7 +3321,7 @@ class Gerber (Geometry):
         except Exception as e:
         except Exception as e:
             log.debug('FlatCAMGeometry.offset() --> %s' % str(e))
             log.debug('FlatCAMGeometry.offset() --> %s' % str(e))
 
 
-        self.app.inform.emit(_("[success]Gerber Offset done."))
+        self.app.inform.emit(_("[success] Gerber Offset done."))
 
 
     def mirror(self, axis, point):
     def mirror(self, axis, point):
         """
         """
@@ -5138,7 +5138,7 @@ class CNCjob(Geometry):
                 else:
                 else:
                     log.debug("camlib.CNCJob.generate_from_excellon_by_tool() --> "
                     log.debug("camlib.CNCJob.generate_from_excellon_by_tool() --> "
                               "The loaded Excellon file has no drills ...")
                               "The loaded Excellon file has no drills ...")
-                    self.app.inform.emit(_('[ERROR_NOTCL]The loaded Excellon file has no drills ...'))
+                    self.app.inform.emit(_('[ERROR_NOTCL] The loaded Excellon file has no drills ...'))
                     return 'fail'
                     return 'fail'
 
 
                 log.debug("The total travel distance with OR-TOOLS Metaheuristics is: %s" % str(measured_distance))
                 log.debug("The total travel distance with OR-TOOLS Metaheuristics is: %s" % str(measured_distance))
@@ -5233,7 +5233,7 @@ class CNCjob(Geometry):
                 else:
                 else:
                     log.debug("camlib.CNCJob.generate_from_excellon_by_tool() --> "
                     log.debug("camlib.CNCJob.generate_from_excellon_by_tool() --> "
                               "The loaded Excellon file has no drills ...")
                               "The loaded Excellon file has no drills ...")
-                    self.app.inform.emit(_('[ERROR_NOTCL]The loaded Excellon file has no drills ...'))
+                    self.app.inform.emit(_('[ERROR_NOTCL] The loaded Excellon file has no drills ...'))
                     return 'fail'
                     return 'fail'
 
 
                 log.debug("The total travel distance with OR-TOOLS Basic Algorithm is: %s" % str(measured_distance))
                 log.debug("The total travel distance with OR-TOOLS Basic Algorithm is: %s" % str(measured_distance))
@@ -5284,7 +5284,7 @@ class CNCjob(Geometry):
                     else:
                     else:
                         log.debug("camlib.CNCJob.generate_from_excellon_by_tool() --> "
                         log.debug("camlib.CNCJob.generate_from_excellon_by_tool() --> "
                                   "The loaded Excellon file has no drills ...")
                                   "The loaded Excellon file has no drills ...")
-                        self.app.inform.emit(_('[ERROR_NOTCL]The loaded Excellon file has no drills ...'))
+                        self.app.inform.emit(_('[ERROR_NOTCL] The loaded Excellon file has no drills ...'))
                         return 'fail'
                         return 'fail'
             log.debug("The total travel distance with Travelling Salesman Algorithm is: %s" % str(measured_distance))
             log.debug("The total travel distance with Travelling Salesman Algorithm is: %s" % str(measured_distance))
 
 
@@ -5547,7 +5547,7 @@ class CNCjob(Geometry):
 
 
         # if solid_geometry is empty raise an exception
         # if solid_geometry is empty raise an exception
         if not geometry.solid_geometry:
         if not geometry.solid_geometry:
-            self.app.inform.emit(_("[ERROR_NOTCL]Trying to generate a CNC Job "
+            self.app.inform.emit(_("[ERROR_NOTCL] Trying to generate a CNC Job "
                                  "from a Geometry object without solid_geometry."))
                                  "from a Geometry object without solid_geometry."))
 
 
         temp_solid_geometry = []
         temp_solid_geometry = []
@@ -5586,7 +5586,7 @@ class CNCjob(Geometry):
                 # if the offset is less than half of the total length or less than half of the total width of the
                 # if the offset is less than half of the total length or less than half of the total width of the
                 # solid geometry it's obvious we can't do the offset
                 # solid geometry it's obvious we can't do the offset
                 if -offset > ((c - a) / 2) or -offset > ((d - b) / 2):
                 if -offset > ((c - a) / 2) or -offset > ((d - b) / 2):
-                    self.app.inform.emit(_("[ERROR_NOTCL]The Tool Offset value is too negative to use "
+                    self.app.inform.emit(_("[ERROR_NOTCL] The Tool Offset value is too negative to use "
                                          "for the current_geometry.\n"
                                          "for the current_geometry.\n"
                                          "Raise the value (in module) and try again."))
                                          "Raise the value (in module) and try again."))
                     return 'fail'
                     return 'fail'

+ 8 - 8
flatcamGUI/FlatCAMGUI.py

@@ -2128,7 +2128,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
 
 
                             if self.app.geo_editor.active_tool.complete:
                             if self.app.geo_editor.active_tool.complete:
                                 self.app.geo_editor.on_shape_complete()
                                 self.app.geo_editor.on_shape_complete()
-                                self.app.inform.emit(_("[success]Done."))
+                                self.app.inform.emit(_("[success] Done."))
                             # automatically make the selection tool active after completing current action
                             # automatically make the selection tool active after completing current action
                             self.app.geo_editor.select_tool('select')
                             self.app.geo_editor.select_tool('select')
                             return
                             return
@@ -2140,7 +2140,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
 
 
                             if self.app.geo_editor.active_tool.complete:
                             if self.app.geo_editor.active_tool.complete:
                                 self.app.geo_editor.on_shape_complete()
                                 self.app.geo_editor.on_shape_complete()
-                                self.app.inform.emit(_("[success]Done."))
+                                self.app.inform.emit(_("[success] Done."))
                             # automatically make the selection tool active after completing current action
                             # automatically make the selection tool active after completing current action
                             self.app.geo_editor.select_tool('select')
                             self.app.geo_editor.select_tool('select')
 
 
@@ -2148,7 +2148,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
                 if key == QtCore.Qt.Key_Escape or key == 'Escape':
                 if key == QtCore.Qt.Key_Escape or key == 'Escape':
                     # TODO: ...?
                     # TODO: ...?
                     # self.on_tool_select("select")
                     # self.on_tool_select("select")
-                    self.app.inform.emit(_("[WARNING_NOTCL]Cancelled."))
+                    self.app.inform.emit(_("[WARNING_NOTCL] Cancelled."))
 
 
                     self.app.geo_editor.delete_utility_geometry()
                     self.app.geo_editor.delete_utility_geometry()
 
 
@@ -2342,7 +2342,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
                 if key == QtCore.Qt.Key_Escape or key == 'Escape':
                 if key == QtCore.Qt.Key_Escape or key == 'Escape':
                     # TODO: ...?
                     # TODO: ...?
                     # self.on_tool_select("select")
                     # self.on_tool_select("select")
-                    self.app.inform.emit(_("[WARNING_NOTCL]Cancelled."))
+                    self.app.inform.emit(_("[WARNING_NOTCL] Cancelled."))
 
 
                     self.app.exc_editor.delete_utility_geometry()
                     self.app.exc_editor.delete_utility_geometry()
 
 
@@ -2359,7 +2359,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
                         self.app.exc_editor.delete_selected()
                         self.app.exc_editor.delete_selected()
                         self.app.exc_editor.replot()
                         self.app.exc_editor.replot()
                     else:
                     else:
-                        self.app.inform.emit(_("[WARNING_NOTCL]Cancelled. Nothing selected to delete."))
+                        self.app.inform.emit(_("[WARNING_NOTCL] Cancelled. Nothing selected to delete."))
                     return
                     return
 
 
                 # Delete tools in tools table if delete key event comes from the Selected Tab
                 # Delete tools in tools table if delete key event comes from the Selected Tab
@@ -2426,7 +2426,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
                         self.app.exc_editor.active_tool.set_origin(
                         self.app.exc_editor.active_tool.set_origin(
                             (self.app.exc_editor.snap_x, self.app.exc_editor.snap_y))
                             (self.app.exc_editor.snap_x, self.app.exc_editor.snap_y))
                     else:
                     else:
-                        self.app.inform.emit(_("[WARNING_NOTCL]Cancelled. Nothing selected to copy."))
+                        self.app.inform.emit(_("[WARNING_NOTCL] Cancelled. Nothing selected to copy."))
                     return
                     return
 
 
                 # Add Drill Hole Tool
                 # Add Drill Hole Tool
@@ -2472,7 +2472,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
                         self.app.exc_editor.active_tool.set_origin(
                         self.app.exc_editor.active_tool.set_origin(
                             (self.app.exc_editor.snap_x, self.app.exc_editor.snap_y))
                             (self.app.exc_editor.snap_x, self.app.exc_editor.snap_y))
                     else:
                     else:
-                        self.app.inform.emit(_("[WARNING_NOTCL]Cancelled. Nothing selected to move."))
+                        self.app.inform.emit(_("[WARNING_NOTCL] Cancelled. Nothing selected to move."))
                     return
                     return
 
 
                 # Resize Tool
                 # Resize Tool
@@ -2495,7 +2495,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
                     if ok:
                     if ok:
                         self.app.exc_editor.on_tool_add(tooldia=val)
                         self.app.exc_editor.on_tool_add(tooldia=val)
                         self.app.inform.emit(
                         self.app.inform.emit(
-                            _("[success]Added new tool with dia: {dia} {units}").format(dia='%.4f' % float(val), units=str(self.units)))
+                            _("[success] Added new tool with dia: {dia} {units}").format(dia='%.4f' % float(val), units=str(self.units)))
                     else:
                     else:
                         self.app.inform.emit(
                         self.app.inform.emit(
                             _("[WARNING_NOTCL] Adding Tool cancelled ..."))
                             _("[WARNING_NOTCL] Adding Tool cancelled ..."))

+ 9 - 9
flatcamTools/ToolCalculators.py

@@ -304,7 +304,7 @@ class ToolCalculator(FlatCAMTool):
             try:
             try:
                 tip_diameter = float(self.tipDia_entry.get_value().replace(',', '.'))
                 tip_diameter = float(self.tipDia_entry.get_value().replace(',', '.'))
             except ValueError:
             except ValueError:
-                self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
+                self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, "
                                      "use a number."))
                                      "use a number."))
                 return
                 return
 
 
@@ -315,7 +315,7 @@ class ToolCalculator(FlatCAMTool):
             try:
             try:
                 half_tip_angle = float(self.tipAngle_entry.get_value().replace(',', '.'))
                 half_tip_angle = float(self.tipAngle_entry.get_value().replace(',', '.'))
             except ValueError:
             except ValueError:
-                self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
+                self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, "
                                      "use a number."))
                                      "use a number."))
                 return
                 return
         half_tip_angle /= 2
         half_tip_angle /= 2
@@ -327,7 +327,7 @@ class ToolCalculator(FlatCAMTool):
             try:
             try:
                 cut_depth = float(self.cutDepth_entry.get_value().replace(',', '.'))
                 cut_depth = float(self.cutDepth_entry.get_value().replace(',', '.'))
             except ValueError:
             except ValueError:
-                self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
+                self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, "
                                      "use a number."))
                                      "use a number."))
                 return
                 return
 
 
@@ -342,7 +342,7 @@ class ToolCalculator(FlatCAMTool):
             try:
             try:
                 mm_val = float(self.mm_entry.get_value().replace(',', '.'))
                 mm_val = float(self.mm_entry.get_value().replace(',', '.'))
             except ValueError:
             except ValueError:
-                self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
+                self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, "
                                      "use a number."))
                                      "use a number."))
                 return
                 return
         self.inch_entry.set_value('%.6f' % (mm_val / 25.4))
         self.inch_entry.set_value('%.6f' % (mm_val / 25.4))
@@ -355,7 +355,7 @@ class ToolCalculator(FlatCAMTool):
             try:
             try:
                 inch_val = float(self.inch_entry.get_value().replace(',', '.'))
                 inch_val = float(self.inch_entry.get_value().replace(',', '.'))
             except ValueError:
             except ValueError:
-                self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
+                self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, "
                                      "use a number."))
                                      "use a number."))
                 return
                 return
         self.mm_entry.set_value('%.6f' % (inch_val * 25.4))
         self.mm_entry.set_value('%.6f' % (inch_val * 25.4))
@@ -369,7 +369,7 @@ class ToolCalculator(FlatCAMTool):
             try:
             try:
                 length = float(self.pcblength_entry.get_value().replace(',', '.'))
                 length = float(self.pcblength_entry.get_value().replace(',', '.'))
             except ValueError:
             except ValueError:
-                self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
+                self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, "
                                      "use a number."))
                                      "use a number."))
                 return
                 return
 
 
@@ -380,7 +380,7 @@ class ToolCalculator(FlatCAMTool):
             try:
             try:
                 width = float(self.pcbwidth_entry.get_value().replace(',', '.'))
                 width = float(self.pcbwidth_entry.get_value().replace(',', '.'))
             except ValueError:
             except ValueError:
-                self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
+                self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, "
                                      "use a number."))
                                      "use a number."))
                 return
                 return
 
 
@@ -391,7 +391,7 @@ class ToolCalculator(FlatCAMTool):
             try:
             try:
                 density = float(self.cdensity_entry.get_value().replace(',', '.'))
                 density = float(self.cdensity_entry.get_value().replace(',', '.'))
             except ValueError:
             except ValueError:
-                self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
+                self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, "
                                      "use a number."))
                                      "use a number."))
                 return
                 return
 
 
@@ -402,7 +402,7 @@ class ToolCalculator(FlatCAMTool):
             try:
             try:
                 copper = float(self.growth_entry.get_value().replace(',', '.'))
                 copper = float(self.growth_entry.get_value().replace(',', '.'))
             except ValueError:
             except ValueError:
-                self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
+                self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, "
                                      "use a number."))
                                      "use a number."))
                 return
                 return
 
 

+ 17 - 17
flatcamTools/ToolCutOut.py

@@ -326,11 +326,11 @@ class CutOut(FlatCAMTool):
         try:
         try:
             cutout_obj = self.app.collection.get_by_name(str(name))
             cutout_obj = self.app.collection.get_by_name(str(name))
         except:
         except:
-            self.app.inform.emit(_("[ERROR_NOTCL]Could not retrieve object: %s") % name)
+            self.app.inform.emit(_("[ERROR_NOTCL] Could not retrieve object: %s") % name)
             return "Could not retrieve object: %s" % name
             return "Could not retrieve object: %s" % name
 
 
         if cutout_obj is None:
         if cutout_obj is None:
-            self.app.inform.emit(_("[ERROR_NOTCL]There is no object selected for Cutout.\nSelect one and try again."))
+            self.app.inform.emit(_("[ERROR_NOTCL] There is no object selected for Cutout.\nSelect one and try again."))
             return
             return
 
 
         try:
         try:
@@ -346,8 +346,8 @@ class CutOut(FlatCAMTool):
 
 
 
 
         if 0 in {dia}:
         if 0 in {dia}:
-            self.app.inform.emit(_("[WARNING_NOTCL]Tool Diameter is zero value. Change it to a positive integer."))
-            return "Tool Diameter is zero value. Change it to a positive integer."
+            self.app.inform.emit(_("[WARNING_NOTCL] Tool Diameter is zero value. Change it to a positive real number."))
+            return "Tool Diameter is zero value. Change it to a positive real number."
 
 
         try:
         try:
             margin = float(self.margin.get_value())
             margin = float(self.margin.get_value())
@@ -465,11 +465,11 @@ class CutOut(FlatCAMTool):
         try:
         try:
             cutout_obj = self.app.collection.get_by_name(str(name))
             cutout_obj = self.app.collection.get_by_name(str(name))
         except:
         except:
-            self.app.inform.emit(_("[ERROR_NOTCL]Could not retrieve object: %s") % name)
+            self.app.inform.emit(_("[ERROR_NOTCL] Could not retrieve object: %s") % name)
             return "Could not retrieve object: %s" % name
             return "Could not retrieve object: %s" % name
 
 
         if cutout_obj is None:
         if cutout_obj is None:
-            self.app.inform.emit(_("[ERROR_NOTCL]Object not found: %s") % cutout_obj)
+            self.app.inform.emit(_("[ERROR_NOTCL] Object not found: %s") % cutout_obj)
 
 
         try:
         try:
             dia = float(self.dia.get_value())
             dia = float(self.dia.get_value())
@@ -483,8 +483,8 @@ class CutOut(FlatCAMTool):
                 return
                 return
 
 
         if 0 in {dia}:
         if 0 in {dia}:
-            self.app.inform.emit(_("[ERROR_NOTCL]Tool Diameter is zero value. Change it to a positive integer."))
-            return "Tool Diameter is zero value. Change it to a positive integer."
+            self.app.inform.emit(_("[ERROR_NOTCL] Tool Diameter is zero value. Change it to a positive real number."))
+            return "Tool Diameter is zero value. Change it to a positive real number."
 
 
         try:
         try:
             margin = float(self.margin.get_value())
             margin = float(self.margin.get_value())
@@ -603,8 +603,8 @@ class CutOut(FlatCAMTool):
                 return
                 return
 
 
         if 0 in {self.cutting_dia}:
         if 0 in {self.cutting_dia}:
-            self.app.inform.emit(_("[ERROR_NOTCL]Tool Diameter is zero value. Change it to a positive integer."))
-            return "Tool Diameter is zero value. Change it to a positive integer."
+            self.app.inform.emit(_("[ERROR_NOTCL] Tool Diameter is zero value. Change it to a positive real number."))
+            return "Tool Diameter is zero value. Change it to a positive real number."
 
 
         try:
         try:
             self.cutting_gapsize = float(self.gapsize.get_value())
             self.cutting_gapsize = float(self.gapsize.get_value())
@@ -652,11 +652,11 @@ class CutOut(FlatCAMTool):
         try:
         try:
             cutout_obj = self.app.collection.get_by_name(str(name))
             cutout_obj = self.app.collection.get_by_name(str(name))
         except:
         except:
-            self.app.inform.emit(_("[ERROR_NOTCL]Could not retrieve Geoemtry object: %s") % name)
+            self.app.inform.emit(_("[ERROR_NOTCL] Could not retrieve Geometry object: %s") % name)
             return "Could not retrieve object: %s" % name
             return "Could not retrieve object: %s" % name
 
 
         if cutout_obj is None:
         if cutout_obj is None:
-            self.app.inform.emit(_("[ERROR_NOTCL]Geometry object for manual cutout not found: %s") % cutout_obj)
+            self.app.inform.emit(_("[ERROR_NOTCL] Geometry object for manual cutout not found: %s") % cutout_obj)
             return
             return
 
 
         # use the snapped position as reference
         # use the snapped position as reference
@@ -683,16 +683,16 @@ class CutOut(FlatCAMTool):
         try:
         try:
             cutout_obj = self.app.collection.get_by_name(str(name))
             cutout_obj = self.app.collection.get_by_name(str(name))
         except:
         except:
-            self.app.inform.emit(_("[ERROR_NOTCL]Could not retrieve Gerber object: %s") % name)
+            self.app.inform.emit(_("[ERROR_NOTCL] Could not retrieve Gerber object: %s") % name)
             return "Could not retrieve object: %s" % name
             return "Could not retrieve object: %s" % name
 
 
         if cutout_obj is None:
         if cutout_obj is None:
-            self.app.inform.emit(_("[ERROR_NOTCL]There is no Gerber object selected for Cutout.\n"
+            self.app.inform.emit(_("[ERROR_NOTCL] There is no Gerber object selected for Cutout.\n"
                                  "Select one and try again."))
                                  "Select one and try again."))
             return
             return
 
 
         if not isinstance(cutout_obj, FlatCAMGerber):
         if not isinstance(cutout_obj, FlatCAMGerber):
-            self.app.inform.emit(_("[ERROR_NOTCL]The selected object has to be of Gerber type.\n"
+            self.app.inform.emit(_("[ERROR_NOTCL] The selected object has to be of Gerber type.\n"
                                  "Select a Gerber file and try again."))
                                  "Select a Gerber file and try again."))
             return
             return
 
 
@@ -708,8 +708,8 @@ class CutOut(FlatCAMTool):
                 return
                 return
 
 
         if 0 in {dia}:
         if 0 in {dia}:
-            self.app.inform.emit(_("[ERROR_NOTCL]Tool Diameter is zero value. Change it to a positive integer."))
-            return "Tool Diameter is zero value. Change it to a positive integer."
+            self.app.inform.emit(_("[ERROR_NOTCL] Tool Diameter is zero value. Change it to a positive real number."))
+            return "Tool Diameter is zero value. Change it to a positive real number."
 
 
         try:
         try:
             margin = float(self.margin.get_value())
             margin = float(self.margin.get_value())

+ 1 - 1
flatcamTools/ToolDblSided.py

@@ -365,7 +365,7 @@ class DblSidedTool(FlatCAMTool):
                 return
                 return
 
 
         if dia is '':
         if dia is '':
-            self.app.inform.emit(_("[WARNING_NOTCL]No value or wrong format in Drill Dia entry. Add it and retry."))
+            self.app.inform.emit(_("[WARNING_NOTCL] No value or wrong format in Drill Dia entry. Add it and retry."))
             return
             return
         tools = {"1": {"C": dia}}
         tools = {"1": {"C": dia}}
 
 

+ 4 - 4
flatcamTools/ToolFilm.py

@@ -238,14 +238,14 @@ class Film(FlatCAMTool):
             try:
             try:
                 border = float(self.boundary_entry.get_value().replace(',', '.'))
                 border = float(self.boundary_entry.get_value().replace(',', '.'))
             except ValueError:
             except ValueError:
-                self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
+                self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, "
                                      "use a number."))
                                      "use a number."))
                 return
                 return
 
 
         try:
         try:
             scale_stroke_width = int(self.film_scale_entry.get_value())
             scale_stroke_width = int(self.film_scale_entry.get_value())
         except ValueError:
         except ValueError:
-            self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
+            self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, "
                                  "use a number."))
                                  "use a number."))
             return
             return
 
 
@@ -266,7 +266,7 @@ class Film(FlatCAMTool):
             filename = str(filename)
             filename = str(filename)
 
 
             if str(filename) == "":
             if str(filename) == "":
-                self.app.inform.emit(_("[WARNING_NOTCL]Export SVG positive cancelled."))
+                self.app.inform.emit(_("[WARNING_NOTCL] Export SVG positive cancelled."))
                 return
                 return
             else:
             else:
                 self.app.export_svg_black(name, boxname, filename, scale_factor=scale_stroke_width)
                 self.app.export_svg_black(name, boxname, filename, scale_factor=scale_stroke_width)
@@ -282,7 +282,7 @@ class Film(FlatCAMTool):
             filename = str(filename)
             filename = str(filename)
 
 
             if str(filename) == "":
             if str(filename) == "":
-                self.app.inform.emit(_("[WARNING_NOTCL]Export SVG negative cancelled."))
+                self.app.inform.emit(_("[WARNING_NOTCL] Export SVG negative cancelled."))
                 return
                 return
             else:
             else:
                 self.app.export_svg_negative(name, boxname, filename, border, scale_factor=scale_stroke_width)
                 self.app.export_svg_negative(name, boxname, filename, border, scale_factor=scale_stroke_width)

+ 3 - 3
flatcamTools/ToolMove.py

@@ -161,7 +161,7 @@ class ToolMove(FlatCAMTool):
                         proc.done()
                         proc.done()
                         # delete the selection bounding box
                         # delete the selection bounding box
                         self.delete_shape()
                         self.delete_shape()
-                        self.app.inform.emit(_('[success]%s object was moved ...') %
+                        self.app.inform.emit(_('[success] %s object was moved ...') %
                                              str(sel_obj.kind).capitalize())
                                              str(sel_obj.kind).capitalize())
 
 
                     self.app.worker_task.emit({'fcn': job_move, 'params': [self]})
                     self.app.worker_task.emit({'fcn': job_move, 'params': [self]})
@@ -199,7 +199,7 @@ class ToolMove(FlatCAMTool):
     def on_key_press(self, event):
     def on_key_press(self, event):
         if event.key == 'escape':
         if event.key == 'escape':
             # abort the move action
             # abort the move action
-            self.app.inform.emit(_("[WARNING_NOTCL]Move action cancelled."))
+            self.app.inform.emit(_("[WARNING_NOTCL] Move action cancelled."))
             self.toggle()
             self.toggle()
         return
         return
 
 
@@ -211,7 +211,7 @@ class ToolMove(FlatCAMTool):
 
 
         obj_list = self.app.collection.get_selected()
         obj_list = self.app.collection.get_selected()
         if not obj_list:
         if not obj_list:
-            self.app.inform.emit(_("[WARNING_NOTCL]Object(s) not selected"))
+            self.app.inform.emit(_("[WARNING_NOTCL] Object(s) not selected"))
             self.toggle()
             self.toggle()
         else:
         else:
             # if we have an object selected then we can safely activate the mouse events
             # if we have an object selected then we can safely activate the mouse events

+ 7 - 7
flatcamTools/ToolNonCopperClear.py

@@ -476,7 +476,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
                 try:
                 try:
                     tool_dia = float(self.addtool_entry.get_value().replace(',', '.'))
                     tool_dia = float(self.addtool_entry.get_value().replace(',', '.'))
                 except ValueError:
                 except ValueError:
-                    self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
+                    self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, "
                                          "use a number."))
                                          "use a number."))
                     return
                     return
             if tool_dia is None:
             if tool_dia is None:
@@ -509,7 +509,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
 
 
         if float('%.4f' % tool_dia) in tool_dias:
         if float('%.4f' % tool_dia) in tool_dias:
             if muted is None:
             if muted is None:
-                self.app.inform.emit(_("[WARNING_NOTCL]Adding tool cancelled. Tool already in Tool Table."))
+                self.app.inform.emit(_("[WARNING_NOTCL] Adding tool cancelled. Tool already in Tool Table."))
             self.tools_table.itemChanged.connect(self.on_tool_edit)
             self.tools_table.itemChanged.connect(self.on_tool_edit)
             return
             return
         else:
         else:
@@ -606,7 +606,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
                     self.ncc_tools.pop(t, None)
                     self.ncc_tools.pop(t, None)
 
 
         except AttributeError:
         except AttributeError:
-            self.app.inform.emit(_("[WARNING_NOTCL]Delete failed. Select a tool to delete."))
+            self.app.inform.emit(_("[WARNING_NOTCL] Delete failed. Select a tool to delete."))
             return
             return
         except Exception as e:
         except Exception as e:
             log.debug(str(e))
             log.debug(str(e))
@@ -623,7 +623,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
             try:
             try:
                 over = float(self.ncc_overlap_entry.get_value().replace(',', '.'))
                 over = float(self.ncc_overlap_entry.get_value().replace(',', '.'))
             except ValueError:
             except ValueError:
-                self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
+                self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, "
                                      "use a number."))
                                      "use a number."))
                 return
                 return
         over = over if over else self.app.defaults["tools_nccoverlap"]
         over = over if over else self.app.defaults["tools_nccoverlap"]
@@ -635,7 +635,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
             try:
             try:
                 margin = float(self.ncc_margin_entry.get_value().replace(',', '.'))
                 margin = float(self.ncc_margin_entry.get_value().replace(',', '.'))
             except ValueError:
             except ValueError:
-                self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
+                self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, "
                                      "use a number."))
                                      "use a number."))
                 return
                 return
         margin = margin if margin else self.app.defaults["tools_nccmargin"]
         margin = margin if margin else self.app.defaults["tools_nccmargin"]
@@ -657,14 +657,14 @@ class NonCopperClear(FlatCAMTool, Gerber):
         try:
         try:
             self.ncc_obj = self.app.collection.get_by_name(self.obj_name)
             self.ncc_obj = self.app.collection.get_by_name(self.obj_name)
         except:
         except:
-            self.app.inform.emit(_("[ERROR_NOTCL]Could not retrieve object: %s") % self.obj_name)
+            self.app.inform.emit(_("[ERROR_NOTCL] Could not retrieve object: %s") % self.obj_name)
             return "Could not retrieve object: %s" % self.obj_name
             return "Could not retrieve object: %s" % self.obj_name
 
 
         # Prepare non-copper polygons
         # Prepare non-copper polygons
         try:
         try:
             bounding_box = self.ncc_obj.solid_geometry.envelope.buffer(distance=margin, join_style=base.JOIN_STYLE.mitre)
             bounding_box = self.ncc_obj.solid_geometry.envelope.buffer(distance=margin, join_style=base.JOIN_STYLE.mitre)
         except AttributeError:
         except AttributeError:
-            self.app.inform.emit(_("[ERROR_NOTCL]No Gerber file available."))
+            self.app.inform.emit(_("[ERROR_NOTCL] No Gerber file available."))
             return
             return
 
 
         # calculate the empty area by subtracting the solid_geometry from the object bounding box geometry
         # calculate the empty area by subtracting the solid_geometry from the object bounding box geometry

+ 13 - 13
flatcamTools/ToolPaint.py

@@ -534,7 +534,7 @@ class ToolPaint(FlatCAMTool, Gerber):
                 try:
                 try:
                     tool_dia = float(self.addtool_entry.get_value().replace(',', '.'))
                     tool_dia = float(self.addtool_entry.get_value().replace(',', '.'))
                 except ValueError:
                 except ValueError:
-                    self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
+                    self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, "
                                          "use a number."))
                                          "use a number."))
                     return
                     return
 
 
@@ -564,7 +564,7 @@ class ToolPaint(FlatCAMTool, Gerber):
 
 
         if float('%.4f' % tool_dia) in tool_dias:
         if float('%.4f' % tool_dia) in tool_dias:
             if muted is None:
             if muted is None:
-                self.app.inform.emit(_("[WARNING_NOTCL]Adding tool cancelled. Tool already in Tool Table."))
+                self.app.inform.emit(_("[WARNING_NOTCL] Adding tool cancelled. Tool already in Tool Table."))
             self.tools_table.itemChanged.connect(self.on_tool_edit)
             self.tools_table.itemChanged.connect(self.on_tool_edit)
             return
             return
         else:
         else:
@@ -604,7 +604,7 @@ class ToolPaint(FlatCAMTool, Gerber):
                 try:
                 try:
                     new_tool_dia = float(self.tools_table.item(row, 1).text().replace(',', '.'))
                     new_tool_dia = float(self.tools_table.item(row, 1).text().replace(',', '.'))
                 except ValueError:
                 except ValueError:
-                    self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
+                    self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, "
                                          "use a number."))
                                          "use a number."))
                     return
                     return
             tooluid = int(self.tools_table.item(row, 3).text())
             tooluid = int(self.tools_table.item(row, 3).text())
@@ -656,7 +656,7 @@ class ToolPaint(FlatCAMTool, Gerber):
     #                         print("COPIED", self.paint_tools[td])
     #                         print("COPIED", self.paint_tools[td])
     #                     self.build_ui()
     #                     self.build_ui()
     #                 except AttributeError:
     #                 except AttributeError:
-    #                     self.app.inform.emit("[WARNING_NOTCL]Failed. Select a tool to copy.")
+    #                     self.app.inform.emit("[WARNING_NOTCL] Failed. Select a tool to copy.")
     #                     self.build_ui()
     #                     self.build_ui()
     #                     return
     #                     return
     #                 except Exception as e:
     #                 except Exception as e:
@@ -664,7 +664,7 @@ class ToolPaint(FlatCAMTool, Gerber):
     #             # deselect the table
     #             # deselect the table
     #             # self.ui.geo_tools_table.clearSelection()
     #             # self.ui.geo_tools_table.clearSelection()
     #         else:
     #         else:
-    #             self.app.inform.emit("[WARNING_NOTCL]Failed. Select a tool to copy.")
+    #             self.app.inform.emit("[WARNING_NOTCL] Failed. Select a tool to copy.")
     #             self.build_ui()
     #             self.build_ui()
     #             return
     #             return
     #     else:
     #     else:
@@ -720,7 +720,7 @@ class ToolPaint(FlatCAMTool, Gerber):
                     self.paint_tools.pop(t, None)
                     self.paint_tools.pop(t, None)
 
 
         except AttributeError:
         except AttributeError:
-            self.app.inform.emit(_("[WARNING_NOTCL]Delete failed. Select a tool to delete."))
+            self.app.inform.emit(_("[WARNING_NOTCL] Delete failed. Select a tool to delete."))
             return
             return
         except Exception as e:
         except Exception as e:
             log.debug(str(e))
             log.debug(str(e))
@@ -732,7 +732,7 @@ class ToolPaint(FlatCAMTool, Gerber):
         self.app.report_usage(_("geometry_on_paint_button"))
         self.app.report_usage(_("geometry_on_paint_button"))
         # self.app.call_source = 'paint'
         # self.app.call_source = 'paint'
 
 
-        self.app.inform.emit(_("[WARNING_NOTCL]Click inside the desired polygon."))
+        self.app.inform.emit(_("[WARNING_NOTCL] Click inside the desired polygon."))
         try:
         try:
             overlap = float(self.paintoverlap_entry.get_value())
             overlap = float(self.paintoverlap_entry.get_value())
         except ValueError:
         except ValueError:
@@ -740,7 +740,7 @@ class ToolPaint(FlatCAMTool, Gerber):
             try:
             try:
                 overlap = float(self.paintoverlap_entry.get_value().replace(',', '.'))
                 overlap = float(self.paintoverlap_entry.get_value().replace(',', '.'))
             except ValueError:
             except ValueError:
-                self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
+                self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, "
                                      "use a number."))
                                      "use a number."))
                 return
                 return
 
 
@@ -754,11 +754,11 @@ class ToolPaint(FlatCAMTool, Gerber):
         try:
         try:
             self.paint_obj = self.app.collection.get_by_name(str(self.obj_name))
             self.paint_obj = self.app.collection.get_by_name(str(self.obj_name))
         except:
         except:
-            self.app.inform.emit(_("[ERROR_NOTCL]Could not retrieve object: %s") % self.obj_name)
+            self.app.inform.emit(_("[ERROR_NOTCL] Could not retrieve object: %s") % self.obj_name)
             return
             return
 
 
         if self.paint_obj is None:
         if self.paint_obj is None:
-            self.app.inform.emit(_("[ERROR_NOTCL]Object not found: %s") % self.paint_obj)
+            self.app.inform.emit(_("[ERROR_NOTCL] Object not found: %s") % self.paint_obj)
             return
             return
 
 
         # test if the Geometry Object is multigeo and return Fail if True because
         # test if the Geometry Object is multigeo and return Fail if True because
@@ -777,7 +777,7 @@ class ToolPaint(FlatCAMTool, Gerber):
                                 contour=contour)
                                 contour=contour)
 
 
         if select_method == "single":
         if select_method == "single":
-            self.app.inform.emit(_("[WARNING_NOTCL]Click inside the desired polygon."))
+            self.app.inform.emit(_("[WARNING_NOTCL] Click inside the desired polygon."))
 
 
             # use the first tool in the tool table; get the diameter
             # use the first tool in the tool table; get the diameter
             tooldia = float('%.4f' % float(self.tools_table.item(0, 1).text()))
             tooldia = float('%.4f' % float(self.tools_table.item(0, 1).text()))
@@ -830,7 +830,7 @@ class ToolPaint(FlatCAMTool, Gerber):
             try:
             try:
                 paint_margin = float(self.paintmargin_entry.get_value().replace(',', '.'))
                 paint_margin = float(self.paintmargin_entry.get_value().replace(',', '.'))
             except ValueError:
             except ValueError:
-                self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
+                self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, "
                                      "use a number."))
                                      "use a number."))
                 return
                 return
 
 
@@ -985,7 +985,7 @@ class ToolPaint(FlatCAMTool, Gerber):
             try:
             try:
                 paint_margin = float(self.paintmargin_entry.get_value().replace(',', '.'))
                 paint_margin = float(self.paintmargin_entry.get_value().replace(',', '.'))
             except ValueError:
             except ValueError:
-                self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
+                self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, "
                                      "use a number."))
                                      "use a number."))
                 return
                 return
 
 

+ 12 - 12
flatcamTools/ToolPanelize.py

@@ -290,13 +290,13 @@ class Panelize(FlatCAMTool):
         try:
         try:
             obj = self.app.collection.get_by_name(str(name))
             obj = self.app.collection.get_by_name(str(name))
         except:
         except:
-            self.app.inform.emit(_("[ERROR_NOTCL]Could not retrieve object: %s") % name)
+            self.app.inform.emit(_("[ERROR_NOTCL] Could not retrieve object: %s") % name)
             return "Could not retrieve object: %s" % name
             return "Could not retrieve object: %s" % name
 
 
         panel_obj = obj
         panel_obj = obj
 
 
         if panel_obj is None:
         if panel_obj is None:
-            self.app.inform.emit(_("[ERROR_NOTCL]Object not found: %s") % panel_obj)
+            self.app.inform.emit(_("[ERROR_NOTCL] Object not found: %s") % panel_obj)
             return "Object not found: %s" % panel_obj
             return "Object not found: %s" % panel_obj
 
 
         boxname = self.box_combo.currentText()
         boxname = self.box_combo.currentText()
@@ -304,7 +304,7 @@ class Panelize(FlatCAMTool):
         try:
         try:
             box = self.app.collection.get_by_name(boxname)
             box = self.app.collection.get_by_name(boxname)
         except:
         except:
-            self.app.inform.emit(_("[ERROR_NOTCL]Could not retrieve object: %s") % boxname)
+            self.app.inform.emit(_("[ERROR_NOTCL] Could not retrieve object: %s") % boxname)
             return "Could not retrieve object: %s" % boxname
             return "Could not retrieve object: %s" % boxname
 
 
         if box is None:
         if box is None:
@@ -320,7 +320,7 @@ class Panelize(FlatCAMTool):
             try:
             try:
                 spacing_columns = float(self.spacing_columns.get_value().replace(',', '.'))
                 spacing_columns = float(self.spacing_columns.get_value().replace(',', '.'))
             except ValueError:
             except ValueError:
-                self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
+                self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, "
                                      "use a number."))
                                      "use a number."))
                 return
                 return
         spacing_columns = spacing_columns if spacing_columns is not None else 0
         spacing_columns = spacing_columns if spacing_columns is not None else 0
@@ -332,7 +332,7 @@ class Panelize(FlatCAMTool):
             try:
             try:
                 spacing_rows = float(self.spacing_rows.get_value().replace(',', '.'))
                 spacing_rows = float(self.spacing_rows.get_value().replace(',', '.'))
             except ValueError:
             except ValueError:
-                self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
+                self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, "
                                      "use a number."))
                                      "use a number."))
                 return
                 return
         spacing_rows = spacing_rows if spacing_rows is not None else 0
         spacing_rows = spacing_rows if spacing_rows is not None else 0
@@ -345,7 +345,7 @@ class Panelize(FlatCAMTool):
                 rows = float(self.rows.get_value().replace(',', '.'))
                 rows = float(self.rows.get_value().replace(',', '.'))
                 rows = int(rows)
                 rows = int(rows)
             except ValueError:
             except ValueError:
-                self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
+                self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, "
                                      "use a number."))
                                      "use a number."))
                 return
                 return
         rows = rows if rows is not None else 1
         rows = rows if rows is not None else 1
@@ -358,7 +358,7 @@ class Panelize(FlatCAMTool):
                 columns = float(self.columns.get_value().replace(',', '.'))
                 columns = float(self.columns.get_value().replace(',', '.'))
                 columns = int(columns)
                 columns = int(columns)
             except ValueError:
             except ValueError:
-                self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
+                self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, "
                                      "use a number."))
                                      "use a number."))
                 return
                 return
         columns = columns if columns is not None else 1
         columns = columns if columns is not None else 1
@@ -370,7 +370,7 @@ class Panelize(FlatCAMTool):
             try:
             try:
                 constrain_dx = float(self.x_width_entry.get_value().replace(',', '.'))
                 constrain_dx = float(self.x_width_entry.get_value().replace(',', '.'))
             except ValueError:
             except ValueError:
-                self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
+                self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, "
                                      "use a number."))
                                      "use a number."))
                 return
                 return
 
 
@@ -381,7 +381,7 @@ class Panelize(FlatCAMTool):
             try:
             try:
                 constrain_dy = float(self.y_height_entry.get_value().replace(',', '.'))
                 constrain_dy = float(self.y_height_entry.get_value().replace(',', '.'))
             except ValueError:
             except ValueError:
-                self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
+                self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, "
                                      "use a number."))
                                      "use a number."))
                 return
                 return
 
 
@@ -389,7 +389,7 @@ class Panelize(FlatCAMTool):
 
 
 
 
         if 0 in {columns, rows}:
         if 0 in {columns, rows}:
-            self.app.inform.emit(_("[ERROR_NOTCL]Columns or Rows are zero value. Change them to a positive integer."))
+            self.app.inform.emit(_("[ERROR_NOTCL] Columns or Rows are zero value. Change them to a positive integer."))
             return "Columns or Rows are zero value. Change them to a positive integer."
             return "Columns or Rows are zero value. Change them to a positive integer."
 
 
         xmin, ymin, xmax, ymax = box.bounds()
         xmin, ymin, xmax, ymax = box.bounds()
@@ -517,7 +517,7 @@ class Panelize(FlatCAMTool):
                                         plot=True, autoselected=True)
                                         plot=True, autoselected=True)
 
 
         if self.constrain_flag is False:
         if self.constrain_flag is False:
-            self.app.inform.emit(_("[success]Panel done..."))
+            self.app.inform.emit(_("[success] Panel done..."))
         else:
         else:
             self.constrain_flag = False
             self.constrain_flag = False
             self.app.inform.emit(_("[WARNING] Too big for the constrain area. Final panel has {col} columns and {row} rows").format(
             self.app.inform.emit(_("[WARNING] Too big for the constrain area. Final panel has {col} columns and {row} rows").format(
@@ -528,7 +528,7 @@ class Panelize(FlatCAMTool):
         def job_thread(app_obj):
         def job_thread(app_obj):
             try:
             try:
                 panelize_2()
                 panelize_2()
-                self.app.inform.emit(_("[success]Panel created successfully."))
+                self.app.inform.emit(_("[success] Panel created successfully."))
             except Exception as e:
             except Exception as e:
                 proc.done()
                 proc.done()
                 log.debug(str(e))
                 log.debug(str(e))

+ 2 - 2
flatcamTools/ToolSolderPaste.py

@@ -752,7 +752,7 @@ class SolderPaste(FlatCAMTool):
                 try:
                 try:
                     tool_dia = float(self.addtool_entry.get_value().replace(',', '.'))
                     tool_dia = float(self.addtool_entry.get_value().replace(',', '.'))
                 except ValueError:
                 except ValueError:
-                    self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
+                    self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, "
                                          "use a number."))
                                          "use a number."))
                     return
                     return
             if tool_dia is None:
             if tool_dia is None:
@@ -823,7 +823,7 @@ class SolderPaste(FlatCAMTool):
                 try:
                 try:
                     new_tool_dia = float(self.tools_table.item(row, 1).text().replace(',', '.'))
                     new_tool_dia = float(self.tools_table.item(row, 1).text().replace(',', '.'))
                 except ValueError:
                 except ValueError:
-                    self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
+                    self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, "
                                          "use a number."))
                                          "use a number."))
                     return
                     return
 
 

+ 12 - 12
flatcamTools/ToolTransform.py

@@ -465,7 +465,7 @@ class ToolTransform(FlatCAMTool):
             try:
             try:
                 value = float(self.rotate_entry.get_value().replace(',', '.'))
                 value = float(self.rotate_entry.get_value().replace(',', '.'))
             except ValueError:
             except ValueError:
-                self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered for Rotate, "
+                self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered for Rotate, "
                                      "use a number."))
                                      "use a number."))
                 return
                 return
         self.app.worker_task.emit({'fcn': self.on_rotate_action,
         self.app.worker_task.emit({'fcn': self.on_rotate_action,
@@ -499,7 +499,7 @@ class ToolTransform(FlatCAMTool):
             try:
             try:
                 value = float(self.skewx_entry.get_value().replace(',', '.'))
                 value = float(self.skewx_entry.get_value().replace(',', '.'))
             except ValueError:
             except ValueError:
-                self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered for Skew X, "
+                self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered for Skew X, "
                                      "use a number."))
                                      "use a number."))
                 return
                 return
 
 
@@ -517,7 +517,7 @@ class ToolTransform(FlatCAMTool):
             try:
             try:
                 value = float(self.skewy_entry.get_value().replace(',', '.'))
                 value = float(self.skewy_entry.get_value().replace(',', '.'))
             except ValueError:
             except ValueError:
-                self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered for Skew Y, "
+                self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered for Skew Y, "
                                      "use a number."))
                                      "use a number."))
                 return
                 return
 
 
@@ -535,7 +535,7 @@ class ToolTransform(FlatCAMTool):
             try:
             try:
                 xvalue = float(self.scalex_entry.get_value().replace(',', '.'))
                 xvalue = float(self.scalex_entry.get_value().replace(',', '.'))
             except ValueError:
             except ValueError:
-                self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered for Scale X, "
+                self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered for Scale X, "
                                      "use a number."))
                                      "use a number."))
                 return
                 return
 
 
@@ -569,7 +569,7 @@ class ToolTransform(FlatCAMTool):
             try:
             try:
                 yvalue = float(self.scaley_entry.get_value().replace(',', '.'))
                 yvalue = float(self.scaley_entry.get_value().replace(',', '.'))
             except ValueError:
             except ValueError:
-                self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered for Scale Y, "
+                self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered for Scale Y, "
                                      "use a number."))
                                      "use a number."))
                 return
                 return
 
 
@@ -598,7 +598,7 @@ class ToolTransform(FlatCAMTool):
             try:
             try:
                 value = float(self.offx_entry.get_value().replace(',', '.'))
                 value = float(self.offx_entry.get_value().replace(',', '.'))
             except ValueError:
             except ValueError:
-                self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered for Offset X, "
+                self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered for Offset X, "
                                      "use a number."))
                                      "use a number."))
                 return
                 return
 
 
@@ -616,7 +616,7 @@ class ToolTransform(FlatCAMTool):
             try:
             try:
                 value = float(self.offy_entry.get_value().replace(',', '.'))
                 value = float(self.offy_entry.get_value().replace(',', '.'))
             except ValueError:
             except ValueError:
-                self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered for Offset Y, "
+                self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered for Offset Y, "
                                      "use a number."))
                                      "use a number."))
                 return
                 return
 
 
@@ -671,7 +671,7 @@ class ToolTransform(FlatCAMTool):
                         # add information to the object that it was changed and how much
                         # add information to the object that it was changed and how much
                         sel_obj.options['rotate'] = num
                         sel_obj.options['rotate'] = num
 
 
-                    self.app.inform.emit(_('[success]Rotate done ...'))
+                    self.app.inform.emit(_('[success] Rotate done ...'))
                     self.app.progress.emit(100)
                     self.app.progress.emit(100)
 
 
                 except Exception as e:
                 except Exception as e:
@@ -732,7 +732,7 @@ class ToolTransform(FlatCAMTool):
                                 else:
                                 else:
                                     obj.options['mirror_y'] = True
                                     obj.options['mirror_y'] = True
                                 obj.plot()
                                 obj.plot()
-                                self.app.inform.emit(_('[success]Flip on the Y axis done ...'))
+                                self.app.inform.emit(_('[success] Flip on the Y axis done ...'))
                             elif axis is 'Y':
                             elif axis is 'Y':
                                 obj.mirror('Y', (px, py))
                                 obj.mirror('Y', (px, py))
                                 # add information to the object that it was changed and how much
                                 # add information to the object that it was changed and how much
@@ -742,7 +742,7 @@ class ToolTransform(FlatCAMTool):
                                 else:
                                 else:
                                     obj.options['mirror_x'] = True
                                     obj.options['mirror_x'] = True
                                 obj.plot()
                                 obj.plot()
-                                self.app.inform.emit(_('[success]Flip on the X axis done ...'))
+                                self.app.inform.emit(_('[success] Flip on the X axis done ...'))
                             self.app.object_changed.emit(obj)
                             self.app.object_changed.emit(obj)
                     self.app.progress.emit(100)
                     self.app.progress.emit(100)
 
 
@@ -790,7 +790,7 @@ class ToolTransform(FlatCAMTool):
                                 obj.options['skew_y'] = num
                                 obj.options['skew_y'] = num
                             obj.plot()
                             obj.plot()
                             self.app.object_changed.emit(obj)
                             self.app.object_changed.emit(obj)
-                    self.app.inform.emit(_('[success]Skew on the %s axis done ...') % str(axis))
+                    self.app.inform.emit(_('[success] Skew on the %s axis done ...') % str(axis))
                     self.app.progress.emit(100)
                     self.app.progress.emit(100)
 
 
                 except Exception as e:
                 except Exception as e:
@@ -891,7 +891,7 @@ class ToolTransform(FlatCAMTool):
                                 obj.options['offset_y'] = num
                                 obj.options['offset_y'] = num
                             obj.plot()
                             obj.plot()
                             self.app.object_changed.emit(obj)
                             self.app.object_changed.emit(obj)
-                    self.app.inform.emit(_('[success]Offset on the %s axis done ...') % str(axis))
+                    self.app.inform.emit(_('[success] Offset on the %s axis done ...') % str(axis))
                     self.app.progress.emit(100)
                     self.app.progress.emit(100)
 
 
                 except Exception as e:
                 except Exception as e:

BIN
locale/de/LC_MESSAGES/strings.mo


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 210 - 207
locale/de/LC_MESSAGES/strings.po


BIN
locale/ro/LC_MESSAGES/strings.mo


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 212 - 215
locale/ro/LC_MESSAGES/strings.po


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 211 - 218
locale_template/strings.pot


+ 1 - 1
tclCommands/TclCommandCutout.py

@@ -121,6 +121,6 @@ class TclCommandCutout(TclCommand):
 
 
         try:
         try:
             obj.app.new_object("geometry", name + "_cutout", geo_init_me)
             obj.app.new_object("geometry", name + "_cutout", geo_init_me)
-            self.app.inform.emit("[success]Rectangular-form Cutout operation finished.")
+            self.app.inform.emit("[success] Rectangular-form Cutout operation finished.")
         except Exception as e:
         except Exception as e:
             return "Operation failed: %s" % str(e)
             return "Operation failed: %s" % str(e)

+ 3 - 3
tclCommands/TclCommandGeoCutout.py

@@ -155,8 +155,8 @@ class TclCommandGeoCutout(TclCommandSignaled):
             return "Could not retrieve object: %s" % name
             return "Could not retrieve object: %s" % name
 
 
         if 0 in {dia}:
         if 0 in {dia}:
-            self.app.inform.emit("[WARNING]Tool Diameter is zero value. Change it to a positive integer.")
-            return "Tool Diameter is zero value. Change it to a positive integer."
+            self.app.inform.emit("[WARNING]Tool Diameter is zero value. Change it to a positive real number.")
+            return "Tool Diameter is zero value. Change it to a positive real number."
 
 
         if gaps not in ['lr', 'tb', '2lr', '2tb', 4, 8]:
         if gaps not in ['lr', 'tb', '2lr', '2tb', 4, 8]:
             self.app.inform.emit("[WARNING]Gaps value can be only one of: 'lr', 'tb', '2lr', '2tb', 4 or 8. "
             self.app.inform.emit("[WARNING]Gaps value can be only one of: 'lr', 'tb', '2lr', '2tb', 4 or 8. "
@@ -220,7 +220,7 @@ class TclCommandGeoCutout(TclCommandSignaled):
                                    ymax + gapsize)
                                    ymax + gapsize)
 
 
             cutout_obj.plot()
             cutout_obj.plot()
-            self.app.inform.emit("[success]Any-form Cutout operation finished.")
+            self.app.inform.emit("[success] Any-form Cutout operation finished.")
         elif isinstance(cutout_obj, FlatCAMGerber):
         elif isinstance(cutout_obj, FlatCAMGerber):
 
 
             def geo_init(geo_obj, app_obj):
             def geo_init(geo_obj, app_obj):

+ 1 - 1
tclCommands/TclCommandOpenGerber.py

@@ -89,4 +89,4 @@ class TclCommandOpenGerber(TclCommandSignaled):
             self.app.progress.emit(100)
             self.app.progress.emit(100)
 
 
             # GUI feedback
             # GUI feedback
-            self.app.inform.emit("[success]Opened: " + filename)
+            self.app.inform.emit("[success] Opened: " + filename)

+ 2 - 2
tclCommands/TclCommandPanelize.py

@@ -276,7 +276,7 @@ class TclCommandPanelize(TclCommand):
             def job_thread(app_obj):
             def job_thread(app_obj):
                 try:
                 try:
                     panelize_2()
                     panelize_2()
-                    self.app.inform.emit("[success]Panel created successfully.")
+                    self.app.inform.emit("[success] Panel created successfully.")
                 except Exception as e:
                 except Exception as e:
                     proc.done()
                     proc.done()
                     log.debug(str(e))
                     log.debug(str(e))
@@ -287,4 +287,4 @@ class TclCommandPanelize(TclCommand):
             self.app.worker_task.emit({'fcn': job_thread, 'params': [self.app]})
             self.app.worker_task.emit({'fcn': job_thread, 'params': [self.app]})
         else:
         else:
             panelize_2()
             panelize_2()
-            self.app.inform.emit("[success]Panel created successfully.")
+            self.app.inform.emit("[success] Panel created successfully.")

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott