Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_by_ip

This commit is contained in:
Remco Burema 2019-03-14 11:40:44 +01:00
commit 61821e6378
77 changed files with 2138 additions and 272 deletions

View file

@ -3,7 +3,7 @@
import os
from typing import TYPE_CHECKING, Optional
from PyQt5.QtCore import QUrl, Qt
from PyQt5.QtCore import QUrl, Qt, pyqtSlot
from UM.Qt.ListModel import ListModel
from UM.Resources import Resources
@ -12,6 +12,7 @@ from logging import Logger
if TYPE_CHECKING:
from PyQt5.QtCore import QObject
class WelcomePagesModel(ListModel):
IdRole = Qt.UserRole + 1 # Page ID
@ -52,6 +53,11 @@ class WelcomePagesModel(ListModel):
os.path.join("WelcomePages",
"DataCollectionsContent.qml"))),
})
self._pages.append({"id": "add_printer_by_selection",
"page_url": QUrl.fromLocalFile(Resources.getPath(CuraApplication.ResourceTypes.QmlFiles,
os.path.join("WelcomePages",
"AddPrinterBySelectionContent.qml"))),
})
self._pages.append({"id": "add_printer_by_ip",
"page_url": QUrl.fromLocalFile(Resources.getPath(CuraApplication.ResourceTypes.QmlFiles,
os.path.join("WelcomePages", "AddPrinterByIpContent.qml")))})