churchyard pushed to cura-lulzbot (f21). "Update the no firmware patch according to communication with Cura upstream"

[notifications at fedoraproject.org]

>From 812839c2488f4b0cd1340e26a200abd511017741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro at hroncok.cz>
Date: Wed, 1 Apr 2015 12:26:50 +0200
Subject: Update the no firmware patch according to communication with Cura
 upstream


diff --git a/cura-lulzbot-no-firmware.patch b/cura-lulzbot-no-firmware.patch
index 5db0b98..ef98b2b 100644
--- a/cura-lulzbot-no-firmware.patch
+++ b/cura-lulzbot-no-firmware.patch
@@ -1,5 +1,5 @@
 diff --git a/Cura/gui/firmwareInstall.py b/Cura/gui/firmwareInstall.py
-index 4dd751e..7fcbf96 100644
+index 4dd751e..67528e2 100644
 --- a/Cura/gui/firmwareInstall.py
 +++ b/Cura/gui/firmwareInstall.py
 @@ -17,42 +17,6 @@ from Cura.util import profile
@@ -50,7 +50,29 @@ index 4dd751e..7fcbf96 100644
  			filename = getDefaultFirmware(machineIndex)
  		if filename is None:
 -			wx.MessageBox(_("I am sorry, but Cura does not ship with a default firmware for your machine configuration."), _("Firmware update"), wx.OK | wx.ICON_ERROR)
-+			wx.MessageBox(_("I am sorry, but Cura on Fedora does not ship firmware for legal and technical reasons. Go download it and install it as custom firmware instead."), _("Firmware update"), wx.OK | wx.ICON_ERROR)
++			wx.MessageBox(_("I am sorry, but Cura on Fedora does not ship firmware for technical reasons. Please go download it and install it as custom firmware instead."), _("Firmware update"), wx.OK | wx.ICON_ERROR)
  			self.Destroy()
  			return
  		self._machine_type = profile.getMachineSetting('machine_type', machineIndex)
+diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
+index 71dac36..545f758 100644
+--- a/Cura/gui/mainWindow.py
++++ b/Cura/gui/mainWindow.py
+@@ -364,7 +364,6 @@ class mainWindow(wx.Frame):
+ 			self.splitter.SetSashPosition(self.normalSashPos, True)
+ 			# Enabled sash
+ 			self.splitter.SetSashSize(4)
+-		self.defaultFirmwareInstallMenuItem.Enable(firmwareInstall.getDefaultFirmware() is not None)
+ 		if profile.getMachineSetting('machine_type') == 'ultimaker2' or profile.getMachineSetting('machine_type') == 'lulzbot_mini' or profile.getMachineSetting('machine_type') == 'lulzbot_TAZ':
+ 			self.bedLevelWizardMenuItem.Enable(False)
+ 			self.headOffsetWizardMenuItem.Enable(False)
+@@ -475,9 +474,6 @@ class mainWindow(wx.Frame):
+ 		#Add tools for machines.
+ 		self.machineMenu.AppendSeparator()
+ 
+-		self.defaultFirmwareInstallMenuItem = self.machineMenu.Append(-1, _("Install default firmware..."))
+-		self.Bind(wx.EVT_MENU, self.OnDefaultMarlinFirmware, self.defaultFirmwareInstallMenuItem)
+-
+ 		i = self.machineMenu.Append(-1, _("Install custom firmware..."))
+ 		self.Bind(wx.EVT_MENU, self.OnCustomFirmware, i)
+ 
diff --git a/cura-lulzbot.spec b/cura-lulzbot.spec
index 263d95f..6a82e53 100644
--- a/cura-lulzbot.spec
+++ b/cura-lulzbot.spec
@@ -1,6 +1,6 @@
 Name:           cura-lulzbot
 Version:        14.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Cura LulzBot Edition, 3D printer control software
 
 # Code is AGPLv3
@@ -115,6 +115,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
 %{_bindir}/%{name}
 
 %changelog
+* Wed Apr 01 2015 Miro Hrončok <mhroncok at redhat.com> - 14.12-3
+- Update the no firmware patch according to communication with Cura upstream
+
 * Wed Mar 25 2015 Tom Callaway <spot at fedoraproject.org> - 14.12-2
 - fix one missing CuraLulzbot invoke
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/cura-lulzbot.git/commit/?h=f21&id=812839c2488f4b0cd1340e26a200abd511017741