From e003d76c1ef8a14a57513e937dabcc464018496f Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Tue, 24 Mar 2020 16:36:09 +0100 Subject: [PATCH 1/4] Open links in materials with custom openUrl CURA-7310 --- .../resources/qml/components/ToolboxCompatibilityChart.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Toolbox/resources/qml/components/ToolboxCompatibilityChart.qml b/plugins/Toolbox/resources/qml/components/ToolboxCompatibilityChart.qml index ae9241f0ab..e1f88a473f 100644 --- a/plugins/Toolbox/resources/qml/components/ToolboxCompatibilityChart.qml +++ b/plugins/Toolbox/resources/qml/components/ToolboxCompatibilityChart.qml @@ -4,7 +4,7 @@ import QtQuick 2.10 import QtQuick.Controls 1.4 -import UM 1.1 as UM +import UM 1.5 as UM Item { @@ -203,7 +203,7 @@ Item font: UM.Theme.getFont("default") color: UM.Theme.getColor("text") linkColor: UM.Theme.getColor("text_link") - onLinkActivated: Qt.openUrlExternally(link) + onLinkActivated: UM.UrlUtil.openUrl(link, ["http", "https"]) renderType: Text.NativeRendering } } From 92cef02ee572a2879dd4f17eae1f376a052d810f Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Tue, 24 Mar 2020 16:38:25 +0100 Subject: [PATCH 2/4] Open "buy material spool" with custom openUrl CURA-7310 --- .../resources/qml/components/ToolboxDetailTileActions.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml b/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml index dfe91edbf6..868b5971c0 100644 --- a/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml +++ b/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml @@ -4,7 +4,7 @@ import QtQuick 2.10 import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 -import UM 1.1 as UM +import UM 1.5 as UM import Cura 1.1 as Cura Column @@ -85,7 +85,7 @@ Column MouseArea { anchors.fill: parent - onClicked: Qt.openUrlExternally(parent.whereToBuyUrl) + onClicked: UM.UrlUtil.openUrl(parent.whereToBuyUrl, ["https", "http"]) } } From 4f0f7dec5e55ba9825f38128a90be2ba774fbdcf Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Tue, 24 Mar 2020 16:39:51 +0100 Subject: [PATCH 3/4] Open material author page with custom openUrl CURA-7310 --- plugins/Toolbox/resources/qml/pages/ToolboxAuthorPage.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Toolbox/resources/qml/pages/ToolboxAuthorPage.qml b/plugins/Toolbox/resources/qml/pages/ToolboxAuthorPage.qml index d1abe48de1..2baa8b5210 100644 --- a/plugins/Toolbox/resources/qml/pages/ToolboxAuthorPage.qml +++ b/plugins/Toolbox/resources/qml/pages/ToolboxAuthorPage.qml @@ -4,7 +4,7 @@ import QtQuick 2.10 import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 -import UM 1.1 as UM +import UM 1.5 as UM import "../components" @@ -132,7 +132,7 @@ Item font: UM.Theme.getFont("default") color: UM.Theme.getColor("text") linkColor: UM.Theme.getColor("text_link") - onLinkActivated: Qt.openUrlExternally(link) + onLinkActivated: UM.UrlUtil.openUrl(link, ["https", "http"]) renderType: Text.NativeRendering } From eaef9f0f457dde34b9392465537c14b74a3a923e Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Tue, 24 Mar 2020 16:42:46 +0100 Subject: [PATCH 4/4] Open plugin author page with custom openUrl CURA-7310 --- plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml b/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml index 6d34e23f42..94caafb00b 100644 --- a/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml +++ b/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml @@ -4,7 +4,7 @@ import QtQuick 2.10 import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 -import UM 1.1 as UM +import UM 1.5 as UM import Cura 1.1 as Cura @@ -217,7 +217,7 @@ Item font: UM.Theme.getFont("default") color: UM.Theme.getColor("text") linkColor: UM.Theme.getColor("text_link") - onLinkActivated: Qt.openUrlExternally(link) + onLinkActivated: UM.UrlUtil.openUrl(link, ["http", "https"]) renderType: Text.NativeRendering } Label