Merge branch '2.6'

cura/Settings/CuraContainerStack.py

@@ -5,7 +5,7 @@ import os.path
 
 from typing import Any, Optional
 
-from PyQt5.QtCore import pyqtProperty, pyqtSignal
+from PyQt5.QtCore import pyqtProperty, pyqtSignal, QObject
 from UM.FlameProfiler import pyqtSlot
 
 from UM.Decorators import override
@@ -250,7 +250,7 @@ class CuraContainerStack(ContainerStack):
     ##  Get the definition container.
     #
     #   \return The definition container. Should always be a valid container, but can be equal to the empty InstanceContainer.
-    @pyqtProperty(DefinitionContainer, fset = setDefinition, notify = pyqtContainersChanged)
+    @pyqtProperty(QObject, fset = setDefinition, notify = pyqtContainersChanged)
     def definition(self) -> DefinitionContainer:
         return self._containers[_ContainerIndexes.Definition]
 

cura/Settings/MachineManager.py

@@ -470,7 +470,7 @@ class MachineManager(QObject):
 
         return ""
 
-    @pyqtProperty("QObject", notify = globalContainerChanged)
+    @pyqtProperty(QObject, notify = globalContainerChanged)
     def activeMachine(self) -> "GlobalStack":
         return self._global_container_stack
 

plugins/ChangeLogPlugin/ChangeLog.txt

@@ -6,7 +6,7 @@ Cura 2.6 beta has local version folders, which means the new version won’t ove
 We’ve added extra support settings to allow the creation of improved support profiles with better PVA/PLA adhesion. The Support Interface settings, such as speed and density, are now split up into Support Roof and Support Floor settings.
 
 *Multi-extrusion support for custom FDM printers
-Custom third-party printers and Ultimaker modifications now have multi-extrusion support.
+Custom third-party printers and Ultimaker modifications now have multi-extrusion support. Thanks to Aldo Hoeben for this feature.
 
 *Model auto-arrange
 We’ve improved placing multiple models or multiplying the same ones, making it easier to arrange your build plate. If there’s not enough build plate space or the model is placed beyond the build plate, you can rectify this by selecting ‘Arrange all models’ in the context menu or by pressing Command+R (MacOS) or Ctrl+R (Windows and Linux). Cura 2.6 beta will then find a better solution for model positioning.
@@ -42,16 +42,27 @@ It’s a lot simpler to save and open files, and Cura will know if it’s a proj
 If you have a custom theme, you can now apply it more easily in the preferences screen.
 
 *Time estimates per feature
+<<<<<<< HEAD
 You can hover over the print time estimate in the lower right corner to see how the printing time is divided over the printing features (walls, infill, etc.).
+=======
+You can hover over the print time estimate in the lower right corner to see how the printing time is divided over the printing features (walls, infill, etc.). Thanks to 14bitVoid for this feature.
+>>>>>>> 2.6
 
 *Invert the direction of camera zoom
 We’ve added an option to invert mouse direction for a better user experience.
 
 *Olsson block upgrade
+<<<<<<< HEAD
 Ultimaker 2 users can now specify if they have the Olsson block installed on their machine.
 
 *OctoPrint plugin
 Cura 2.6 beta allows users to send prints to OctoPrint.
+=======
+Ultimaker 2 users can now specify if they have the Olsson block installed on their machine. Thanks to Aldo Hoeben for this feature.
+
+*OctoPrint plugin
+Cura 2.6 beta allows users to send prints to OctoPrint. Thanks to Aldo Hoeben for this feature.
+>>>>>>> 2.6
 
 *Bug fixes
 - Post Processing plugin

resources/qml/SidebarHeader.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Ultimaker B.V.
+// Copyright (c) 2017 Ultimaker B.V.
 // Cura is released under the terms of the AGPLv3 or higher.
 
 import QtQuick 2.2
@@ -159,7 +159,7 @@ Column
         visible: !extruderSelectionRow.visible
     }
 
-    Row
+    Item
     {
         id: variantRow
 
@@ -196,16 +196,59 @@ Column
             }
 
             anchors.verticalCenter: parent.verticalCenter
-            width: parent.width * 0.45 - UM.Theme.getSize("default_margin").width
+            anchors.left: variantRow.left
+            width: parent.width * 0.30
             font: UM.Theme.getFont("default");
             color: UM.Theme.getColor("text");
         }
 
+        Button
+        {
+            id: materialInfoButton
+            height: parent.height * 0.70
+            width: height
+
+            anchors.left: variantLabel.right
+            anchors.leftMargin: UM.Theme.getSize("default_margin").width * 2
+            anchors.verticalCenter: parent.verticalCenter
+
+            visible: extrudersList.visible
+
+            text: "i"
+            style: UM.Theme.styles.info_button
+
+            onClicked:
+            {
+                // open the material URL with web browser
+                var version = UM.Application.version;
+                var machineName = Cura.MachineManager.activeMachine.definition.id;
+
+                var url = "https://ultimaker.com/materialcompatibility/" + version + "/" + machineName;
+                Qt.openUrlExternally(url);
+            }
+
+            onHoveredChanged:
+            {
+                if (hovered)
+                {
+                    var content = catalog.i18nc("@tooltip", "Click to check the material compatibility on Ultimaker.com.");
+                    base.showTooltip(
+                        extruderSelectionRow, Qt.point(0, extruderSelectionRow.height + variantRow.height / 2), catalog.i18nc("@tooltip", content)
+                    );
+                }
+                else
+                {
+                    base.hideTooltip();
+                }
+            }
+        }
+
         Item
         {
             anchors.verticalCenter: parent.verticalCenter
+            anchors.right: parent.right
 
-            width: parent.width * 0.55 + UM.Theme.getSize("default_margin").width
+            width: parent.width * 0.50 + UM.Theme.getSize("default_margin").width
             height: UM.Theme.getSize("setting_control").height
 
             ToolButton {

resources/themes/cura/styles.qml

@@ -8,6 +8,37 @@ import QtQuick.Controls.Styles 1.1
 import UM 1.1 as UM
 
 QtObject {
+    property Component info_button: Component {
+        ButtonStyle {
+            label: Text {
+                renderType: Text.NativeRendering
+                verticalAlignment: Text.AlignVCenter
+                horizontalAlignment: Text.AlignHCenter
+                font: UM.Theme.getFont("small")
+                color: UM.Theme.getColor("button_text")
+                text: control.text
+            }
+
+            background: Rectangle {
+                implicitHeight: UM.Theme.getSize("info_button").height
+                implicitWidth: width
+                border.width: 0
+                radius: height * 0.5
+
+                color: {
+                    if (control.pressed) {
+                        return UM.Theme.getColor("button_active");
+                    } else if (control.hovered) {
+                        return UM.Theme.getColor("button_hover");
+                    } else {
+                        return UM.Theme.getColor("button");
+                    }
+                }
+                Behavior on color { ColorAnimation { duration: 50; } }
+            }
+        }
+    }
+
     property Component mode_switch: Component {
         SwitchStyle {
             groove: Rectangle {

resources/themes/cura/theme.json

@@ -329,6 +329,8 @@
 
         "infill_button_margin": [0.5, 0.5],
 
-        "jobspecs_line": [2.0, 2.0]
+        "jobspecs_line": [2.0, 2.0],
+
+        "info_button": [0.6, 0.6]
     }
 }