Merge branch 'Ultimaker:master' into Rigid3D

resources/qml/Actions.qml

@@ -79,7 +79,7 @@ Item
     {
         id: showTroubleShootingAction
         onTriggered: Qt.openUrlExternally("https://ultimaker.com/en/troubleshooting?utm_source=cura&utm_medium=software&utm_campaign=dropdown-troubleshooting")
-        text: catalog.i18nc("@action:inmenu", "Show Online Troubleshooting Guide")
+        text: catalog.i18nc("@action:inmenu", "Show Online Troubleshooting")
     }
 
     Action

resources/qml/MainWindow/ApplicationMenu.qml

@@ -34,14 +34,16 @@ Item
             {
                 text: menuBarItem.text.replace(new RegExp("&([A-Za-z])"), function (match, character)
                 {
-                    return `<u>${character}</u>`;
+                    return `<u>${character}</u>`
                 })
                 horizontalAlignment: Text.AlignLeft
                 verticalAlignment: Text.AlignVCenter
             }
-
+            leftPadding: UM.Theme.getSize("default_margin").width
+            rightPadding: UM.Theme.getSize("default_margin").width
             background: Rectangle
             {
+
                 color: menuBarItem.highlighted ? UM.Theme.getColor("background_2") : "transparent"
             }
         }

resources/qml/Preferences/ProfilesPage.qml

@@ -76,10 +76,10 @@ UM.ManagementPage
 
             enabled: !Cura.MachineManager.stacksHaveErrors
             visible: base.canCreateProfile
-
+            tooltip: catalog.i18nc("@action:tooltip", "Create new profile from current settings/overrides")
             onClicked:
             {
-                createQualityDialog.object = Cura.ContainerManager.makeUniqueName(base.currentItem.name)
+                createQualityDialog.object = Cura.ContainerManager.makeUniqueName("<new name>")
                 createQualityDialog.open()
                 createQualityDialog.selectText()
             }
@@ -315,6 +315,13 @@ UM.ManagementPage
                 font: UM.Theme.getFont("large_bold")
                 elide: Text.ElideRight
             }
+            UM.Label
+            {
+                anchors.left: parent.left
+                anchors.right: parent.right
+                text: catalog.i18nc("@action:label", "Some settings from current profile were overwritten.")
+                visible: currentSettingsActions.visible
+            }
 
             Flow
             {
@@ -322,12 +329,13 @@ UM.ManagementPage
                 width: parent.width
 
                 visible: base.hasCurrentItem && base.currentItem.name == Cura.MachineManager.activeQualityOrQualityChangesName && base.currentItem.intent_category == Cura.MachineManager.activeIntentCategory
-
+                spacing: UM.Theme.getSize("default_margin").width
                 Cura.SecondaryButton
                 {
-                    text: catalog.i18nc("@action:button", "Update profile with current settings/overrides")
+                    text: catalog.i18nc("@action:button", "Update profile.")
                     enabled: Cura.MachineManager.hasUserSettings && objectList.currentIndex && !objectList.currentIndex.is_read_only
                     onClicked: Cura.ContainerManager.updateQualityChanges()
+                    tooltip: catalog.i18nc("@action:tooltip", "Update profile with current settings/overrides")
                 }
 
                 Cura.SecondaryButton

resources/qml/SecondaryButton.qml

@@ -12,7 +12,8 @@ Cura.ActionButton
     color: UM.Theme.getColor("secondary_button")
     textColor: UM.Theme.getColor("secondary_button_text")
     outlineColor: UM.Theme.getColor("border_accent_1")
-    disabledColor: UM.Theme.getColor("action_button_disabled")
+    disabledColor: UM.Theme.getColor("secondary_button")
     textDisabledColor: UM.Theme.getColor("action_button_disabled_text")
     hoverColor: UM.Theme.getColor("secondary_button_hover")
+    outlineDisabledColor: UM.Theme.getColor("action_button_disabled_text")
 }

resources/qml/Settings/SettingView.qml

@@ -180,7 +180,7 @@ Item
     ListView
     {
         id: contents
-
+        maximumFlickVelocity: 1000
         anchors
         {
             top: filterContainer.bottom

resources/qml/Widgets/ComboBox.qml

@@ -57,9 +57,7 @@ ComboBox
     contentItem: UM.Label
     {
         id: contentLabel
-        anchors.left: parent.left
-        anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width
-        anchors.verticalCenter: parent.verticalCenter
+        leftPadding: UM.Theme.getSize("setting_unit_margin").width + UM.Theme.getSize("default_margin").width
         anchors.right: downArrow.left
         wrapMode: Text.NoWrap
         text:

resources/qml/Widgets/MenuSeparator.qml

@@ -18,4 +18,5 @@ MenuSeparator
         implicitHeight: UM.Theme.getSize("default_lining").height
         color: UM.Theme.getColor("setting_control_border")
     }
+    height: visible ? implicitHeight: 0
 }