Fixing problem for #282

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

diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index dcdc5b9ba8456354094300fac6b4ea6c937415af..75fd9dac6cc7e762bc1f1d0f4a31d786390221c6 100644 (file)
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -304,6 +304,7 @@ class mainWindow(wx.Frame):
                        self.splitter.SetSashPosition(self.normalSashPos, True)
                        # Enabled sash
                        self.splitter.SetSashSize(4)
+               self.defaultFirmwareInstallMenuItem.Enable(firmwareInstall.getDefaultFirmware() is not None)
                self.scene.updateProfileToControls()
 
        def OnPreferences(self, e):
@@ -384,10 +385,10 @@ class mainWindow(wx.Frame):
 
                #Add a menu item for each machine configuration.
                for n in xrange(0, profile.getMachineCount()):
-                       i = self.machineMenu.Append(n, profile.getMachineSetting('machine_name', n).title(), kind=wx.ITEM_RADIO)
+                       i = self.machineMenu.Append(n + 0x1000, profile.getMachineSetting('machine_name', n).title(), kind=wx.ITEM_RADIO)
                        if n == int(profile.getPreferenceFloat('active_machine')):
                                i.Check(True)
-                       self.Bind(wx.EVT_MENU, lambda e: self.OnSelectMachine(e.GetId()), i)
+                       self.Bind(wx.EVT_MENU, lambda e: self.OnSelectMachine(e.GetId() - 0x1000), i)
 
                self.machineMenu.AppendSeparator()
                i = self.machineMenu.Append(-1, _("Add new machine..."))
@@ -397,8 +398,9 @@ class mainWindow(wx.Frame):
                self.machineMenu.AppendSeparator()
                i = self.machineMenu.Append(-1, _("Install custom firmware..."))
                self.Bind(wx.EVT_MENU, self.OnCustomFirmware, i)
-               i = self.machineMenu.Append(-1, _("Install default Marlin firmware..."))
-               self.Bind(wx.EVT_MENU, self.OnDefaultMarlinFirmware, i)
+
+               self.defaultFirmwareInstallMenuItem = self.machineMenu.Append(-1, _("Install default Marlin firmware..."))
+               self.Bind(wx.EVT_MENU, self.OnDefaultMarlinFirmware, self.defaultFirmwareInstallMenuItem)
 
        def OnLoadProfile(self, e):
                dlg=wx.FileDialog(self, _("Select profile file to load"), os.path.split(profile.getPreference('lastFile'))[0], style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST)