3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '15.10'

Browse source 
* 15.10:
  Update translations with the 15.10 versions
  Disable languages we have no updated translations for
  Display the version number in the splash screen
  Properly raise DeviceBusyError in RemovableDriveOutputDevice
This commit is contained in:
Arjen Hiemstra 2015-11-17 14:25:23 +01:00
commit 09ea598d28
15 changed files with 6021 additions and 10793 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/CuraApplication.py
View file

@ -45,6 +45,7 @@ from . import PrintInformation
from . import CuraActions
from . import MultiMaterialDecorator
from . import ZOffsetDecorator
from . import CuraSplashScreen
from PyQt5.QtCore import pyqtSlot, QUrl, Qt, pyqtSignal, pyqtProperty, QEvent, Q_ENUMS
from PyQt5.QtGui import QColor, QIcon
@ -522,6 +523,9 @@ class CuraApplication(QtApplication):
for node in ungrouped_nodes:
Selection.remove(node)
def _createSplashScreen(self):
return CuraSplashScreen.CuraSplashScreen()
def _onActiveMachineChanged(self):
machine = self.getMachineManager().getActiveMachineInstance()
if machine: