Merge remote-tracking branch 'origin/master' into lexelby/style

2 files changed, 16 insertions, 9 deletions

diff --git a/lib/extensions/__init__.py b/lib/extensions/__init__.py
index b865db4c..cf0313b2 100644
--- a/lib/extensions/__init__.py
+++ b/lib/extensions/__init__.py
@@ -11,12 +11,15 @@ from object_commands import ObjectCommands
 from layer_commands import LayerCommands
 from convert_to_satin import ConvertToSatin
 
-from base import InkstitchExtension
-import inspect
-
-extensions = []
-for item in locals().values():
-    if inspect.isclass(item) and \
-       issubclass(item, InkstitchExtension) and \
-       item is not InkstitchExtension:
-        extensions.append(item)
+__all__ = extensions = [Embroider,
+                        Install,
+                        Params,
+                        Print,
+                        Simulate,
+                        Input,
+                        Output,
+                        Zip,
+                        Flip,
+                        ObjectCommands,
+                        LayerCommands,
+                        ConvertToSatin]
diff --git a/lib/extensions/install.py b/lib/extensions/install.py
index 314843f4..6c179beb 100644
--- a/lib/extensions/install.py
+++ b/lib/extensions/install.py
@@ -95,6 +95,10 @@ class InstallerFrame(wx.Frame):
 
 
 class Install(inkex.Effect):
+    @classmethod
+    def name(cls):
+        return "install"
+
     def effect(self):
         app = wx.App()
         installer_frame = InstallerFrame(None, title=_("Ink/Stitch Add-ons Installer"), size=(550, 250))