3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-26 20:31:35 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

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

2
plugins/MonitorStage/MonitorMain.qml
View file

@ -159,7 +159,7 @@ Rectangle
{
anchors.fill: parent
hoverEnabled: true
onClicked: Qt.openUrlExternally("https://ultimaker.com/en/resources/manuals/ultimaker-3d-printers")
onClicked: Qt.openUrlExternally("https://ultimaker.com/in/cura/troubleshooting/network?utm_source=cura&utm_medium=software&utm_campaign=monitor-not-connected")
onEntered: manageQueueText.font.underline = true
onExited: manageQueueText.font.underline = false
}

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

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

19
plugins/VersionUpgrade/VersionUpgrade49to410/VersionUpgrade49to410.py
View file

@ -104,6 +104,25 @@ class VersionUpgrade49to410(VersionUpgrade):
"g" : "D060"
}
def upgradePreferences(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
"""
Upgrades preferences to have the new version number.
:param serialized: The original contents of the preferences file.
:param filename: The file name of the preferences file.
:return: A list of new file names, and a list of the new contents for
those files.
"""
parser = configparser.ConfigParser(interpolation = None)
parser.read_string(serialized)
# Update version number.
parser["metadata"]["setting_version"] = "17"
result = io.StringIO()
parser.write(result)
return [filename], [result.getvalue()]
def upgradeInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
"""Upgrades instance containers to have the new version number.

1
plugins/VersionUpgrade/VersionUpgrade49to410/__init__.py
View file

@ -21,6 +21,7 @@ def getMetaData() -> Dict[str, Any]:
("quality_changes", 4000016): ("quality_changes", 4000017, upgrade.upgradeInstanceContainer),
("quality", 4000016): ("quality", 4000017, upgrade.upgradeInstanceContainer),
("user", 4000016): ("user", 4000017, upgrade.upgradeInstanceContainer),
("preferences", 7000016): ("preferences", 7000017, upgrade.upgradePreferences),
},
"sources": {
"machine_stack": {