From 1133e76e666e542feaebc76236604d3dcc331d55 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Thu, 9 Feb 2023 17:41:08 +0100 Subject: [PATCH 1/2] Add sign in wall CURA-10183 --- cura/CuraApplication.py | 4 +++ .../Marketplace/resources/qml/Marketplace.qml | 29 +++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 9609a93a9f..ed14a15629 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -2076,3 +2076,7 @@ class CuraApplication(QtApplication): @classmethod def getInstance(cls, *args, **kwargs) -> "CuraApplication": return cast(CuraApplication, super().getInstance(**kwargs)) + + @pyqtProperty(bool, constant=True) + def isEnterprise(self) -> bool: + return ApplicationMetadata.IsEnterpriseVersion diff --git a/plugins/Marketplace/resources/qml/Marketplace.qml b/plugins/Marketplace/resources/qml/Marketplace.qml index 2a3c5f69ce..97ba2303e9 100644 --- a/plugins/Marketplace/resources/qml/Marketplace.qml +++ b/plugins/Marketplace/resources/qml/Marketplace.qml @@ -285,4 +285,33 @@ Window } } } + + Rectangle + { + color: UM.Theme.getColor("main_background") + anchors.fill: parent + visible: !Cura.API.account.isLoggedIn && CuraApplication.isEnterprise + + UM.Label + { + id: signInLabel + anchors.centerIn: parent + width: Math.round(UM.Theme.getSize("modal_window_minimum").width / 2.5) + text: catalog.i18nc("@description","Please sign in to get verified plugins and materials for UltiMaker Cura Enterprise") + horizontalAlignment: Text.AlignHCenter + } + + Cura.PrimaryButton + { + id: loginButton + width: UM.Theme.getSize("account_button").width + height: UM.Theme.getSize("account_button").height + anchors.horizontalCenter: parent.horizontalCenter + anchors.top: signInLabel.bottom + anchors.topMargin: UM.Theme.getSize("default_margin").height * 2 + text: catalog.i18nc("@button", "Sign in") + fixedWidthMode: true + onClicked: Cura.API.account.login() + } + } } From d0c0b0584ad90aeeccb796512d375d0012e19cd0 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Thu, 9 Feb 2023 17:49:54 +0100 Subject: [PATCH 2/2] Add removed translations back CURA-10183 --- resources/i18n/cs_CZ/cura.po | 6 +++--- resources/i18n/de_DE/cura.po | 5 +++++ resources/i18n/es_ES/cura.po | 4 ++++ resources/i18n/fr_FR/cura.po | 4 ++++ resources/i18n/it_IT/cura.po | 4 ++++ resources/i18n/ja_JP/cura.po | 4 ++++ resources/i18n/ko_KR/cura.po | 4 ++++ resources/i18n/nl_NL/cura.po | 4 ++++ resources/i18n/pt_BR/cura.po | 6 +++--- resources/i18n/pt_PT/cura.po | 4 ++++ resources/i18n/ru_RU/cura.po | 4 ++++ resources/i18n/tr_TR/cura.po | 4 ++++ resources/i18n/zh_CN/cura.po | 4 ++++ resources/i18n/zh_TW/cura.po | 6 +++--- 14 files changed, 54 insertions(+), 9 deletions(-) diff --git a/resources/i18n/cs_CZ/cura.po b/resources/i18n/cs_CZ/cura.po index 2b39d1ac8b..b34c444dc8 100644 --- a/resources/i18n/cs_CZ/cura.po +++ b/resources/i18n/cs_CZ/cura.po @@ -7222,9 +7222,9 @@ msgstr "Poskytuje funkce pro čtení a zápis materiálových profilů založen #~ msgid "Please give your printer a name" #~ msgstr "Prosím dejte vaší tiskárně název" -#~ msgctxt "@description" -#~ msgid "Please sign in to get verified plugins and materials for UltiMaker Cura Enterprise" -#~ msgstr "Přihlaste se, abyste získali ověřené pluginy a materiály pro UltiMaker Cura Enterprise" +msgctxt "@description" +msgid "Please sign in to get verified plugins and materials for UltiMaker Cura Enterprise" +msgstr "Přihlaste se, abyste získali ověřené pluginy a materiály pro UltiMaker Cura Enterprise" #~ msgctxt "@title:tab" #~ msgid "Plugins" diff --git a/resources/i18n/de_DE/cura.po b/resources/i18n/de_DE/cura.po index bb1e907d42..b9381fb8fe 100644 --- a/resources/i18n/de_DE/cura.po +++ b/resources/i18n/de_DE/cura.po @@ -6794,3 +6794,8 @@ msgstr "Materialprofile" msgctxt "description" msgid "Provides capabilities to read and write XML-based material profiles." msgstr "Bietet Möglichkeiten, um XML-basierte Materialprofile zu lesen und zu schreiben." + + +msgctxt "@description" +msgid "Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise" +msgstr "Bitte melden Sie sich an, um verifizierte Plugins und Materialien für Ultimaker Cura Enterprise zu erhalten" diff --git a/resources/i18n/es_ES/cura.po b/resources/i18n/es_ES/cura.po index b09fd68621..3320beab7c 100644 --- a/resources/i18n/es_ES/cura.po +++ b/resources/i18n/es_ES/cura.po @@ -6795,3 +6795,7 @@ msgstr "Perfiles de material" msgctxt "description" msgid "Provides capabilities to read and write XML-based material profiles." msgstr "Permite leer y escribir perfiles de material basados en XML." + +msgctxt "@description" +msgid "Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise" +msgstr "Inicie sesión para obtener complementos y materiales verificados para Ultimaker Cura Enterprise" diff --git a/resources/i18n/fr_FR/cura.po b/resources/i18n/fr_FR/cura.po index 73084168ac..3fea50a58a 100644 --- a/resources/i18n/fr_FR/cura.po +++ b/resources/i18n/fr_FR/cura.po @@ -6798,3 +6798,7 @@ msgstr "Profils matériels" msgctxt "description" msgid "Provides capabilities to read and write XML-based material profiles." msgstr "Offre la possibilité de lire et d'écrire des profils matériels basés sur XML." + +msgctxt "@description" +msgid "Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise" +msgstr "Veuillez vous connecter pour obtenir les plug-ins et matériaux vérifiés pour Ultimaker Cura Enterprise" diff --git a/resources/i18n/it_IT/cura.po b/resources/i18n/it_IT/cura.po index 0c2a3db3d1..16b3f68152 100644 --- a/resources/i18n/it_IT/cura.po +++ b/resources/i18n/it_IT/cura.po @@ -6797,3 +6797,7 @@ msgstr "Profili del materiale" msgctxt "description" msgid "Provides capabilities to read and write XML-based material profiles." msgstr "Offre la possibilità di leggere e scrivere profili di materiali basati su XML." + +msgctxt "@description" +msgid "Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise" +msgstr "Accedere per ottenere i plugin e i materiali verificati per Ultimaker Cura Enterprise" \ No newline at end of file diff --git a/resources/i18n/ja_JP/cura.po b/resources/i18n/ja_JP/cura.po index 05373664b4..8aa771c23e 100644 --- a/resources/i18n/ja_JP/cura.po +++ b/resources/i18n/ja_JP/cura.po @@ -6774,3 +6774,7 @@ msgstr "フィラメントプロファイル" msgctxt "description" msgid "Provides capabilities to read and write XML-based material profiles." msgstr "XMLベースフィラメントのプロファイルを読み書きするための機能を供給する。" + +msgctxt "@description" +msgid "Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise" +msgstr "検証済みのUltimaker Cura Enterprise用プラグインおよび材料を入手するにはサインインしてください。" diff --git a/resources/i18n/ko_KR/cura.po b/resources/i18n/ko_KR/cura.po index b9093443c3..6fe7ae0b57 100644 --- a/resources/i18n/ko_KR/cura.po +++ b/resources/i18n/ko_KR/cura.po @@ -6777,3 +6777,7 @@ msgstr "재료 프로파일" msgctxt "description" msgid "Provides capabilities to read and write XML-based material profiles." msgstr "XML 기반 재료 프로파일을 읽고 쓸 수있는 기능을 제공합니다." + +msgctxt "@description" +msgid "Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise" +msgstr "Ultimaker Cura Enterprise용으로 검증된 플러그인 및 재료를 받으려면 로그인하십시오." diff --git a/resources/i18n/nl_NL/cura.po b/resources/i18n/nl_NL/cura.po index b8c486e0df..2b9ab73397 100644 --- a/resources/i18n/nl_NL/cura.po +++ b/resources/i18n/nl_NL/cura.po @@ -6797,3 +6797,7 @@ msgstr "Materiaalprofielen" msgctxt "description" msgid "Provides capabilities to read and write XML-based material profiles." msgstr "Biedt mogelijkheden om materiaalprofielen op XML-basis te lezen en te schrijven." + +msgctxt "@description" +msgid "Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise" +msgstr "Meld u aan voor geverifieerde plug-ins en materialen voor Ultimaker Cura Enterprise" \ No newline at end of file diff --git a/resources/i18n/pt_BR/cura.po b/resources/i18n/pt_BR/cura.po index 155b59dd38..79f09725c1 100644 --- a/resources/i18n/pt_BR/cura.po +++ b/resources/i18n/pt_BR/cura.po @@ -8965,9 +8965,9 @@ msgstr "Provê capacidade de ler e escrever perfis de material baseado em XML." #~ msgid "Please select any upgrades made to this UltiMaker 2." #~ msgstr "Por favor selecione quaisquer atualizações feitas nesta UltiMaker 2." -#~ msgctxt "@description" -#~ msgid "Please sign in to get verified plugins and materials for UltiMaker Cura Enterprise" -#~ msgstr "Por favor se logue para adquirir complementos e materiais verificados para o UltiMaker Cura Enterprise" +msgctxt "@description" +msgid "Please sign in to get verified plugins and materials for UltiMaker Cura Enterprise" +msgstr "Por favor se logue para adquirir complementos e materiais verificados para o UltiMaker Cura Enterprise" #~ msgctxt "name" #~ msgid "Plugin Browser" diff --git a/resources/i18n/pt_PT/cura.po b/resources/i18n/pt_PT/cura.po index 5291af0c90..f29d189b08 100644 --- a/resources/i18n/pt_PT/cura.po +++ b/resources/i18n/pt_PT/cura.po @@ -6793,3 +6793,7 @@ msgstr "Perfis de Materiais" msgctxt "description" msgid "Provides capabilities to read and write XML-based material profiles." msgstr "Fornece capacidades para ler e gravar perfis de material com base em XML." + +msgctxt "@description" +msgid "Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise" +msgstr "Inicie sessão para obter plug-ins e materiais verificados para o Ultimaker Cura Enterprise" diff --git a/resources/i18n/ru_RU/cura.po b/resources/i18n/ru_RU/cura.po index 96d751cc55..1b332d684a 100644 --- a/resources/i18n/ru_RU/cura.po +++ b/resources/i18n/ru_RU/cura.po @@ -6811,3 +6811,7 @@ msgstr "Профили материалов" msgctxt "description" msgid "Provides capabilities to read and write XML-based material profiles." msgstr "Предоставляет возможности по чтению и записи профилей материалов в виде XML." + +msgctxt "@description" +msgid "Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise" +msgstr "Войдите, чтобы получить проверенные встраиваемые модули и материалы для Ultimaker Cura Enterprise" diff --git a/resources/i18n/tr_TR/cura.po b/resources/i18n/tr_TR/cura.po index 2ece905a95..82047fcd3b 100644 --- a/resources/i18n/tr_TR/cura.po +++ b/resources/i18n/tr_TR/cura.po @@ -6797,3 +6797,7 @@ msgstr "Malzeme Profilleri" msgctxt "description" msgid "Provides capabilities to read and write XML-based material profiles." msgstr "XML tabanlı malzeme profillerini okuma ve yazma olanağı sağlar." + +msgctxt "@description" +msgid "Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise" +msgstr "Ultimaker Cura Enterprise için onaylı eklenti ve malzemeleri almak için lütfen oturum açın" diff --git a/resources/i18n/zh_CN/cura.po b/resources/i18n/zh_CN/cura.po index 9ee78870f7..513f857657 100644 --- a/resources/i18n/zh_CN/cura.po +++ b/resources/i18n/zh_CN/cura.po @@ -6782,6 +6782,10 @@ msgctxt "description" msgid "Provides capabilities to read and write XML-based material profiles." msgstr "提供读取和写入基于 XML 的材料配置文件的功能。" +msgctxt "@description" +msgid "Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise" +msgstr "请登录以获取经验证适用于 Ultimaker Cura Enterprise 的插件和材料" + #~ msgctxt "@info:generic" #~ msgid "" #~ "\n" diff --git a/resources/i18n/zh_TW/cura.po b/resources/i18n/zh_TW/cura.po index fd2ff5c051..f716291225 100644 --- a/resources/i18n/zh_TW/cura.po +++ b/resources/i18n/zh_TW/cura.po @@ -8512,9 +8512,9 @@ msgstr "提供讀寫 XML 格式線材參數的功能。" #~ msgid "Please select any upgrades made to this UltiMaker 2." #~ msgstr "請選擇適用於 UltiMaker 2 的更新檔案。" -#~ msgctxt "@description" -#~ msgid "Please sign in to get verified plugins and materials for UltiMaker Cura Enterprise" -#~ msgstr "請登入以取得 UltiMaker Cura Enterprise 驗証的外掛及線材" +msgctxt "@description" +msgid "Please sign in to get verified plugins and materials for UltiMaker Cura Enterprise" +msgstr "請登入以取得 UltiMaker Cura Enterprise 驗証的外掛及線材" #~ msgctxt "name" #~ msgid "Plugin Browser"