From: daid <daid303@gmail.com>
Date: Thu, 13 Feb 2014 07:10:32 +0000 (+0100)
Subject: Rename "plugin" module to "pluginInfo"
X-Git-Tag: 14.02-RC1~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6f90aa4ea6de16b3b0212328f2702ec2e6bc28eb;p=cura.git

Rename "plugin" module to "pluginInfo"
---

diff --git a/Cura/gui/pluginPanel.py b/Cura/gui/pluginPanel.py
index 3478f037..ce3fe041 100644
--- a/Cura/gui/pluginPanel.py
+++ b/Cura/gui/pluginPanel.py
@@ -6,14 +6,14 @@ import webbrowser
 from wx.lib import scrolledpanel
 
 from Cura.util import profile
-from Cura.util import plugin
+from Cura.util import pluginInfo
 from Cura.util import explorer
 
 class pluginPanel(wx.Panel):
 	def __init__(self, parent, callback):
 		wx.Panel.__init__(self, parent,-1)
 		#Plugin page
-		self.pluginList = plugin.getPluginList("postprocess")
+		self.pluginList = pluginInfo.getPluginList("postprocess")
 		self.callback = callback
 
 		sizer = wx.GridBagSizer(2, 2)
@@ -59,7 +59,7 @@ class pluginPanel(wx.Panel):
 		self.updateProfileToControls()
 
 	def updateProfileToControls(self):
-		self.pluginConfig = plugin.getPostProcessPluginConfig()
+		self.pluginConfig = pluginInfo.getPostProcessPluginConfig()
 		for p in self.panelList:
 			p.Show(False)
 			self.pluginEnabledPanel.GetSizer().Detach(p)
@@ -126,7 +126,7 @@ class pluginPanel(wx.Panel):
 			idx = self.panelList.index(panel)
 			for k in panel.paramCtrls.keys():
 				self.pluginConfig[idx]['params'][k] = panel.paramCtrls[k].GetValue()
-		plugin.setPostProcessPluginConfig(self.pluginConfig)
+		pluginInfo.setPostProcessPluginConfig(self.pluginConfig)
 		self.callback()
 
 	def OnAdd(self, e):
@@ -138,7 +138,7 @@ class pluginPanel(wx.Panel):
 		if not self._buildPluginPanel(newConfig):
 			return
 		self.pluginConfig.append(newConfig)
-		plugin.setPostProcessPluginConfig(self.pluginConfig)
+		pluginInfo.setPostProcessPluginConfig(self.pluginConfig)
 		self.callback()
 
 	def OnRem(self, e):
@@ -158,7 +158,7 @@ class pluginPanel(wx.Panel):
 		self.Layout()
 
 		self.pluginConfig.pop(idx)
-		plugin.setPostProcessPluginConfig(self.pluginConfig)
+		pluginInfo.setPostProcessPluginConfig(self.pluginConfig)
 		self.callback()
 
 	def OnHelp(self, e):
@@ -174,6 +174,6 @@ class pluginPanel(wx.Panel):
 		webbrowser.open('http://wiki.ultimaker.com/Category:CuraPlugin')
 
 	def OnOpenPluginLocation(self, e):
-		if not os.path.exists(plugin.getPluginBasePaths()[0]):
-			os.mkdir(plugin.getPluginBasePaths()[0])
-		explorer.openExplorerPath(plugin.getPluginBasePaths()[0])
+		if not os.path.exists(pluginInfo.getPluginBasePaths()[0]):
+			os.mkdir(pluginInfo.getPluginBasePaths()[0])
+		explorer.openExplorerPath(pluginInfo.getPluginBasePaths()[0])
diff --git a/Cura/gui/preferencesDialog.py b/Cura/gui/preferencesDialog.py
index 633e387e..2ff3c53a 100644
--- a/Cura/gui/preferencesDialog.py
+++ b/Cura/gui/preferencesDialog.py
@@ -6,7 +6,7 @@ from Cura.gui import configWizard
 from Cura.gui import configBase
 from Cura.util import machineCom
 from Cura.util import profile
-from Cura.util import plugin
+from Cura.util import pluginInfo
 from Cura.util import resources
 
 class preferencesDialog(wx.Dialog):
@@ -23,7 +23,7 @@ class preferencesDialog(wx.Dialog):
 		left, right, main = self.panel.CreateConfigPanel(self)
 
 		printWindowTypes = ['Basic']
-		for p in plugin.getPluginList('printwindow'):
+		for p in pluginInfo.getPluginList('printwindow'):
 			printWindowTypes.append(p.getName())
 		configBase.TitleRow(left, _("Print window"))
 		configBase.SettingRow(left, 'printing_window', printWindowTypes)
diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py
index 268ac8d4..66681083 100644
--- a/Cura/gui/sceneView.py
+++ b/Cura/gui/sceneView.py
@@ -21,7 +21,7 @@ from Cura.util import meshLoader
 from Cura.util import objectScene
 from Cura.util import resources
 from Cura.util import sliceEngine
-from Cura.util import plugin
+from Cura.util import pluginInfo
 from Cura.util import removableStorage
 from Cura.util import explorer
 from Cura.util.printerConnection import printerConnectionManager
@@ -275,7 +275,7 @@ class SceneView(openglGui.glGuiPanel):
 		if connection.window is None or not connection.window:
 			connection.window = None
 			windowType = profile.getPreference('printing_window')
-			for p in plugin.getPluginList('printwindow'):
+			for p in pluginInfo.getPluginList('printwindow'):
 				if p.getName() == windowType:
 					connection.window = printWindow2.printWindowPlugin(self, connection, p.getFullFilename())
 					break
diff --git a/Cura/util/plugin.py b/Cura/util/pluginInfo.py
similarity index 100%
rename from Cura/util/plugin.py
rename to Cura/util/pluginInfo.py
diff --git a/Cura/util/sliceEngine.py b/Cura/util/sliceEngine.py
index eafeecb5..9b09c6dc 100644
--- a/Cura/util/sliceEngine.py
+++ b/Cura/util/sliceEngine.py
@@ -21,7 +21,7 @@ import struct
 import cStringIO as StringIO
 
 from Cura.util import profile
-from Cura.util import plugin
+from Cura.util import pluginInfo
 from Cura.util import version
 from Cura.util import gcodeInterpreter
 
@@ -368,7 +368,7 @@ class Engine(object):
 		returnCode = self._process.wait()
 		logThread.join()
 		if returnCode == 0:
-			pluginError = plugin.runPostProcessingPlugins(self._result)
+			pluginError = pluginInfo.runPostProcessingPlugins(self._result)
 			if pluginError is not None:
 				print pluginError
 				self._result.addLog(pluginError)