GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 23:25:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7344 from Ultimaker/CURA-7310_Template_export_inkection_call_custom_openUrl

Browse Source 
Cura 7310 template export injection call custom open url
This commit is contained in:
Nino van Hooff 2020-03-26 15:40:39 +01:00 committed by GitHub
commit 0841124389
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/Toolbox/resources/qml/components/ToolboxCompatibilityChart.qml
View File

@ -4,7 +4,7 @@
import QtQuick 2.10 import QtQuick 2.10
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import UM 1.1 as UM import UM 1.5 as UM
Item Item
{ {
@ -203,7 +203,7 @@ Item
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
linkColor: UM.Theme.getColor("text_link") linkColor: UM.Theme.getColor("text_link")
onLinkActivated: Qt.openUrlExternally(link) onLinkActivated: UM.UrlUtil.openUrl(link, ["http", "https"])
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
} }

4
plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml
View File

@ -4,7 +4,7 @@
import QtQuick 2.10 import QtQuick 2.10
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 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 import Cura 1.1 as Cura
Column Column
@ -85,7 +85,7 @@ Column
MouseArea MouseArea
{ {
anchors.fill: parent anchors.fill: parent
onClicked: Qt.openUrlExternally(parent.whereToBuyUrl) onClicked: UM.UrlUtil.openUrl(parent.whereToBuyUrl, ["https", "http"])
} }
} }

4
plugins/Toolbox/resources/qml/pages/ToolboxAuthorPage.qml
View File

@ -4,7 +4,7 @@
import QtQuick 2.10 import QtQuick 2.10
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import UM 1.1 as UM import UM 1.5 as UM
import "../components" import "../components"
@ -132,7 +132,7 @@ Item
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
linkColor: UM.Theme.getColor("text_link") linkColor: UM.Theme.getColor("text_link")
onLinkActivated: Qt.openUrlExternally(link) onLinkActivated: UM.UrlUtil.openUrl(link, ["https", "http"])
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }

4
plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml
View File

@ -4,7 +4,7 @@
import QtQuick 2.10 import QtQuick 2.10
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 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 import Cura 1.1 as Cura
@ -217,7 +217,7 @@ Item
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
linkColor: UM.Theme.getColor("text_link") linkColor: UM.Theme.getColor("text_link")
onLinkActivated: Qt.openUrlExternally(link) onLinkActivated: UM.UrlUtil.openUrl(link, ["http", "https"])
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
Label Label