GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-18 04:25:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10366 from Ultimaker/CURA-8214_use_new_controlstyle_for_cluster_printer_selecter

Browse Source 
Fix greyed out cluster printers
This commit is contained in:
Konstantinos Karmas 2021-08-31 09:45:33 +02:00 committed by GitHub
commit b3af6f3ec5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml
View File

@ -2,7 +2,9 @@
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Window 2.2 import QtQuick.Window 2.2
import QtQuick.Controls 1.2 import QtQuick.Controls 1.1
import QtQuick.Controls 2.15 as NewControls
import UM 1.1 as UM import UM 1.1 as UM
UM.Dialog { UM.Dialog {
@ -82,8 +84,9 @@ UM.Dialog {
renderType: Text.NativeRendering; renderType: Text.NativeRendering;
} }
ComboBox { NewControls.ComboBox {
id: printerComboBox; id: printerComboBox;
currentIndex: 0;
Behavior on height { NumberAnimation { duration: 100 } } Behavior on height { NumberAnimation { duration: 100 } }
height: 40 * screenScaleFactor; height: 40 * screenScaleFactor;
model: ListModel { model: ListModel {

6
resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
View File

@ -3,6 +3,7 @@
import QtQuick 2.1 import QtQuick 2.1
import QtQuick.Controls 1.1 import QtQuick.Controls 1.1
import QtQuick.Controls 2.15 as NewControls
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.2
import QtQuick.Window 2.1 import QtQuick.Window 2.1
@ -145,10 +146,11 @@ UM.Dialog
anchors.margins: UM.Theme.getSize("default_margin").width anchors.margins: UM.Theme.getSize("default_margin").width
height: childrenRect.height height: childrenRect.height
ComboBox NewControls.ComboBox
{ {
id: discardOrKeepProfileChangesDropDownButton id: discardOrKeepProfileChangesDropDownButton
width: 300 width: 300
textRole: "text"
model: ListModel model: ListModel
{ {
@ -217,4 +219,4 @@ UM.Dialog
} }
} }
} }
} }