Merge branch 'CURA-8422_style_tooltips' into CURA-8421_Introduce_app_switcher

resources/bundled_packages/cura.json

@@ -124,7 +124,7 @@
             "package_type": "plugin",
             "display_name": "Ultimaker Digital Library",
             "description": "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library.",
-            "package_version": "1.0.0",
+            "package_version": "1.1.0",
             "sdk_version": "7.8.0",
             "website": "https://ultimaker.com",
             "author": {

resources/qml/ApplicationSwitcher/ApplicationButton.qml

@@ -20,7 +20,7 @@ Button
     Behavior on backgroundColor { ColorAnimation { duration: 200; } }
     Behavior on borderColor { ColorAnimation { duration: 200; } }
 
-
+    hoverEnabled: true
     width: UM.Theme.getSize("application_switcher_item").width
     height: UM.Theme.getSize("application_switcher_item").height
 
@@ -31,10 +31,11 @@ Button
         border.width: UM.Theme.getSize("default_lining").width
     }
 
-    UM.TooltipArea
+    Cura.ToolTip
     {
         id: tooltip
-        anchors.fill: parent
+        tooltipText: base.text
+        visible: base.hovered
     }
 
     Column

resources/qml/ApplicationSwitcher/ApplicationSwitcherPopup.qml

@@ -31,55 +31,55 @@ Popup
                 {
                     displayName: catalog.i18nc("@label:button", "My printers"),
                     thumbnail: UM.Theme.getIcon("PrinterTriple", "high"),
-                    description: catalog.i18nc("@tooltip:button", "Manage your printers in the Digital Factory."),
+                    description: catalog.i18nc("@tooltip:button", "Monitor printers in Ultimaker Digital Factory."),
                     link: "https://digitalfactory.ultimaker.com/app/printers?utm_source=cura&utm_medium=software&utm_campaign=switcher-digital-factory-printers"
                 },
                 {
                     displayName: "Digital Library", //Not translated, since it's a brand name.
                     thumbnail: UM.Theme.getIcon("Library", "high"),
-                    description: catalog.i18nc("@tooltip:button", "Manage your files in the Digital Library."),
+                    description: catalog.i18nc("@tooltip:button", "Create print projects in Digital Library."),
                     link: "https://digitalfactory.ultimaker.com/app/library?utm_source=cura&utm_medium=software&utm_campaign=switcher-library"
                 },
                 {
                     displayName: catalog.i18nc("@label:button", "Print jobs"),
                     thumbnail: UM.Theme.getIcon("FoodBeverages"),
-                    description: catalog.i18nc("@tooltip:button", "Manage things that are being printed."),
+                    description: catalog.i18nc("@tooltip:button", "Monitor print jobs and reprint from your print history."),
                     link: "https://digitalfactory.ultimaker.com/app/print-jobs?utm_source=cura&utm_medium=software&utm_campaign=switcher-digital-factory- printjobs"
                 },
                 {
                     displayName: "Ultimaker Marketplace", //Not translated, since it's a brand name.
                     thumbnail: UM.Theme.getIcon("Shop", "high"),
-                    description: catalog.i18nc("@tooltip:button", "Extend Ultimaker Cura with new plug-ins and profiles."),
+                    description: catalog.i18nc("@tooltip:button", "Extend Ultimaker Cura with plugins and material profiles."),
                     link: "https://marketplace.ultimaker.com/?utm_source=cura&utm_medium=software&utm_campaign=switcher-marketplace-materials"
                 },
                 {
                     displayName: "Ultimaker Academy", //Not translated, since it's a brand name.
                     thumbnail: UM.Theme.getIcon("Knowledge"),
-                    description: catalog.i18nc("@tooltip:button", "Become an expert in 3D printing."),
+                    description: catalog.i18nc("@tooltip:button", "Become a 3D printing expert with Ultimaker e-learning."),
                     link: "https://academy.ultimaker.com/?utm_source=cura&utm_medium=software&utm_campaign=switcher-academy"
                 },
                 {
                     displayName: catalog.i18nc("@label:button", "Ultimaker support"),
                     thumbnail: UM.Theme.getIcon("Help", "high"),
-                    description: catalog.i18nc("@tooltip:button", "Get help with how to use Ultimaker Cura."),
+                    description: catalog.i18nc("@tooltip:button", "Learn how to get started with Ultimaker Cura."),
                     link: "https://support.ultimaker.com/?utm_source=cura&utm_medium=software&utm_campaign=switcher-support"
                 },
                 {
                     displayName: catalog.i18nc("@label:button", "Ask a question"),
                     thumbnail: UM.Theme.getIcon("Speak", "high"),
-                    description: catalog.i18nc("@tooltip:button", "Consult the Ultimaker community."),
+                    description: catalog.i18nc("@tooltip:button", "Consult the Ultimaker Community."),
                     link: "https://community.ultimaker.com/?utm_source=cura&utm_medium=software&utm_campaign=switcher-community"
                 },
                 {
                     displayName: catalog.i18nc("@label:button", "Report a bug"),
                     thumbnail: UM.Theme.getIcon("Bug", "high"),
-                    description: catalog.i18nc("@tooltip:button", "Notify the developers that something is going wrong."),
+                    description: catalog.i18nc("@tooltip:button", "Let developers know that something is going wrong."),
                     link: "https://github.com/Ultimaker/Cura/issues/new/choose"
                 },
                 {
                     displayName: "Ultimaker.com", //Not translated, since it's a URL.
                     thumbnail: UM.Theme.getIcon("Browser"),
-                    description: catalog.i18nc("@tooltip:button", "Visit Ultimaker's website."),
+                    description: catalog.i18nc("@tooltip:button", "Visit the Ultimaker website."),
                     link: "https://ultimaker.com/?utm_source=cura&utm_medium=software&utm_campaign=switcher-umwebsite"
                 }
             ]

resources/texts/change_log.txt

@@ -98,7 +98,7 @@ When double clicking on a file in the open project dialog in Digital Factory it
 - Fixed a bug when the seam was not placed in sharpest corner.
 - Fixed the gantry height for S-line printers. 
 - Fixed a bug where a model is partially below build plate if center selected model is used.
-- Fixed a bug where a tootip arrow appeared when the "Manage printers" button is hovered.
+- Fixed a bug where a tooltip arrow appeared when the "Manage printers" button is hovered.
 - Fixed a bug where assemblies were not arranged in the center of the build plate. 
 
 * Printer definitions, profiles and materials.