Merge tag '15.02.1' into upstream

[cura.git] / Cura / gui / mainWindow.py

diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index 9808ae25658adc38085edd91a47e235cfea18192..fbab3ac25ca6561221dc71b7af06c245857a7388 100644 (file)
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -146,8 +146,8 @@ class mainWindow(wx.Frame):
                        i = toolsMenu.Append(-1, _("Auto Firmware Update..."))
                        self.Bind(wx.EVT_MENU, self.OnAutoFirmwareUpdate, i)
 
-               i = toolsMenu.Append(-1, _("Copy profile to clipboard"))
-               self.Bind(wx.EVT_MENU, self.onCopyProfileClipboard,i)
+               #i = toolsMenu.Append(-1, _("Copy profile to clipboard"))
+               #self.Bind(wx.EVT_MENU, self.onCopyProfileClipboard,i)
 
                toolsMenu.AppendSeparator()
                self.allAtOnceItem = toolsMenu.Append(-1, _("Print all at once"), kind=wx.ITEM_RADIO)
@@ -245,7 +245,7 @@ class mainWindow(wx.Frame):
                #Timer set; used to check if profile is on the clipboard
                self.timer = wx.Timer(self)
                self.Bind(wx.EVT_TIMER, self.onTimer)
-               self.timer.Start(1000)
+               #self.timer.Start(1000)
                self.lastTriedClipboard = profile.getProfileString()
 
                # Restore the window position, size & state from the preferences file
@@ -285,6 +285,13 @@ class mainWindow(wx.Frame):
                if Publisher is not None:
                        Publisher().subscribe(self.onPluginUpdate, "pluginupdate")
 
+               pluginCount = self.normalSettingsPanel.pluginPanel.GetActivePluginCount()
+               if pluginCount == 1:
+                       self.scene.notification.message("Warning: 1 plugin from the previous session is still active.")
+
+               if pluginCount > 1:
+                       self.scene.notification.message("Warning: %i plugins from the previous session are still active." % pluginCount)
+
        def onPluginUpdate(self,msg): #receives commands from the plugin thread
                cmd = str(msg.data).split(";")
                if cmd[0] == "OpenPluginProgressWindow":