rpms/cura
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update the no firmware patch according to communication with Cura upstream

Browse source
This commit is contained in:
Miro Hrončok 2015-03-30 20:49:48 +02:00
commit 39fb8beaf5
2 changed files with 28 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

26
cura-no-firmware.patch
View file

@ -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)

5
cura.spec
View file

@ -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 <mhroncok@redhat.com> - 14.12.1-2
- Update the no firmware patch according to communication with Cura upstream
* Mon Dec 29 2014 Miro Hrončok <mhroncok@redhat.com> - 14.12.1-1
- Updated to 14.12.1
- No longer depend on firmware