3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-13 09:47:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use a proper path for the firmware/printing window and set some additional properties

Browse source 
Contributes to Ultimaker/Uranium#8
This commit is contained in:
Arjen Hiemstra 2015-06-30 23:33:10 +02:00
parent a604f2041a
commit 59fbf72ac3
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
plugins/USBPrinting/USBPrinterManager.py
View file

@ -8,16 +8,18 @@ from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator
from UM.Scene.SceneNode import SceneNode from UM.Scene.SceneNode import SceneNode
from UM.Resources import Resources from UM.Resources import Resources
from UM.Logger import Logger from UM.Logger import Logger
import threading import threading
import platform import platform
import glob import glob
import time import time
import os import os
import os.path
import sys import sys
from UM.Extension import Extension from UM.Extension import Extension
from PyQt5.QtQuick import QQuickView from PyQt5.QtQuick import QQuickView
from PyQt5.QtCore import QUrl, QObject, pyqtSlot, pyqtProperty, pyqtSignal from PyQt5.QtCore import QUrl, QObject, pyqtSlot, pyqtProperty, pyqtSignal, Qt
from UM.i18n import i18nCatalog from UM.i18n import i18nCatalog
i18n_catalog = i18nCatalog("cura") i18n_catalog = i18nCatalog("cura")
@ -53,8 +55,11 @@ class USBPrinterManager(QObject, SignalEmitter, Extension):
def spawnFirmwareInterface(self, serial_port): def spawnFirmwareInterface(self, serial_port):
if self._firmware_view is None: if self._firmware_view is None:
self._firmware_view = QQuickView() self._firmware_view = QQuickView()
self._firmware_view.setFlags(Qt.Dialog)
self._firmware_view.setResizeMode(QQuickView.SizeRootObjectToView);
self._firmware_view.engine().rootContext().setContextProperty("manager",self) self._firmware_view.engine().rootContext().setContextProperty("manager",self)
self._firmware_view.setSource(QUrl("plugins/USBPrinting/FirmwareUpdateWindow.qml")) self._firmware_view.setSource(QUrl.fromLocalFile(os.path.join(PluginRegistry.getPluginPath("USBPrinting"), "FirmwareUpdateWindow.qml")))
self._firmware_view.rootObject().close.connect(self._firmware_view.close)
self._firmware_view.show() self._firmware_view.show()
## Show control interface. ## Show control interface.
@ -62,8 +67,10 @@ class USBPrinterManager(QObject, SignalEmitter, Extension):
def spawnControlInterface(self,serial_port): def spawnControlInterface(self,serial_port):
if self._control_view is None: if self._control_view is None:
self._control_view = QQuickView() self._control_view = QQuickView()
self._control_view.setFlags(Qt.Dialog)
self._control_view.setResizeMode(QQuickView.SizeRootObjectToView);
self._control_view.engine().rootContext().setContextProperty("manager",self) self._control_view.engine().rootContext().setContextProperty("manager",self)
self._control_view.setSource(QUrl("plugins/USBPrinting/ControlWindow.qml")) self._control_view.setSource(QUrl.fromLocalFile(os.path.join(PluginRegistry.getPluginPath("USBPrinting"), "ControlWindow.qml")))
self._control_view.show() self._control_view.show()
@pyqtProperty(float,notify = processingProgress) @pyqtProperty(float,notify = processingProgress)