Merge branch 'master' of github.com:Ultimaker/Cura

plugins/PerObjectSettingsTool/PerObjectCategory.qml

@@ -13,7 +13,40 @@ import ".."
 Button {
     id: base;
 
-    style: UM.Theme.styles.sidebar_category;
+    style: ButtonStyle {
+        background: Item { }
+        label: Row
+        {
+            spacing: UM.Theme.getSize("default_lining").width
+
+            UM.RecolorImage
+            {
+                anchors.verticalCenter: parent.verticalCenter
+                height: label.height / 2
+                width: height
+                source: control.checked ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_right");
+                color: control.hovered ? palette.highlight : palette.buttonText
+            }
+            UM.RecolorImage
+            {
+                anchors.verticalCenter: parent.verticalCenter
+                height: label.height
+                width: height
+                source: control.iconSource
+                color: control.hovered ? palette.highlight : palette.buttonText
+            }
+            Label
+            {
+                id: label
+                anchors.verticalCenter: parent.verticalCenter
+                text: control.text
+                color: control.hovered ? palette.highlight : palette.buttonText
+                font.bold: true
+            }
+
+            SystemPalette { id: palette }
+        }
+    }
 
     signal showTooltip(string text);
     signal hideTooltip();

plugins/PerObjectSettingsTool/PerObjectItem.qml

@@ -16,17 +16,17 @@ UM.TooltipArea
     width: childrenRect.width;
     height: childrenRect.height;
 
-    Button
+    CheckBox
     {
         id: check
 
         text: definition.label
+        checked: addedSettingsModel.getVisible(model.key)
 
         onClicked:
         {
-            addedSettingsModel.setVisible(model.key, true);
-            settingPickDialog.visible = false
-            UM.ActiveTool.forceUpdate()
+            addedSettingsModel.setVisible(model.key, checked);
+            UM.ActiveTool.forceUpdate();
         }
     }
 }

plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml

@@ -147,6 +147,10 @@ Item {
             }
         }
 
+        Column
+        {
+            spacing: UM.Theme.getSize("default_lining").height
+
             Repeater
             {
                 id: contents
@@ -169,8 +173,8 @@ Item {
                     Loader
                     {
                         id: settingLoader
-                    width: UM.Theme.getSize("setting").width;
-                    height: UM.Theme.getSize("section").height;
+                        width: UM.Theme.getSize("setting").width
+                        height: UM.Theme.getSize("section").height
 
                         property var definition: model
                         property var settingDefinitionsModel: addedSettingsModel
@@ -215,7 +219,7 @@ Item {
 
                     Button
                     {
-                    width: UM.Theme.getSize("setting").height;
+                        width: UM.Theme.getSize("setting").height / 2;
                         height: UM.Theme.getSize("setting").height;
 
                         onClicked: addedSettingsModel.setVisible(model.key, false);
@@ -227,17 +231,17 @@ Item {
                                 UM.RecolorImage
                                 {
                                     anchors.verticalCenter: parent.verticalCenter
-                                anchors.horizontalCenter: parent.horizontalCenter
-                                width: parent.width/2
-                                height: parent.height/2
+                                    width: parent.width
+                                    height: parent.height / 2
                                     sourceSize.width: width
                                     sourceSize.height: width
                                     color: control.hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button")
-                                source: UM.Theme.getIcon("cross1")
+                                    source: UM.Theme.getIcon("minus")
                                 }
                             }
                         }
                     }
+
                     UM.SettingPropertyProvider
                     {
                         id: provider
@@ -250,6 +254,7 @@ Item {
                     }
                 }
             }
+        }
 
         Button
         {
@@ -257,7 +262,7 @@ Item {
             height: UM.Theme.getSize("setting").height;
             visible: parseInt(UM.Preferences.getValue("cura/active_mode")) == 1
 
-            text: catalog.i18nc("@action:button", "Add Setting");
+            text: catalog.i18nc("@action:button", "Select settings");
 
             style: ButtonStyle
             {
@@ -297,16 +302,19 @@ Item {
     UM.Dialog {
         id: settingPickDialog
 
-        title: catalog.i18nc("@title:window", "Pick a Setting to Customize")
+        title: catalog.i18nc("@title:window", "Select Settings to Customize for this object")
+        width: screenScaleFactor * 360;
+
         property string labelFilter: ""
 
         TextField {
-            id: filter;
+            id: filter
 
             anchors {
-                top: parent.top;
-                left: parent.left;
-                right: parent.right;
+                top: parent.top
+                left: parent.left
+                right: toggleShowAll.left
+                rightMargin: UM.Theme.getSize("default_margin").width
             }
 
             placeholderText: catalog.i18nc("@label:textbox", "Filter...");
@@ -324,6 +332,23 @@ Item {
             }
         }
 
+        CheckBox
+        {
+            id: toggleShowAll
+
+            anchors {
+                top: parent.top
+                right: parent.right
+            }
+
+            text: catalog.i18nc("@label:checkbox", "Show all")
+            checked: listview.model.showAll
+            onClicked:
+            {
+                listview.model.showAll = checked;
+            }
+        }
+
         ScrollView
         {
             id: scrollView
@@ -377,7 +402,7 @@ Item {
 
         rightButtons: [
             Button {
-                text: catalog.i18nc("@action:button", "Cancel");
+                text: catalog.i18nc("@action:button", "Close");
                 onClicked: {
                     settingPickDialog.visible = false;
                 }