diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml index a1077f5fb7..1389801bca 100644 --- a/resources/qml/Actions.qml +++ b/resources/qml/Actions.qml @@ -58,6 +58,7 @@ Item property alias showProfileFolder: showProfileFolderAction; property alias documentation: documentationAction; + property alias showTroubleshooting: showTroubleShootingAction property alias reportBug: reportBugAction; property alias about: aboutAction; @@ -69,18 +70,26 @@ Item UM.I18nCatalog{id: catalog; name: "cura"} + + Action + { + id: showTroubleShootingAction + onTriggered: Qt.openUrlExternally("https://ultimaker.com/en/troubleshooting") + text: catalog.i18nc("@action:inmenu", "Show Online Troubleshooting Guide"); + } + Action { id:toggleFullScreenAction shortcut: StandardKey.FullScreen; - text: catalog.i18nc("@action:inmenu","Toggle Full Screen"); + text: catalog.i18nc("@action:inmenu", "Toggle Full Screen"); iconName: "view-fullscreen"; } Action { id: undoAction; - text: catalog.i18nc("@action:inmenu menubar:edit","&Undo"); + text: catalog.i18nc("@action:inmenu menubar:edit", "&Undo"); iconName: "edit-undo"; shortcut: StandardKey.Undo; onTriggered: UM.OperationStack.undo(); diff --git a/resources/qml/MainWindow/ApplicationMenu.qml b/resources/qml/MainWindow/ApplicationMenu.qml index a694b8e403..2f18df8914 100644 --- a/resources/qml/MainWindow/ApplicationMenu.qml +++ b/resources/qml/MainWindow/ApplicationMenu.qml @@ -97,6 +97,7 @@ Item title: catalog.i18nc("@title:menu menubar:toplevel", "&Help") MenuItem { action: Cura.Actions.showProfileFolder } + MenuItem { action: Cura.Actions.showTroubleshooting} MenuItem { action: Cura.Actions.documentation } MenuItem { action: Cura.Actions.reportBug } MenuSeparator { } diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml index 44b3abf7cd..6885f8c041 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml @@ -68,11 +68,6 @@ Item // TODO Create a reusable component with these properties to not define them separately for each component labelColumnWidth: parent.firstColumnWidth } - - RecommendedTroubleshootingGuides - { - width: parent.width - } } UM.SettingPropertyProvider diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedTroubleshootingGuides.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedTroubleshootingGuides.qml deleted file mode 100644 index e6706421bb..0000000000 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedTroubleshootingGuides.qml +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) 2019 Ultimaker B.V. -// Cura is released under the terms of the LGPLv3 or higher. - -import QtQuick 2.10 -import QtQuick.Controls 1.4 -import QtQuick.Controls.Styles 1.4 - -import UM 1.2 as UM -import Cura 1.0 as Cura - - -Item -{ - id: tipsCell - anchors.top: adhesionCheckBox.visible ? adhesionCheckBox.bottom : (enableSupportCheckBox.visible ? supportExtruderCombobox.bottom : infillCellRight.bottom) - anchors.topMargin: Math.round(UM.Theme.getSize("default_margin").height * 2) - anchors.left: parent.left - width: parent.width - height: tipsText.contentHeight * tipsText.lineCount - - Label - { - id: tipsText - anchors.left: parent.left - anchors.leftMargin: UM.Theme.getSize("default_margin").width - anchors.right: parent.right - anchors.rightMargin: UM.Theme.getSize("default_margin").width - anchors.top: parent.top - wrapMode: Text.WordWrap - text: catalog.i18nc("@label", "Need help improving your prints?
Read the Ultimaker Troubleshooting Guides").arg("https://ultimaker.com/en/troubleshooting") - font: UM.Theme.getFont("default") - color: UM.Theme.getColor("text") - linkColor: UM.Theme.getColor("text_link") - onLinkActivated: Qt.openUrlExternally(link) - } -} \ No newline at end of file