From 39fb8beaf5542e0fffba536f57621e0e2134cfc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 30 Mar 2015 20:49:48 +0200 Subject: [PATCH] Update the no firmware patch according to communication with Cura upstream --- cura-no-firmware.patch | 26 ++++++++++++++++++++++++-- cura.spec | 5 ++++- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/cura-no-firmware.patch b/cura-no-firmware.patch index 8a8688d..f9577c8 100644 --- a/cura-no-firmware.patch +++ b/cura-no-firmware.patch @@ -1,5 +1,5 @@ diff --git a/Cura/gui/firmwareInstall.py b/Cura/gui/firmwareInstall.py -index 2ee983f..4e4612c 100644 +index 2ee983f..007e331 100644 --- a/Cura/gui/firmwareInstall.py +++ b/Cura/gui/firmwareInstall.py @@ -17,40 +17,6 @@ from Cura.util import profile @@ -48,7 +48,29 @@ index 2ee983f..4e4612c 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 efd8116..7cc764c 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': + self.bedLevelWizardMenuItem.Enable(False) + self.headOffsetWizardMenuItem.Enable(False) +@@ -472,9 +471,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.spec b/cura.spec index 49d973f..2023479 100644 --- a/cura.spec +++ b/cura.spec @@ -1,6 +1,6 @@ Name: cura Version: 14.12.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: 3D printer control software # Code is AGPLv3 @@ -107,6 +107,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2} %{_bindir}/%{name} %changelog +* Mon Mar 30 2015 Miro Hrončok - 14.12.1-2 +- Update the no firmware patch according to communication with Cura upstream + * Mon Dec 29 2014 Miro Hrončok - 14.12.1-1 - Updated to 14.12.1 - No longer depend on firmware