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

Merge RestartManager into marketplace

Browse source 
CURA-8588
This commit is contained in:
Jaime van Kessel 2022-01-03 11:12:52 +01:00
parent 6af2677c52
commit 6a39862349
6 changed files with 19 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/Marketplace/resources/qml/ManagedPackages.qml
View file

@ -4,7 +4,6 @@ import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
import Marketplace 1.0 as Marketplace
import UM 1.4 as UM
Packages

4
plugins/Marketplace/resources/qml/Marketplace.qml
View file

@ -8,13 +8,11 @@ import QtQuick.Window 2.2
import UM 1.2 as UM
import Cura 1.6 as Cura
import Marketplace 1.0 as Marketplace
Window
{
id: marketplaceDialog
property variant catalog: UM.I18nCatalog { name: "cura" }
property variant restartManager: Marketplace.RestartManager { }
signal searchStringChanged(string new_search)
@ -235,7 +233,7 @@ Window
{
height: quitButton.height + 2 * UM.Theme.getSize("default_margin").width
color: UM.Theme.getColor("primary")
visible: restartManager.showRestartNotification
visible: manager.showRestartNotification
anchors
{
left: parent.left

1
plugins/Marketplace/resources/qml/Materials.qml
View file

@ -1,7 +1,6 @@
// Copyright (c) 2021 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import Marketplace 1.0 as Marketplace
import UM 1.4 as UM
Packages

1
plugins/Marketplace/resources/qml/Plugins.qml
View file

@ -1,7 +1,6 @@
// Copyright (c) 2021 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import Marketplace 1.0 as Marketplace
import UM 1.4 as UM
Packages