Merge branch 'master' of github.com:daid/Cura

Cura/gui/printWindow.py

@@ -342,7 +342,7 @@ class printWindow(wx.Frame):
 		self.temperatureSelect.Enable(self.machineCom != None and self.machineCom.isOperational())
 		self.bedTemperatureSelect.Enable(self.machineCom != None and self.machineCom.isOperational())
 		self.directControlPanel.Enable(self.machineCom != None and self.machineCom.isOperational() and not self.machineCom.isPrinting())
-		self.machineLogButton.Show(self.machineCom != None and self.machineCom.isError())
+		self.machineLogButton.Show(self.machineCom != None and self.machineCom.isClosedOrError())
 		if self.cam:
 			for button in self.cam.buttons:
 				button.Enable(self.machineCom == None or not self.machineCom.isPrinting())

scripts/osx64/Cura.app/Contents/Info.plist

@@ -8,6 +8,8 @@
 	<string>Cura 12.10</string>
 	<key>CFBundleIdentifer</key>
 	<string>daid.cura</string>
+	<key>CFBundleIconFile></key>
+	<string>Cura.icns</string>
 	<key>CFBundleVersion</key>
 	<string>12.10</string>
 	<key>CFBundlePackageType</key>