- renamed classes to have shorter names and grouped

tclCommands/TclCommand.py

@@ -1,6 +1,6 @@
 import sys
 import re
-import FlatCAMApp
+import App
 import abc
 import collections
 from PyQt5 import QtCore
@@ -53,7 +53,7 @@ class TclCommand(object):
         if self.app is None:
             raise TypeError('Expected app to be FlatCAMApp instance.')
 
-        if not isinstance(self.app, FlatCAMApp.App):
+        if not isinstance(self.app, App.App):
             raise TypeError('Expected FlatCAMApp, got %s.' % type(app))
 
         self.log = self.app.log

tclCommands/TclCommandBbox.py

@@ -4,7 +4,7 @@ from tclCommands.TclCommand import TclCommand
 from shapely.ops import cascaded_union
 
 import gettext
-import FlatCAMTranslation as fcTranslate
+import AppTranslation as fcTranslate
 import builtins
 
 fcTranslate.apply_language('strings')

tclCommands/TclCommandBounds.py

@@ -3,7 +3,7 @@ import collections
 import logging
 
 import gettext
-import FlatCAMTranslation as fcTranslate
+import AppTranslation as fcTranslate
 import builtins
 
 fcTranslate.apply_language('strings')

tclCommands/TclCommandCopperClear.py

@@ -4,7 +4,7 @@ import collections
 import logging
 
 import gettext
-import FlatCAMTranslation as fcTranslate
+import AppTranslation as fcTranslate
 import builtins
 
 fcTranslate.apply_language('strings')

tclCommands/TclCommandDrillcncjob.py

@@ -4,7 +4,7 @@ import collections
 import math
 
 import gettext
-import FlatCAMTranslation as fcTranslate
+import AppTranslation as fcTranslate
 import builtins
 
 fcTranslate.apply_language('strings')

tclCommands/TclCommandGeoCutout.py

@@ -7,7 +7,7 @@ from shapely.ops import cascaded_union
 from shapely.geometry import Polygon, LineString, LinearRing
 
 import gettext
-import FlatCAMTranslation as fcTranslate
+import AppTranslation as fcTranslate
 import builtins
 
 log = logging.getLogger('base')

tclCommands/TclCommandGetNames.py

@@ -5,7 +5,7 @@ import collections
 
 class TclCommandGetNames(TclCommand):
     """
-    Tcl shell command to set an object as active in the GUI.
+    Tcl shell command to set an object as active in the AppGUI.
 
     example:
 

tclCommands/TclCommandGetPath.py

@@ -11,7 +11,7 @@ import collections
 import os
 import logging
 import gettext
-import FlatCAMTranslation as fcTranslate
+import AppTranslation as fcTranslate
 import builtins
 
 fcTranslate.apply_language('strings')

tclCommands/TclCommandHelp.py

@@ -11,7 +11,7 @@ from tclCommands.TclCommand import TclCommand
 import collections
 
 import gettext
-import FlatCAMTranslation as fcTranslate
+import AppTranslation as fcTranslate
 import builtins
 
 fcTranslate.apply_language('strings')

tclCommands/TclCommandImportSvg.py

@@ -81,5 +81,5 @@ class TclCommandImportSvg(TclCommandSignaled):
             # Register recent file
             self.app.file_opened.emit("svg", filename)
 
-            # GUI feedback
+            # AppGUI feedback
             self.app.inform.emit("Opened: " + filename)

tclCommands/TclCommandJoinExcellon.py

@@ -1,5 +1,5 @@
 from tclCommands.TclCommand import TclCommand
-from flatcamObjects.FlatCAMExcellon import ExcellonObject
+from AppObjects.FlatCAMExcellon import ExcellonObject
 
 import collections
 

tclCommands/TclCommandJoinGeometry.py

@@ -1,5 +1,5 @@
 from tclCommands.TclCommand import TclCommand
-from flatcamObjects.FlatCAMGeometry import GeometryObject
+from AppObjects.FlatCAMGeometry import GeometryObject
 
 import collections
 

tclCommands/TclCommandNregions.py

@@ -5,7 +5,7 @@ from shapely.ops import cascaded_union
 import collections
 
 import gettext
-import FlatCAMTranslation as fcTranslate
+import AppTranslation as fcTranslate
 import builtins
 
 fcTranslate.apply_language('strings')

tclCommands/TclCommandOpenDXF.py

@@ -90,5 +90,5 @@ class TclCommandOpenDXF(TclCommandSignaled):
             # Register recent file
             self.app.file_opened.emit("dxf", filename)
 
-            # GUI feedback
+            # AppGUI feedback
             self.app.inform.emit("Opened: " + filename)

tclCommands/TclCommandOpenSVG.py

@@ -89,5 +89,5 @@ class TclCommandOpenSVG(TclCommandSignaled):
             # Register recent file
             self.app.file_opened.emit("svg", filename)
 
-            # GUI feedback
+            # AppGUI feedback
             self.app.inform.emit("Opened: " + filename)

tclCommands/TclCommandPaint.py

@@ -4,7 +4,7 @@ import collections
 import logging
 
 import gettext
-import FlatCAMTranslation as fcTranslate
+import AppTranslation as fcTranslate
 import builtins
 
 fcTranslate.apply_language('strings')

tclCommands/TclCommandPlotAll.py

@@ -14,7 +14,7 @@ class TclCommandPlotAll(TclCommandSignaled):
     # List of all command aliases, to be able use old names for backward compatibility (add_poly, add_polygon)
     aliases = ['plot_all']
 
-    description = '%s %s' % ("--", "Plots all objects on GUI.")
+    description = '%s %s' % ("--", "Plots all objects on AppGUI.")
 
     # Dictionary of types from Tcl command, needs to be ordered
     arg_names = collections.OrderedDict([
@@ -32,7 +32,7 @@ class TclCommandPlotAll(TclCommandSignaled):
 
     # structured help for current command, args needs to be ordered
     help = {
-        'main': "Plots all objects on GUI.",
+        'main': "Plots all objects on AppGUI.",
         'args': collections.OrderedDict([
             ('plot_status', 'If to display or not the objects: True (1) or False (0).'),
             ('use_thread', 'If to use multithreading: True (1) or False (0).')

tclCommands/TclCommandPlotObjects.py

@@ -21,7 +21,7 @@ class TclCommandPlotObjects(TclCommand):
     # List of all command aliases, to be able use old names for backward compatibility (add_poly, add_polygon)
     aliases = ['plot_objects']
 
-    description = '%s %s' % ("--", "Plot a specified list of objects in GUI.")
+    description = '%s %s' % ("--", "Plot a specified list of objects in AppGUI.")
 
     # Dictionary of types from Tcl command, needs to be ordered
     arg_names = collections.OrderedDict([
@@ -38,7 +38,7 @@ class TclCommandPlotObjects(TclCommand):
 
     # structured help for current command, args needs to be ordered
     help = {
-        'main': "Plot a specified list of objects in GUI.",
+        'main': "Plot a specified list of objects in AppGUI.",
         'args': collections.OrderedDict([
             ('names', "A list of object names to be plotted separated by comma. Required.\n"
                       "WARNING: no spaces are allowed. If unsure enclose the entire list with quotes."),

tclCommands/TclCommandScale.py

@@ -4,7 +4,7 @@ import collections
 import logging
 
 import gettext
-import FlatCAMTranslation as fcTranslate
+import AppTranslation as fcTranslate
 import builtins
 
 fcTranslate.apply_language('strings')

tclCommands/TclCommandSetActive.py

@@ -5,7 +5,7 @@ import collections
 
 class TclCommandSetActive(TclCommand):
     """
-    Tcl shell command to set an object as active in the GUI.
+    Tcl shell command to set an object as active in the AppGUI.
 
     example:
 

tclCommands/TclCommandSetOrigin.py

@@ -13,7 +13,7 @@ from camlib import get_bounds
 
 import logging
 import gettext
-import FlatCAMTranslation as fcTranslate
+import AppTranslation as fcTranslate
 import builtins
 
 fcTranslate.apply_language('strings')

tclCommands/TclCommandSetPath.py

@@ -11,7 +11,7 @@ import collections
 import os
 import logging
 import gettext
-import FlatCAMTranslation as fcTranslate
+import AppTranslation as fcTranslate
 import builtins
 
 fcTranslate.apply_language('strings')

tclCommands/TclCommandSubtractRectangle.py

@@ -3,7 +3,7 @@ from tclCommands.TclCommand import TclCommandSignaled
 import collections
 
 import gettext
-import FlatCAMTranslation as fcTranslate
+import AppTranslation as fcTranslate
 import builtins
 
 fcTranslate.apply_language('strings')