3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 14:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch '4.11'

Browse source
This commit is contained in:
Ghostkeeper 2021-08-31 12:07:42 +02:00
commit d08d5d6625
No known key found for this signature in database
GPG key ID: 68F39EA88EEED5FF
7 changed files with 55 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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
}
}
}
}
}

69
resources/qml/Settings/SettingView.qml
View file

@ -19,26 +19,9 @@ Item
property Action configureSettings
property bool findingSettings
Rectangle
Item
{
id: filterContainer
visible: true
radius: UM.Theme.getSize("setting_control_radius").width
border.width: UM.Theme.getSize("default_lining").width
border.color:
{
if (hoverMouseArea.containsMouse || clearFilterButton.containsMouse)
{
return UM.Theme.getColor("setting_control_border_highlight")
}
else
{
return UM.Theme.getColor("setting_control_border")
}
}
color: UM.Theme.getColor("setting_control")
anchors
{
@ -48,6 +31,7 @@ Item
rightMargin: UM.Theme.getSize("default_margin").width
}
height: UM.Theme.getSize("print_setup_big_item").height
Timer
{
id: settingsSearchTimer
@ -57,33 +41,35 @@ Item
repeat: false
}
TextField
Cura.TextField
{
id: filter
height: parent.height
anchors.left: parent.left
anchors.right: clearFilterButton.left
anchors.rightMargin: Math.round(UM.Theme.getSize("thick_margin").width)
placeholderText:
{
var imageSize = "width='" + UM.Theme.getSize("small_button_icon").width + "' height='" + UM.Theme.getSize("small_button_icon").height
var imageSource = "' src='"+ UM.Theme.getIcon("Magnifier")
var searchPlaceholder = catalog.i18nc("@label:textbox", "Search settings")
return "<img align='middle' " + imageSize + imageSource +"'>" + "<div vertical-align=bottom>" + searchPlaceholder
}
style: TextFieldStyle
{
textColor: UM.Theme.getColor("setting_control_text")
placeholderTextColor: UM.Theme.getColor("setting_filter_field")
font: UM.Theme.getFont("default_italic")
background: Item {}
}
anchors.right: parent.right
leftPadding: searchIcon.width + UM.Theme.getSize("default_margin").width * 2
placeholderText: catalog.i18nc("@label:textbox", "Search settings")
font.italic: true
property var expandedCategories
property bool lastFindingSettings: false
UM.RecolorImage
{
id: searchIcon
anchors
{
verticalCenter: parent.verticalCenter
left: parent.left
leftMargin: UM.Theme.getSize("default_margin").width
}
source: UM.Theme.getIcon("search")
height: UM.Theme.getSize("small_button_icon").height
width: height
color: UM.Theme.getColor("text")
}
onTextChanged:
{
settingsSearchTimer.restart()
@ -127,15 +113,6 @@ Item
}
}
MouseArea
{
id: hoverMouseArea
anchors.fill: parent
hoverEnabled: true
acceptedButtons: Qt.NoButton
cursorShape: Qt.IBeamCursor
}
UM.SimpleButton
{
id: clearFilterButton

4
resources/qml/WelcomePages/AddPrinterByIpContent.qml
View file

@ -203,12 +203,12 @@ Item
{
if (addPrinterByIpScreen.hasRequestFinished)
{
return catalog.i18nc("@label", "Could not connect to device.") + "<br /><br /><a href=\"https://ultimaker.com/en/resources/52891-set-up-a-cloud-connection\">"
return catalog.i18nc("@label", "Could not connect to device.") + "<br /><br /><a href=\"https://ultimaker.com/in/cura/troubleshooting/network?utm_source=cura&utm_medium=software&utm_campaign=add-network-printer-error\">"
+ catalog.i18nc("@label", "Can't connect to your Ultimaker printer?") + "</a>";
}
else
{
return catalog.i18nc("@label", "The printer at this address has not responded yet.") + "<br /><br /><a href=\"https://ultimaker.com/en/resources/52891-set-up-a-cloud-connection\">"
return catalog.i18nc("@label", "The printer at this address has not responded yet.") + "<br /><br /><a href=\"https://ultimaker.com/in/cura/troubleshooting/network?utm_source=cura&utm_medium=software&utm_campaign=add-network-printer-error\">"
+ catalog.i18nc("@label", "Can't connect to your Ultimaker printer?") + "</a>";
}
}