From 6c890c196601b23e1fd5f8dcc45a5e5892f1b393 Mon Sep 17 00:00:00 2001
From: vocx-fc <vocx-fc@users.noreply.github.com>
Date: Mon, 23 Mar 2020 02:18:04 -0600
Subject: [PATCH] Draft: move array commands to DraftTools

Previously they were imported directly in `InitGui.py`,
now they are collected in `DraftTools.py`, so that they
are imported at the same time as other modules.

Also provide an icon so this icon appears in the menu.
---
 src/Mod/Draft/DraftTools.py               |  1 +
 src/Mod/Draft/InitGui.py                  |  4 ----
 src/Mod/Draft/draftguitools/gui_arrays.py | 28 ++++++++++++++++-------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py
index 23b6f1bc9d..0b54833b5f 100644
--- a/src/Mod/Draft/DraftTools.py
+++ b/src/Mod/Draft/DraftTools.py
@@ -92,6 +92,7 @@ from draftguitools.gui_heal import Heal
 from draftguitools.gui_dimension_ops import Draft_FlipDimension
 from draftguitools.gui_lineslope import Draft_Slope
 from draftguitools.gui_arcs import Draft_Arc_3Points
+import draftguitools.gui_arrays
 # import DraftFillet
 import drafttaskpanels.task_shapestring as task_shapestring
 import drafttaskpanels.task_scale as task_scale
diff --git a/src/Mod/Draft/InitGui.py b/src/Mod/Draft/InitGui.py
index bbbc7c0fca..286da11671 100644
--- a/src/Mod/Draft/InitGui.py
+++ b/src/Mod/Draft/InitGui.py
@@ -82,10 +82,6 @@ class DraftWorkbench(FreeCADGui.Workbench):
             import DraftTools
             import DraftGui
             import DraftFillet
-            from draftguitools import gui_circulararray
-            from draftguitools import gui_polararray
-            from draftguitools import gui_orthoarray
-            from draftguitools import gui_arrays
             FreeCADGui.addLanguagePath(":/translations")
             FreeCADGui.addIconPath(":/icons")
         except Exception as exc:
diff --git a/src/Mod/Draft/draftguitools/gui_arrays.py b/src/Mod/Draft/draftguitools/gui_arrays.py
index 81bff17fbb..33da02a8aa 100644
--- a/src/Mod/Draft/draftguitools/gui_arrays.py
+++ b/src/Mod/Draft/draftguitools/gui_arrays.py
@@ -28,6 +28,16 @@ from PySide.QtCore import QT_TRANSLATE_NOOP
 
 import FreeCAD as App
 import FreeCADGui as Gui
+import Draft_rc
+import draftguitools.gui_circulararray
+import draftguitools.gui_polararray
+import draftguitools.gui_orthoarray
+
+# The module is used to prevent complaints from code checkers (flake8)
+True if Draft_rc.__name__ else False
+True if draftguitools.gui_circulararray.__name__ else False
+True if draftguitools.gui_polararray.__name__ else False
+True if draftguitools.gui_orthoarray.__name__ else False
 
 
 class ArrayGroupCommand:
@@ -35,22 +45,24 @@ class ArrayGroupCommand:
 
     def GetCommands(self):
         """Tuple of array commands."""
-        return tuple(["Draft_OrthoArray",
-                      "Draft_PolarArray", "Draft_CircularArray",
-                      "Draft_PathArray", "Draft_PathLinkArray",
-                      "Draft_PointArray"])
+        return ("Draft_OrthoArray",
+                "Draft_PolarArray", "Draft_CircularArray",
+                "Draft_PathArray", "Draft_PathLinkArray",
+                "Draft_PointArray")
 
     def GetResources(self):
-        """Add menu and tooltip."""
+        """Set icon, menu and tooltip."""
         _tooltip = ("Create various types of arrays, "
                     "including rectangular, polar, circular, "
                     "path, and point")
-        return {'MenuText': QT_TRANSLATE_NOOP("Draft", "Array tools"),
-                'ToolTip': QT_TRANSLATE_NOOP("Arch", _tooltip)}
+
+        return {'Pixmap': 'Draft_Array',
+                'MenuText': QT_TRANSLATE_NOOP("Draft", "Array tools"),
+                'ToolTip': QT_TRANSLATE_NOOP("Draft", _tooltip)}
 
     def IsActive(self):
         """Return True when this command should be available."""
-        if App.ActiveDocument:
+        if App.activeDocument():
             return True
         else:
             return False