Merge branch 'master' into 4.1

fieldOfView · fieldOfView · commit 58beb5216e8d · 2021-04-09T12:33:35.000+02:00
# Conflicts:
#	plugin.json
diff --git a/__init__.py b/__init__.py
@@ -28,6 +28,10 @@ def __matchVersion():
     if cura_version == "master":
         Logger.log("d", "Running Cura from source; skipping version check")
         return True
+    if cura_version.startswith("Arachne_engine"):
+        Logger.log("d", "Running Cura Arachne preview; skipping version check")
+        return True
+
     cura_version = Version(cura_version)
     cura_version = Version([cura_version.getMajor(), cura_version.getMinor()])
 
diff --git a/plugin.json b/plugin.json
@@ -1,11 +1,11 @@
 {
     "name": "Sidebar GUI",
     "author": "fieldOfView",
-    "version": "4.1.0",
+    "version": "4.1.1-DEV",
     "minimum_cura_version": "4.0",
-    "maximum_cura_version": "4.8",
+    "maximum_cura_version": "4.9",
     "description": "Provides an alternative interface which restores the sidebar",
     "api": "6.0.0",
-    "supported_sdk_versions": ["6.0.0", "6.1.0", "6.2.0", "6.3.0", "7.0.0", "7.1.0", "7.2.0", "7.3.0", "7.4.0"],
+    "supported_sdk_versions": ["6.0.0", "6.1.0", "6.2.0", "6.3.0", "7.0.0", "7.1.0", "7.2.0", "7.3.0", "7.4.0", "7.5.0"],
     "i18n-catalog": "cura"
 }
diff --git a/resources/icons/settings_dock.svg b/resources/icons/settings_dock.svg
@@ -1,51 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 20 20"
-   version="1.1"
-   id="svg6"
-   sodipodi:docname="settings_dock.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="35.086825"
-     inkscape:cx="-0.292517"
-     inkscape:cy="10.332039"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg6" />
+<svg viewBox="0 0 20 20">
   <path
      fill="none"
      d="M0 0h20v20H0z"
diff --git a/resources/icons/settings_undock.svg b/resources/icons/settings_undock.svg
@@ -1,55 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 20 20"
-   version="1.1"
-   id="svg6"
-   sodipodi:docname="settings_undock.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="14.530612"
-     inkscape:cx="9"
-     inkscape:cy="10"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg6"
-     inkscape:document-rotation="0" />
+<svg viewBox="0 0 20 20">
   <path
      id="path4"
-     d="M 0 0 L 0 20 L 20 20 L 20 0 L 0 0 z M 8.6992188 3.5 L 11.300781 3.5 L 11.300781 8.6992188 L 16.5 8.7285156 L 16.5 11.300781 L 11.300781 11.300781 L 11.300781 16.5 L 8.6992188 16.5 L 8.6992188 11.300781 L 3.5 11.300781 L 3.5 8.6992188 L 8.6992188 8.6992188 L 8.6992188 3.5 z " />
+     d="M 0 0 L 0 20 L 20 20 L 20 0 L 0 0 z M 9.5 2.6992188 L 17.300781 2.6992188 L 17.300781 10.5 L 14.699219 10.5 L 14.699219 7.1464844 L 10.388672 11.455078 L 8.5507812 9.6152344 L 12.865234 5.3007812 L 9.5 5.3007812 L 9.5 2.6992188 z " />
   <path
      fill="none"
      d="M0 0h20v20H0z"
diff --git a/resources/qml/ProfileSelector40.qml b/resources/qml/ProfileSelector40.qml
@@ -44,15 +44,14 @@ Item
         id: dockButton
         anchors
         {
-            top: parent.top
-            topMargin: UM.Theme.getSize("default_margin").width
+            verticalCenter: collapseButton.verticalCenter
 
             right: collapseButton.left
             rightMargin: UM.Theme.getSize("thin_margin").width
         }
         iconSource: settingsDocked ? "../icons/settings_undock.svg" : "../icons/settings_dock.svg"
-        width: UM.Theme.getSize("default_arrow").width
-        height: UM.Theme.getSize("default_arrow").height
+        width: UM.Theme.getSize("print_setup_icon").width
+        height: UM.Theme.getSize("print_setup_icon").height
         color: UM.Theme.getColor("small_button_text")
 
         onClicked:
diff --git a/resources/qml/ProfileSelector44.qml b/resources/qml/ProfileSelector44.qml
@@ -188,15 +188,14 @@ Item
         id: dockButton
         anchors
         {
-            top: parent.top
-            topMargin: UM.Theme.getSize("default_margin").width
+            verticalCenter: collapseButton.verticalCenter
 
             right: collapseButton.left
             rightMargin: UM.Theme.getSize("thin_margin").width
         }
         iconSource: settingsDocked ? "../icons/settings_undock.svg" : "../icons/settings_dock.svg"
-        width: UM.Theme.getSize("default_arrow").width
-        height: UM.Theme.getSize("default_arrow").height
+        width: UM.Theme.getSize("print_setup_icon").width
+        height: UM.Theme.getSize("print_setup_icon").height
         color: UM.Theme.getColor("small_button_text")
 
         onClicked:
diff --git a/resources/qml/SidebarStageMenu.qml b/resources/qml/SidebarStageMenu.qml
@@ -310,7 +310,7 @@ Item
         id: sidebarToolWindow
         title: catalog.i18nc("@title:window", "Print Settings")
 
-        flags: Qt.Tool | Qt.WindowTitleHint;
+        flags: Qt.Tool | Qt.WindowTitleHint | Qt.CustomizeWindowHint;
 
         function boolCheck(value) //Hack to ensure a good match between python and qml.
         {

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ Item`
`310`	`310`	`id: sidebarToolWindow`
`311`	`311`	`title: catalog.i18nc("@title:window", "Print Settings")`
`312`	`312`
`313`		`- flags: Qt.Tool \| Qt.WindowTitleHint;`
	`313`	`+ flags: Qt.Tool \| Qt.WindowTitleHint \| Qt.CustomizeWindowHint;`
`314`	`314`
`315`	`315`	`function boolCheck(value) //Hack to ensure a good match between python and qml.`
`316`	`316`	`{`