Skip to content

Commit b5eac64

Browse files
committed
Remove support links from this build.
Don't merge to main. CURA-12625 CURA-12883
1 parent 1a7bacd commit b5eac64

File tree

24 files changed

+13
-268
lines changed

24 files changed

+13
-268
lines changed

cura/CuraActions.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,6 @@ def __init__(self, parent: QObject = None) -> None:
4040
self._operation_stack.changed.connect(self._onUndoStackChanged)
4141

4242
undoStackChanged = pyqtSignal()
43-
@pyqtSlot()
44-
def openDocumentation(self) -> None:
45-
# Starting a web browser from a signal handler connected to a menu will crash on windows.
46-
# So instead, defer the call to the next run of the event loop, since that does work.
47-
# Note that weirdly enough, only signal handlers that open a web browser fail like that.
48-
event = CallFunctionEvent(self._openUrl, [QUrl("https://ultimaker.com/en/resources/manuals/software?utm_source=cura&utm_medium=software&utm_campaign=dropdown-documentation")], {})
49-
cura.CuraApplication.CuraApplication.getInstance().functionEvent(event)
5043

5144
@pyqtProperty(bool, notify=undoStackChanged)
5245
def canUndo(self):
@@ -67,11 +60,6 @@ def redo(self):
6760
def _onUndoStackChanged(self):
6861
self.undoStackChanged.emit()
6962

70-
@pyqtSlot()
71-
def openBugReportPage(self) -> None:
72-
event = CallFunctionEvent(self._openUrl, [QUrl("https://github.com/Ultimaker/Cura/issues/new/choose")], {})
73-
cura.CuraApplication.CuraApplication.getInstance().functionEvent(event)
74-
7563
@pyqtSlot()
7664
def homeCamera(self) -> None:
7765
"""Reset camera position and direction to default"""

cura/CuraApplication.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,6 @@ def __init__(self, *args, **kwargs):
174174

175175
self.default_theme = "cura-light"
176176

177-
self.change_log_url = "https://ultimaker.com/ultimaker-cura-latest-features?utm_source=cura&utm_medium=software&utm_campaign=cura-update-features"
178-
self.beta_change_log_url = "https://ultimaker.com/ultimaker-cura-beta-features?utm_source=cura&utm_medium=software&utm_campaign=cura-update-features"
179-
180177
self._boot_loading_time = time.time()
181178

182179
self._on_exit_callback_manager = OnExitCallbackManager(self)

cura/UI/WhatsNewPagesModel.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,6 @@ def __init__(self, application: "CuraApplication", parent: Optional["QObject"] =
3535
def _collectOrdinalFiles(resource_type: int, include: List[str]) -> Tuple[Dict[int, str], int]:
3636
result = {} # type: Dict[int, str]
3737
highest = -1
38-
try:
39-
folder_path = Resources.getPath(resource_type, "whats_new")
40-
for _, _, files in os.walk(folder_path):
41-
for filename in files:
42-
basename = os.path.basename(filename)
43-
base, ext = os.path.splitext(basename)
44-
if ext.lower() not in include or not base.isdigit():
45-
continue
46-
page_no = int(base)
47-
highest = max(highest, page_no)
48-
result[page_no] = os.path.join(folder_path, filename)
49-
except FileNotFoundError:
50-
Logger.logException("w", "Could not find 'whats_new' folder for resource-type {0}".format(resource_type))
5138
return result, highest
5239

5340
@staticmethod

cura/UltimakerCloud/CloudMaterialSync.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,6 @@ def _showSyncNewMaterialsMessage(self) -> None:
7777
button_align = Message.ActionButtonAlignment.ALIGN_RIGHT
7878
)
7979

80-
sync_materials_message.addAction(
81-
"learn_more",
82-
name = catalog.i18nc("@action:button", "Learn more"),
83-
icon = "",
84-
description = "Learn more about syncing your newly installed materials with your printers.",
85-
button_align = Message.ActionButtonAlignment.ALIGN_LEFT,
86-
button_style = Message.ActionButtonStyle.LINK
87-
)
8880
sync_materials_message.actionTriggered.connect(self._onSyncMaterialsMessageActionTriggered)
8981

9082
# Show the message only if there are printers that support material export
@@ -97,8 +89,6 @@ def _onSyncMaterialsMessageActionTriggered(self, sync_message: Message, sync_mes
9789
if sync_message_action == "sync":
9890
self.openSyncAllWindow()
9991
sync_message.hide()
100-
elif sync_message_action == "learn_more":
101-
QDesktopServices.openUrl(QUrl("https://support.ultimaker.com/hc/en-us/articles/360013137919?utm_source=cura&utm_medium=software&utm_campaign=sync-material-printer-message"))
10292

10393
@pyqtSlot(result = QUrl)
10494
def getPreferredExportAllPath(self) -> QUrl:

plugins/3MFReader/WorkspaceDialog.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -502,14 +502,6 @@ def showMissingMaterialsWarning(self) -> None:
502502
title=i18n_catalog.i18nc("@info:title", "Some required packages are not installed"),
503503
message_type=Message.MessageType.WARNING
504504
)
505-
result_message.addAction(
506-
"learn_more",
507-
name=i18n_catalog.i18nc("@action:button", "Learn more"),
508-
icon="",
509-
description=i18n_catalog.i18nc("@label", "Learn more about project packages."),
510-
button_align=Message.ActionButtonAlignment.ALIGN_LEFT,
511-
button_style=Message.ActionButtonStyle.LINK
512-
)
513505
result_message.addAction(
514506
"install_packages",
515507
name=i18n_catalog.i18nc("@action:button", "Install Packages"),
@@ -525,8 +517,6 @@ def _onMessageActionTriggered(self, message: Message, sync_message_action: str)
525517
if sync_message_action == "install_materials":
526518
self.installMissingPackages()
527519
message.hide()
528-
elif sync_message_action == "learn_more":
529-
QDesktopServices.openUrl(QUrl("https://support.ultimaker.com/hc/en-us/articles/360011968360-Using-the-Ultimaker-Marketplace"))
530520

531521

532522
def __show(self) -> None:

plugins/3MFReader/WorkspaceDialog.qml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,6 @@ UM.Dialog
4242
text: manager.isUcp? catalog.i18nc("@action:title Don't translate 'Universal Cura Project'", "Summary - Open Universal Cura Project (UCP)"): catalog.i18nc("@action:title", "Summary - Cura Project")
4343
font: UM.Theme.getFont("large")
4444
}
45-
Cura.TertiaryButton
46-
{
47-
id: learnMoreButton
48-
visible: manager.isUcp
49-
text: catalog.i18nc("@button", "Learn more")
50-
iconSource: UM.Theme.getIcon("LinkExternal")
51-
isIconOnRightSide: true
52-
onClicked: Qt.openUrlExternally("https://support.ultimaker.com/s/article/000002979")
53-
}
5445
}
5546
}
5647
}

plugins/3MFWriter/UCPDialog.qml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,6 @@ UM.Dialog
4444
text: catalog.i18nc("@action:title Don't translate 'Universal Cura Project'", "Summary - Universal Cura Project")
4545
font: UM.Theme.getFont("large")
4646
}
47-
Cura.TertiaryButton
48-
{
49-
id: learnMoreButton
50-
text: catalog.i18nc("@button", "Learn more")
51-
iconSource: UM.Theme.getIcon("LinkExternal")
52-
isIconOnRightSide: true
53-
onClicked: Qt.openUrlExternally("https://support.ultimaker.com/s/article/000002979")
54-
}
5547
}
5648
UM.Label
5749
{

plugins/Marketplace/resources/qml/ManagedPackages.qml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ Packages
1414
bannerVisible: UM.Preferences.getValue("cura/market_place_show_manage_packages_banner");
1515
bannerIcon: UM.Theme.getIcon("ArrowDoubleCircleRight")
1616
bannerText: catalog.i18nc("@text", "Manage your UltiMaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly.")
17-
bannerReadMoreUrl: "https://support.ultimaker.com/hc/en-us/articles/4411125921426/?utm_source=cura&utm_medium=software&utm_campaign=marketplace-learn-manage"
1817
onRemoveBanner: function() {
1918
UM.Preferences.setValue("cura/market_place_show_manage_packages_banner", false);
2019
bannerVisible = false;

plugins/Marketplace/resources/qml/Marketplace.qml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ Window
1616

1717
signal searchStringChanged(string new_search)
1818

19-
property alias showOnboadBanner: onBoardBanner.visible
2019
property alias showSearchHeader: searchHeader.visible
2120
property alias pageContentsSource: content.source
2221

@@ -88,20 +87,6 @@ Window
8887
}
8988
}
9089

91-
OnboardBanner
92-
{
93-
id: onBoardBanner
94-
visible: content.item && content.item.bannerVisible
95-
text: content.item && content.item.bannerText
96-
icon: content.item && content.item.bannerIcon
97-
onRemove: content.item && content.item.onRemoveBanner
98-
readMoreUrl: content.item && content.item.bannerReadMoreUrl
99-
100-
Layout.fillWidth: true
101-
Layout.leftMargin: UM.Theme.getSize("default_margin").width
102-
Layout.rightMargin: UM.Theme.getSize("default_margin").width
103-
}
104-
10590
// Search & Top-Level Tabs
10691
Item
10792
{

plugins/Marketplace/resources/qml/Materials.qml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ Packages
1010
bannerVisible: UM.Preferences.getValue("cura/market_place_show_material_banner")
1111
bannerIcon: UM.Theme.getIcon("Spool")
1212
bannerText: catalog.i18nc("@text", "Select and install material profiles optimised for your UltiMaker 3D printers.")
13-
bannerReadMoreUrl: "https://support.ultimaker.com/hc/en-us/articles/360011968360/?utm_source=cura&utm_medium=software&utm_campaign=marketplace-learn-materials"
1413
onRemoveBanner: function() {
1514
UM.Preferences.setValue("cura/market_place_show_material_banner", false);
1615
bannerVisible = false;

0 commit comments

Comments
 (0)