Просмотр исходного кода

Add links to Ultimaker's platform websites

The links are not final since they will need some campaign tags. For the rest it should be more or less done.

Contributes to issue CURA-8422.
Ghostkeeper 3 лет назад
Родитель
Сommit
c518f0de93

+ 54 - 5
resources/qml/ApplicationSwitcher/ApplicationSwitcher.qml

@@ -86,11 +86,60 @@ Item
 
                         model:
                         [
-                            { displayName: "Report issue1", thumbnail: UM.Theme.getIcon("Bug"), description: "This is the description1", link: "https://github.com/Ultimaker/Cura/issues/1" },
-                            { displayName: "My printers", thumbnail: UM.Theme.getIcon("Bug"), description: "This is the description2", link: "https://github.com/Ultimaker/Cura/issues/2" },
-                            { displayName: "Ultimaker.com", thumbnail: UM.Theme.getIcon("Bug"), description: "This is the description3", link: "https://ultimaker.com" },
-                            { displayName: "Report issue4", thumbnail: UM.Theme.getIcon("Bug"), description: "This is the description4", link: "https://github.com/Ultimaker/Cura/issues/4" },
-                            { displayName: "Report issue5", thumbnail: UM.Theme.getIcon("Bug"), description: "This is the description5", link: "https://github.com/Ultimaker/Cura/issues/5" }
+                            {
+                                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."),
+                                link: "https://digitalfactory.ultimaker.com/app/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."),
+                                link: "https://digitalfactory.ultimaker.com/app/library"
+                            },
+                            {
+                                displayName: catalog.i18nc("@label:button", "Print jobs"),
+                                thumbnail: UM.Theme.getIcon("FoodBeverages"),
+                                description: catalog.i18nc("@tooltip:button", "Manage things that are being printed."),
+                                link: "https://digitalfactory.ultimaker.com/app/print-jobs"
+                            },
+                            {
+                                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."),
+                                link: "https://marketplace.ultimaker.com/"
+                            },
+                            {
+                                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."),
+                                link: "https://academy.ultimaker.com/"
+                            },
+                            {
+                                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."),
+                                link: "https://support.ultimaker.com/"
+                            },
+                            {
+                                displayName: catalog.i18nc("@label:button", "Ask a question"),
+                                thumbnail: UM.Theme.getIcon("Speak", "high"),
+                                description: catalog.i18nc("@tooltip:button", "Consult the Ultimaker community."),
+                                link: "https://community.ultimaker.com/"
+                            },
+                            {
+                                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."),
+                                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."),
+                                link: "https://ultimaker.com/"
+                            }
                         ]
 
                         delegate: ApplicationButton

Разница между файлами не показана из-за своего большого размера
+ 1 - 0
resources/themes/cura-light/icons/default/Browser.svg


+ 2 - 2
resources/themes/cura-light/icons/default/Bug.svg

@@ -1,3 +1,3 @@
-<svg viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M42 12C42 15.5 39.4 18.4 36 18.9V24H42V26H36V31V31.1C39.4 31.6 42 34.5 42 38H40C40 35.5 38.2 33.5 35.8 33.1C34.8 38.7 29.9 43 24 43C18.1 43 13.2 38.7 12.2 33.1C9.8 33.5 8 35.5 8 38H6C6 34.5 8.6 31.6 12 31.1V31V26H6V24H12V18.9C8.6 18.4 6 15.5 6 12H8C8 14.4 9.7 16.4 12 16.9C12.1 10.3 17.4 5 24 5C30.6 5 35.9 10.3 36 16.9C38.3 16.4 40 14.4 40 12H42ZM34 17C34 11.5 29.5 7 24 7C18.5 7 14 11.5 14 17H34ZM14 19V31C14 36.2 18 40.4 23 40.9V19H14ZM25 19V40.9C30 40.4 34 36.2 34 31V19H25ZM24 11.9L27.6 10.1L28.4 11.9L26.2 13L28.4 14.1L27.6 15.9L24 14.1L20.4 15.9L19.6 14.1L21.8 13L19.6 11.9L20.4 10.1L24 11.9Z" fill="black"/>
+<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+<path d="M18 9.9C18.2 9.9 18.4 9.8 18.5 9.7C19 9.5 19.4 9.2 19.8 8.8C20.2 8.4 20.5 8 20.7 7.5C20.9 7 21 6.5 21 6H19C19 6.3 18.9 6.5 18.8 6.8C18.7 7 18.6 7.3 18.4 7.4C18.2 7.6 18.1 7.7 17.9 7.8C17.8 7.4 17.7 7.1 17.6 6.7C17.3 6 16.9 5.3 16.3 4.8C15.7 4.2 15.1 3.8 14.4 3.5C12.9 2.9 11.3 2.9 9.8 3.5C9 3.8 8.3 4.2 7.8 4.8C7.2 5.3 6.8 6 6.5 6.7C6.3 7.1 6.2 7.4 6.1 7.8C5.9 7.7 5.7 7.6 5.6 7.4C5.4 7.2 5.3 7 5.2 6.8C5.1 6.5 5 6.3 5 6H3C3 6.5 3.1 7 3.3 7.5C3.5 8 3.8 8.5 4.2 8.8C4.5 9.2 5 9.5 5.5 9.7C5.6 9.8 5.8 9.8 6 9.9V11H3V13H6V15V15.1C5.8 15.1 5.6 15.2 5.5 15.3C5 15.5 4.6 15.8 4.2 16.2C3.8 16.6 3.5 17 3.3 17.5C3.1 18 3 18.5 3 19H5C5 18.7 5.1 18.5 5.2 18.2C5.3 18 5.4 17.7 5.6 17.6C5.8 17.4 6 17.3 6.2 17.2C6.3 17.2 6.3 17.2 6.4 17.2C6.4 17.3 6.4 17.3 6.5 17.4C6.8 18.1 7.2 18.8 7.8 19.3C8.4 19.9 9 20.3 9.7 20.6C10.4 20.9 11.2 21 12 21C12.8 21 13.6 20.8 14.3 20.5C15 20.2 15.7 19.8 16.2 19.2C16.8 18.6 17.2 18 17.5 17.3C17.5 17.2 17.5 17.2 17.6 17.1C17.7 17.1 17.7 17.1 17.8 17.1C18 17.2 18.3 17.3 18.4 17.5C18.6 17.7 18.7 17.9 18.8 18.2C18.9 18.4 19 18.7 19 19H21C21 18.5 20.9 18 20.7 17.5C20.5 17 20.2 16.6 19.8 16.2C19.4 15.8 19 15.5 18.5 15.3C18.3 15.2 18.1 15.2 18 15.1V15V13H21V11H18V9.9ZM9.2 6.2C9.5 5.8 10 5.5 10.5 5.3C11.5 4.9 12.6 4.9 13.6 5.3C14.1 5.5 14.5 5.8 14.9 6.2C15.3 6.6 15.6 7 15.8 7.5C15.9 7.7 15.9 7.9 16 8H8.1C8.1 7.8 8.2 7.6 8.3 7.5C8.5 7 8.8 6.5 9.2 6.2ZM9.2 17.8C8.8 17.4 8.5 17 8.3 16.5C8.1 16 8 15.5 8 15V10H11V18.9C10.8 18.9 10.6 18.8 10.5 18.7C10 18.5 9.5 18.2 9.2 17.8ZM15.7 16.5C15.5 17 15.2 17.4 14.8 17.8C14.4 18.2 14 18.5 13.5 18.7C13.3 18.8 13.1 18.8 13 18.9V10H16V15C16 15.5 15.9 16 15.7 16.5Z" />
 </svg>

Разница между файлами не показана из-за своего большого размера
+ 1 - 0
resources/themes/cura-light/icons/default/FoodBeverages.svg


+ 3 - 0
resources/themes/cura-light/icons/default/Help.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 22C10.0222 22 8.08879 21.4135 6.4443 20.3147C4.79981 19.2159 3.51809 17.6541 2.76121 15.8268C2.00433 13.9996 1.8063 11.9889 2.19215 10.0491C2.578 8.10929 3.53041 6.32746 4.92894 4.92894C6.32746 3.53041 8.10929 2.578 10.0491 2.19215C11.9889 1.8063 13.9996 2.00433 15.8268 2.76121C17.6541 3.51809 19.2159 4.79981 20.3147 6.4443C21.4135 8.08879 22 10.0222 22 12C21.997 14.6512 20.9424 17.193 19.0677 19.0677C17.193 20.9424 14.6512 21.997 12 22ZM12 4C10.4178 4 8.87104 4.4692 7.55544 5.34825C6.23985 6.2273 5.21447 7.47673 4.60897 8.93854C4.00347 10.4003 3.84504 12.0089 4.15372 13.5607C4.4624 15.1126 5.22433 16.538 6.34315 17.6569C7.46197 18.7757 8.88743 19.5376 10.4393 19.8463C11.9911 20.155 13.5997 19.9965 15.0615 19.391C16.5233 18.7855 17.7727 17.7602 18.6518 16.4446C19.5308 15.129 20 13.5823 20 12C19.9976 9.87902 19.1539 7.8456 17.6542 6.34584C16.1544 4.84608 14.121 4.00244 12 4ZM13.9717 13.7749C14.6315 13.4014 15.1721 12.8488 15.531 12.1809C15.8899 11.5131 16.0525 10.7574 16 10.001C15.9818 9.32486 15.8182 8.66055 15.5205 8.0532C15.1975 7.40521 14.6923 6.86569 14.0668 6.50093C13.4414 6.13617 12.723 5.96206 12 6C11.2771 5.96216 10.5588 6.13631 9.93346 6.50107C9.30813 6.86582 8.80296 7.40529 8.48 8.0532C8.18212 8.66052 8.01841 9.32482 8 10.001L10 10.0063C9.98182 9.73868 10.021 9.47026 10.115 9.21902C10.209 8.96778 10.3556 8.73953 10.545 8.54956C10.7344 8.35959 10.9621 8.21228 11.2131 8.1175C11.464 8.02272 11.7323 7.98266 12 8C12.2672 7.98248 12.535 8.02219 12.7856 8.1165C13.0362 8.21081 13.2638 8.35754 13.4531 8.54687C13.6425 8.73621 13.7892 8.96378 13.8835 9.21438C13.9778 9.46498 14.0175 9.73282 14 10C14.0478 10.3918 13.9823 10.7891 13.8113 11.1448C13.6404 11.5006 13.371 11.7999 13.0352 12.0073C12.4508 12.2669 11.9506 12.6847 11.591 13.2135C11.2314 13.7423 11.0267 14.3611 11 15H13C13 14.3569 13.6768 13.93 13.9717 13.7749ZM13 16H11V18H13V16Z" />
+</svg>

Разница между файлами не показана из-за своего большого размера
+ 1 - 0
resources/themes/cura-light/icons/default/Knowledge.svg


+ 3 - 0
resources/themes/cura-light/icons/default/Library.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+<path d="M20 9V6H18V3H6V6H4V9H2V18C1.99948 18.3941 2.07671 18.7845 2.22729 19.1487C2.37787 19.5129 2.59883 19.8438 2.87751 20.1225C3.15619 20.4012 3.48712 20.6221 3.85133 20.7727C4.21554 20.9233 4.60589 21.0005 5 21H19C19.3941 21.0005 19.7845 20.9233 20.1487 20.7727C20.5129 20.6221 20.8438 20.4012 21.1225 20.1225C21.4012 19.8438 21.6221 19.5129 21.7727 19.1487C21.9233 18.7845 22.0005 18.3941 22 18V9H20ZM8 5H16V6H8V5ZM6 8H18V9H6V8ZM20 19H4V11H20V19ZM10 13H14V15H10V13Z" />
+</svg>

+ 3 - 0
resources/themes/cura-light/icons/default/Shop.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+<path d="M19 3H5C4.20435 3 3.44129 3.31607 2.87868 3.87868C2.31607 4.44129 2 5.20435 2 6V9C2.00225 9.69895 2.18821 10.385 2.53924 10.9894C2.89027 11.5939 3.39402 12.0954 4 12.4437V22H20V12.4437C20.606 12.0954 21.1097 11.5939 21.4608 10.9894C21.8118 10.385 21.9977 9.69895 22 9V6C22 5.20435 21.6839 4.44129 21.1213 3.87868C20.5587 3.31607 19.7956 3 19 3ZM10 5H14V9C14 9.53043 13.7893 10.0391 13.4142 10.4142C13.0391 10.7893 12.5304 11 12 11C11.4696 11 10.9609 10.7893 10.5858 10.4142C10.2107 10.0391 10 9.53043 10 9V5ZM4 9V5H8V9C8 9.53043 7.78929 10.0391 7.41421 10.4142C7.03914 10.7893 6.53043 11 6 11C5.46957 11 4.96086 10.7893 4.58579 10.4142C4.21071 10.0391 4 9.53043 4 9ZM18 20H14V15H10V20H6V13C6.56991 12.9982 7.13276 12.8738 7.65038 12.6353C8.168 12.3968 8.62828 12.0498 9 11.6178C9.37052 12.0512 9.83056 12.3992 10.3485 12.6378C10.8663 12.8764 11.4298 13 12 13C12.5702 13 13.1337 12.8764 13.6515 12.6378C14.1694 12.3992 14.6295 12.0512 15 11.6178C15.3717 12.0498 15.832 12.3968 16.3496 12.6353C16.8672 12.8738 17.4301 12.9982 18 13V20ZM20 9C20 9.53043 19.7893 10.0391 19.4142 10.4142C19.0391 10.7893 18.5304 11 18 11C17.4696 11 16.9609 10.7893 16.5858 10.4142C16.2107 10.0391 16 9.53043 16 9V5H20V9Z" />
+</svg>

+ 3 - 0
resources/themes/cura-light/icons/default/Speak.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 6V7H5C4.20435 7 3.44129 7.31607 2.87868 7.87868C2.31607 8.44129 2 9.20435 2 10V15C2 15.7956 2.31607 16.5587 2.87868 17.1213C3.44129 17.6839 4.20435 18 5 18H6V22L10 18H15C15.7956 18 16.5587 17.6839 17.1213 17.1213C17.6839 16.5587 18 15.7956 18 15V14H19C19.7956 14 20.5587 13.6839 21.1213 13.1213C21.6839 12.5587 22 11.7956 22 11V6C22 5.20435 21.6839 4.44129 21.1213 3.87868C20.5587 3.31607 19.7956 3 19 3H9C8.20435 3 7.44129 3.31607 6.87868 3.87868C6.31607 4.44129 6 5.20435 6 6ZM16 16H4V9H16V16ZM20 12H18V10C18 9.20435 17.6839 8.44129 17.1213 7.87868C16.5587 7.31607 15.7956 7 15 7H8V5H20V12Z" />
+</svg>

+ 3 - 0
resources/themes/cura-light/icons/high/Bug.svg

@@ -0,0 +1,3 @@
+<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+<path d="M42 12C42 15.5 39.4 18.4 36 18.9V24H42V26H36V31V31.1C39.4 31.6 42 34.5 42 38H40C40 35.5 38.2 33.5 35.8 33.1C34.8 38.7 29.9 43 24 43C18.1 43 13.2 38.7 12.2 33.1C9.8 33.5 8 35.5 8 38H6C6 34.5 8.6 31.6 12 31.1V31V26H6V24H12V18.9C8.6 18.4 6 15.5 6 12H8C8 14.4 9.7 16.4 12 16.9C12.1 10.3 17.4 5 24 5C30.6 5 35.9 10.3 36 16.9C38.3 16.4 40 14.4 40 12H42ZM34 17C34 11.5 29.5 7 24 7C18.5 7 14 11.5 14 17H34ZM14 19V31C14 36.2 18 40.4 23 40.9V19H14ZM25 19V40.9C30 40.4 34 36.2 34 31V19H25ZM24 11.9L27.6 10.1L28.4 11.9L26.2 13L28.4 14.1L27.6 15.9L24 14.1L20.4 15.9L19.6 14.1L21.8 13L19.6 11.9L20.4 10.1L24 11.9Z" />
+</svg>

Некоторые файлы не были показаны из-за большого количества измененных файлов