* Merge branch 'fill-with-module' of git://github.com/petosorus/Pyfa into petosorus-fill-with-module

* Remove settings check

# Conflicts:
#	gui/fitCommands/__init__.py

gui/builtinContextMenus/fillWithModule.py

@@ -0,0 +1,32 @@
+from gui.contextMenu import ContextMenu
+import gui.mainFrame
+# noinspection PyPackageRequirements
+import wx
+import gui.globalEvents as GE
+from service.settings import ContextMenuSettings
+import gui.fitCommands as cmd
+
+
+class FillWithModule(ContextMenu):
+    def __init__(self):
+        self.mainFrame = gui.mainFrame.MainFrame.getInstance()
+        self.settings = ContextMenuSettings.getInstance()
+
+    def display(self, srcContext, selection):
+        return srcContext in ("fittingModule")
+
+    def getText(self, itmContext, selection):
+        return u"Fill With {0}".format(itmContext if itmContext is not None else "Module")
+
+    def activate(self, fullContext, selection, i):
+
+        srcContext = fullContext[0]
+        fitID = self.mainFrame.getActiveFit()
+
+        if srcContext == "fittingModule":
+            self.mainFrame.command.Submit(cmd.GuiFillWithModuleCommand(fitID, selection[0].itemID))
+            return  # the command takes care of the PostEvent
+        wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
+
+
+FillWithModule.register()