Draft: move GuiCommand for Draft Layer to its own module

src/Mod/Draft/CMakeLists.txt

@@ -257,6 +257,7 @@ SET(Draft_GUI_tools
     draftguitools/gui_heal.py
     draftguitools/gui_dimension_ops.py
     draftguitools/gui_lineslope.py
+    draftguitools/gui_layers.py
     ${Creator_tools}
     ${Modifier_tools}
     draftguitools/README.md

src/Mod/Draft/DraftLayer.py

@@ -20,9 +20,20 @@
 # *   USA                                                                   *
 # *                                                                         *
 # ***************************************************************************
+"""Provides the Layer object.
+
+The original Layer object was a VisGroup, but it was renamed to Layer
+in the development cycle of 0.19.
+"""
+## @package DraftLayer
+# \ingroup DRAFT
+# \brief Provides the Layer object
 
 import FreeCAD
 
+if FreeCAD.GuiUp:
+    import FreeCADGui
+
 
 def translate(ctx, txt):
     return txt
@@ -75,24 +86,6 @@ def getLayerContainer():
     return obj
 
 
-class CommandLayer():
-    """The Draft_Layer FreeCAD command"""
-
-    def GetResources(self):
-        return {'Pixmap': 'Draft_Layer',
-                'MenuText': QT_TRANSLATE_NOOP("Draft_Layer", "Layer"),
-                'ToolTip': QT_TRANSLATE_NOOP("Draft_Layer", "Adds a layer")}
-
-    def Activated(self):
-        import FreeCADGui
-        FreeCAD.ActiveDocument.openTransaction("Create Layer")
-        FreeCADGui.addModule("Draft")
-        FreeCADGui.doCommand('Draft.makeLayer()')
-        FreeCADGui.doCommand('FreeCAD.ActiveDocument.recompute()')
-        FreeCAD.ActiveDocument.commitTransaction()
-        FreeCAD.ActiveDocument.recompute()
-
-
 class Layer:
     """The Draft Layer object"""
 
@@ -447,9 +440,3 @@ def __getstate__(self):
     def __setstate__(self, state):
 
         return None
-
-
-if FreeCAD.GuiUp:
-    import FreeCADGui
-
-    FreeCADGui.addCommand('Draft_Layer', CommandLayer())

src/Mod/Draft/DraftTools.py

@@ -93,7 +93,7 @@
 from draftguitools.gui_lineslope import Draft_Slope
 import draftguitools.gui_arrays
 import draftguitools.gui_annotationstyleeditor
-# import DraftFillet
+from draftguitools.gui_layers import Layer
 
 # ---------------------------------------------------------------------------
 # Preflight stuff

src/Mod/Draft/draftguitools/gui_layers.py

@@ -0,0 +1,76 @@
+# ***************************************************************************
+# *   Copyright (c) 2014 Yorik van Havre <yorik@uncreated.net>              *
+# *   Copyright (c) 2020 Eliud Cabrera Castillo <e.cabrera-castillo@tum.de> *
+# *                                                                         *
+# *   This file is part of the FreeCAD CAx development system.              *
+# *                                                                         *
+# *   This program is free software; you can redistribute it and/or modify  *
+# *   it under the terms of the GNU Lesser General Public License (LGPL)    *
+# *   as published by the Free Software Foundation; either version 2 of     *
+# *   the License, or (at your option) any later version.                   *
+# *   for detail see the LICENCE text file.                                 *
+# *                                                                         *
+# *   This program is distributed in the hope that it will be useful,       *
+# *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+# *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+# *   GNU Library General Public License for more details.                  *
+# *                                                                         *
+# *   You should have received a copy of the GNU Library General Public     *
+# *   License along with this program; if not, write to the Free Software   *
+# *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  *
+# *   USA                                                                   *
+# *                                                                         *
+# ***************************************************************************
+"""Provides tools for creating Layers with the Draft Workbench."""
+## @package gui_layers
+# \ingroup draftguitools
+# \brief Provides tools for creating Layers with the Draft Workbench.
+
+## \addtogroup draftguitools
+# @{
+from PySide.QtCore import QT_TRANSLATE_NOOP
+
+import FreeCADGui as Gui
+import Draft_rc
+import draftguitools.gui_base as gui_base
+
+from draftutils.translate import _tr
+
+# The module is used to prevent complaints from code checkers (flake8)
+bool(Draft_rc.__name__)
+
+
+class Layer(gui_base.GuiCommandSimplest):
+    """GuiCommand to create a Layer object in the document."""
+
+    def __init__(self):
+        super(Layer, self).__init__(name=_tr("Layer"))
+
+    def GetResources(self):
+        """Set icon, menu and tooltip."""
+        _tip = QT_TRANSLATE_NOOP("Draft_Layer",
+                                 "Adds a layer to the document.\n"
+                                 "Objects added to this layer can share "
+                                 "the same visual properties such as "
+                                 "line color, line width, and shape color.")
+        return {'Pixmap': 'Draft_Layer',
+                'MenuText': QT_TRANSLATE_NOOP("Draft_Layer", "Layer"),
+                'ToolTip': _tip}
+
+    def Activated(self):
+        """Execute when the command is called.
+
+        It calls the `finish(False)` method of the active Draft command.
+        """
+        super(Layer, self).Activated()
+
+        self.doc.openTransaction("Create Layer")
+        Gui.addModule("Draft")
+        Gui.doCommand('_layer_ = Draft.makeLayer()')
+        Gui.doCommand('FreeCAD.ActiveDocument.recompute()')
+        self.doc.commitTransaction()
+
+
+Gui.addCommand('Draft_Layer', Layer())
+
+## @}