diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml b/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml index 6d9f375788..dcfed2f7b4 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml @@ -2,7 +2,9 @@ // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 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 UM.Dialog { @@ -82,8 +84,9 @@ UM.Dialog { renderType: Text.NativeRendering; } - ComboBox { + NewControls.ComboBox { id: printerComboBox; + currentIndex: 0; Behavior on height { NumberAnimation { duration: 100 } } height: 40 * screenScaleFactor; model: ListModel { diff --git a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml index 2ddacb6d79..0a9d317d2d 100644 --- a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml +++ b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml @@ -3,6 +3,7 @@ import QtQuick 2.1 import QtQuick.Controls 1.1 +import QtQuick.Controls 2.15 as NewControls import QtQuick.Dialogs 1.2 import QtQuick.Window 2.1 @@ -145,10 +146,11 @@ UM.Dialog anchors.margins: UM.Theme.getSize("default_margin").width height: childrenRect.height - ComboBox + NewControls.ComboBox { id: discardOrKeepProfileChangesDropDownButton width: 300 + textRole: "text" model: ListModel { @@ -217,4 +219,4 @@ UM.Dialog } } } -} \ No newline at end of file +}