1. update the content of the about 2.cancel the wiki

Snapmaker · Oct 28, 2024 · 0e4bcc1 · 0e4bcc1
1 parent 92db50d
commit 0e4bcc1
Show file tree

Hide file tree

Showing 24 changed files with 72 additions and 44 deletions.
diff --git a/localization/i18n/Snapmaker_Orca.pot b/localization/i18n/Snapmaker_Orca.pot
@@ -2635,7 +2635,7 @@ msgstr ""
 msgid "GNU Affero General Public License, version 3"
 msgstr ""
 
-msgid "Snapmaker Orca is based on PrusaSlicer and BambuStudio"
+msgid "Snapmaker Orca is Based on Orca Slicer"
 msgstr ""
 
 msgid "Libraries"

diff --git a/localization/i18n/ca/Snapmaker_Orca_ca.po b/localization/i18n/ca/Snapmaker_Orca_ca.po
@@ -2770,8 +2770,8 @@ msgstr "Snapmaker Orca té llicència sota "
 msgid "GNU Affero General Public License, version 3"
 msgstr "GNU Affero General Public License, versió 3"
 
-msgid "Snapmaker Orca is based on PrusaSlicer and BambuStudio"
-msgstr "Snapmaker Orca està basat en PrusaSlicer i BambuStudio"
+msgid "Snapmaker Orca is Based on Orca Slicer"
+msgstr "Snapmaker Orca is Based on Orca Slicer"
 
 msgid "Libraries"
 msgstr "Llibreries"

diff --git a/localization/i18n/cs/Snapmaker_Orca_cs.po b/localization/i18n/cs/Snapmaker_Orca_cs.po
@@ -2735,7 +2735,7 @@ msgstr "Snapmaker Orca je licencován pod "
 msgid "GNU Affero General Public License, version 3"
 msgstr "GNU Affero General Public License, verze 3"
 
-msgid "Snapmaker Orca is based on PrusaSlicer and BambuStudio"
+msgid "Snapmaker Orca is Based on Orca Slicer"
 msgstr ""
 
 msgid "Libraries"

diff --git a/localization/i18n/de/Snapmaker_Orca_de.po b/localization/i18n/de/Snapmaker_Orca_de.po
@@ -2792,8 +2792,8 @@ msgstr "Snapmaker Orca ist lizenziert unter "
 msgid "GNU Affero General Public License, version 3"
 msgstr "GNU Affero General Public License, Version 3"
 
-msgid "Snapmaker Orca is based on PrusaSlicer and BambuStudio"
-msgstr "Snapmaker Orca basiert auf PrusaSlicer und BambuStudio"
+msgid "Snapmaker Orca is Based on Orca Slicer"
+msgstr "Snapmaker Orca is Based on Orca Slicer"
 
 msgid "Libraries"
 msgstr "Bibliotheken"

diff --git a/localization/i18n/en/Snapmaker_Orca_en.po b/localization/i18n/en/Snapmaker_Orca_en.po
@@ -2687,7 +2687,7 @@ msgstr "Snapmaker Orca is licensed under "
 msgid "GNU Affero General Public License, version 3"
 msgstr "GNU Affero General Public License, version 3"
 
-msgid "Snapmaker Orca is based on PrusaSlicer and BambuStudio"
+msgid "Snapmaker Orca is Based on Orca Slicer"
 msgstr ""
 
 msgid "Libraries"

diff --git a/localization/i18n/es/Snapmaker_Orca_es.po b/localization/i18n/es/Snapmaker_Orca_es.po
@@ -2794,8 +2794,8 @@ msgstr "Snapmaker Orca está licenciada sobre"
 msgid "GNU Affero General Public License, version 3"
 msgstr "GNU Affero General Public License, versión 3"
 
-msgid "Snapmaker Orca is based on PrusaSlicer and BambuStudio"
-msgstr "Snapmaker Orca se basa en PrusaSlicer y BambuStudio"
+msgid "Snapmaker Orca is Based on Orca Slicer"
+msgstr "Snapmaker Orca is Based on Orca Slicer"
 
 msgid "Libraries"
 msgstr "Librerías"

diff --git a/localization/i18n/fr/Snapmaker_Orca_fr.po b/localization/i18n/fr/Snapmaker_Orca_fr.po
@@ -2793,9 +2793,8 @@ msgstr "Snapmaker Orca est sous licence "
 msgid "GNU Affero General Public License, version 3"
 msgstr "GNU Affero Licence Publique Générale, version 3"
 
-msgid "Snapmaker Orca is based on PrusaSlicer and BambuStudio"
-msgstr "Snapmaker Orca est basé sur PrusaSlicer et BambuStudio"
-
+msgid "Snapmaker Orca is Based on Orca Slicer"
+msgstr "Snapmaker Orca is Based on Orca Slicer"
 msgid "Libraries"
 msgstr "Bibliothèques"
 

diff --git a/localization/i18n/hu/Snapmaker_Orca_hu.po b/localization/i18n/hu/Snapmaker_Orca_hu.po
@@ -2709,7 +2709,7 @@ msgstr "A Snapmaker Orca a következő licencet használja "
 msgid "GNU Affero General Public License, version 3"
 msgstr "GNU Affero General Public License, version 3"
 
-msgid "Snapmaker Orca is based on PrusaSlicer and BambuStudio"
+msgid "Snapmaker Orca is Based on Orca Slicer"
 msgstr ""
 
 msgid "Libraries"

diff --git a/localization/i18n/it/Snapmaker_Orca_it.po b/localization/i18n/it/Snapmaker_Orca_it.po
@@ -2780,7 +2780,7 @@ msgstr "Snapmaker Orca è concesso in licenza con "
 msgid "GNU Affero General Public License, version 3"
 msgstr "GNU Affero General Public License, versione 3"
 
-msgid "Snapmaker Orca is based on PrusaSlicer and BambuStudio"
+msgid "Snapmaker Orca is Based on Orca Slicer"
 msgstr ""
 
 msgid "Libraries"

diff --git a/localization/i18n/ja/Snapmaker_Orca_ja.po b/localization/i18n/ja/Snapmaker_Orca_ja.po
@@ -2695,7 +2695,7 @@ msgstr "Snapmaker Orcaのライセンス"
 msgid "GNU Affero General Public License, version 3"
 msgstr "GNU Affero General Public License, version 3"
 
-msgid "Snapmaker Orca is based on PrusaSlicer and BambuStudio"
+msgid "Snapmaker Orca is Based on Orca Slicer"
 msgstr ""
 
 msgid "Libraries"

diff --git a/localization/i18n/ko/Snapmaker_Orca_ko.po b/localization/i18n/ko/Snapmaker_Orca_ko.po
@@ -2710,8 +2710,8 @@ msgstr "Snapmaker Orca is licensed under "
 msgid "GNU Affero General Public License, version 3"
 msgstr "GNU Affero General Public License, version 3"
 
-msgid "Snapmaker Orca is based on PrusaSlicer and BambuStudio"
-msgstr "Snapmaker Orca는 PrusaSlicer와 BambuStudio를 기반으로 합니다"
+msgid "Snapmaker Orca is Based on Orca Slicer"
+msgstr "Snapmaker Orca is Based on Orca Slicer"
 
 msgid "Libraries"
 msgstr "라이브러리"

diff --git a/localization/i18n/nl/Snapmaker_Orca_nl.po b/localization/i18n/nl/Snapmaker_Orca_nl.po
@@ -2729,7 +2729,7 @@ msgstr "Snapmaker Orca is gelicentieerd onder "
 msgid "GNU Affero General Public License, version 3"
 msgstr "GNU Affero Algemene Openbare Licentie, versie 3"
 
-msgid "Snapmaker Orca is based on PrusaSlicer and BambuStudio"
+msgid "Snapmaker Orca is Based on Orca Slicer"
 msgstr ""
 
 msgid "Libraries"

diff --git a/localization/i18n/pl/Snapmaker_Orca_pl.po b/localization/i18n/pl/Snapmaker_Orca_pl.po
@@ -2765,8 +2765,8 @@ msgstr "Snapmaker Orca jest licencjonowany na zasadach "
 msgid "GNU Affero General Public License, version 3"
 msgstr "GNU Affero General Public License, wersja 3"
 
-msgid "Snapmaker Orca is based on PrusaSlicer and BambuStudio"
-msgstr "Snapmaker Orca opiera się na projektach PrusaSlicer i BambuStudio"
+msgid "Snapmaker Orca is Based on Orca Slicer"
+msgstr "Snapmaker Orca is Based on Orca Slicer"
 
 msgid "Libraries"
 msgstr "Biblioteki"

diff --git a/localization/i18n/pt_BR/Snapmaker_Orca_pt_BR.po b/localization/i18n/pt_BR/Snapmaker_Orca_pt_BR.po
@@ -2765,8 +2765,8 @@ msgstr "O Snapmaker Orca é licenciado sob "
 msgid "GNU Affero General Public License, version 3"
 msgstr "Licença Pública Geral Affero GNU, versão 3"
 
-msgid "Snapmaker Orca is based on PrusaSlicer and BambuStudio"
-msgstr "Snapmaker Orca é baseado no PrusaSlicer e BambuStudio"
+msgid "Snapmaker Orca is Based on Orca Slicer"
+msgstr "Snapmaker Orca is Based on Orca Slicer"
 
 msgid "Libraries"
 msgstr "Bibliotecas"

diff --git a/localization/i18n/ru/Snapmaker_Orca_ru.po b/localization/i18n/ru/Snapmaker_Orca_ru.po
@@ -2777,8 +2777,8 @@ msgstr "Snapmaker Orca распространяется под лицензие
 msgid "GNU Affero General Public License, version 3"
 msgstr "GNU Affero General Public третьей версии"
 
-msgid "Snapmaker Orca is based on PrusaSlicer and BambuStudio"
-msgstr "Snapmaker Orca основан на PrusaSlicer и BambuStudio"
+msgid "Snapmaker Orca is Based on Orca Slicer"
+msgstr "Snapmaker Orca is Based on Orca Slicer"
 
 msgid "Libraries"
 msgstr "Библиотеки"

diff --git a/localization/i18n/sv/Snapmaker_Orca_sv.po b/localization/i18n/sv/Snapmaker_Orca_sv.po
@@ -2697,7 +2697,7 @@ msgstr "Snapmaker Orca är licensierad under "
 msgid "GNU Affero General Public License, version 3"
 msgstr "GNU Affero General Public License, version 3"
 
-msgid "Snapmaker Orca is based on PrusaSlicer and BambuStudio"
+msgid "Snapmaker Orca is Based on Orca Slicer"
 msgstr ""
 
 msgid "Libraries"

diff --git a/localization/i18n/tr/Snapmaker_Orca_tr.po b/localization/i18n/tr/Snapmaker_Orca_tr.po
@@ -2736,8 +2736,8 @@ msgstr "Orca Dilimleyici şu lisansa sahiptir: "
 msgid "GNU Affero General Public License, version 3"
 msgstr "GNU Affero Genel Kamu Lisansı, sürüm 3"
 
-msgid "Snapmaker Orca is based on PrusaSlicer and BambuStudio"
-msgstr "Snapmaker Orca, PrusaSlicer ve BambuStudio’yu temel alır"
+msgid "Snapmaker Orca is Based on Orca Slicer"
+msgstr "Snapmaker Orca is Based on Orca Slicer"
 
 msgid "Libraries"
 msgstr "Kütüphaneler"

diff --git a/localization/i18n/uk/Snapmaker_Orca_uk.po b/localization/i18n/uk/Snapmaker_Orca_uk.po
@@ -2760,8 +2760,8 @@ msgstr "Snapmaker Orca знаходиться під ліцензією "
 msgid "GNU Affero General Public License, version 3"
 msgstr "Стандартна громадська ліцензія GNU Affero, версія 3"
 
-msgid "Snapmaker Orca is based on PrusaSlicer and BambuStudio"
-msgstr "Snapmaker Orca базується на PrusaSlicer та BambuStudio"
+msgid "Snapmaker Orca is Based on Orca Slicer"
+msgstr "Snapmaker Orca is Based on Orca Slicer"
 
 msgid "Libraries"
 msgstr "Бібліотеки"

diff --git a/localization/i18n/zh_CN/Snapmaker_Orca_zh_CN.po b/localization/i18n/zh_CN/Snapmaker_Orca_zh_CN.po
@@ -2652,6 +2652,22 @@ msgstr "安装中"
 msgid "Install failed"
 msgstr "安装失败"
 
+# snapmaker orca beta
+msgid "Snapmaker Orca beta is forked from Orca Slicer by SoftFever."
+msgstr "Snapmaker Orca beta 基于 SoftFever 的 Orca Slicer开发。"
+
+msgid "OrcaSlicer is forked from Bambu Studio by Bambu Lab."
+msgstr "Orca Slicer 基于 Bambu Lab 的 Bambu Studio 开发而来。"
+
+msgid "Bambu Studio is forked from PrusaSlicer by Prusa Research, which is from Slic3r by Alessandro Ranellucci and the RepRap community. Orca Slicer incorporates a lot of features from SuperSlicer by @supermerill."
+msgstr "Bambu Studio 基于 Prusa Research 的 PrusaSlicer 开发而来，而 PrusaSlicer 又是基于 Alessandro Ranellucci 和 RepRap 社区的 Slic3r进行开发。Orca Slicer 整合了许多来自 @supermerill 的SuperSlicer 的特性。"
+
+msgid "Snapmaker Orca integrates some features from the 3D printing open-source community, with specific attributions provided in the code comments."
+msgstr "Snapmaker Orca 集成了来自 3D 打印开源社区的一些特性，并在代码注释中提供了具体的归属说明。"
+
+msgid "Snapmaker Orca is licensed under the GNU Affero Generall Public License, version 3."
+msgstr "Snapmaker Orca 采用 GNU Affero 通用公共许可证，第 3 版进行授权。"
+
 msgid "Portions copyright"
 msgstr "部分版权"
 
@@ -2667,8 +2683,8 @@ msgstr "Snapmaker Orca是在"
 msgid "GNU Affero General Public License, version 3"
 msgstr "GNU Affero 通用公共许可证，版本 3下授权的"
 
-msgid "Snapmaker Orca is based on PrusaSlicer and BambuStudio"
-msgstr "Snapmaker Orca 基于 PrusaSlicer 以及 BambuStudio 开发"
+msgid "Snapmaker Orca is Based on Orca Slicer"
+msgstr "Snapmaker Orca 基于 Orca Slicer 开发"
 
 msgid "Libraries"
 msgstr "库"
@@ -2683,7 +2699,7 @@ msgid "About %s"
 msgstr "关于 %s"
 
 msgid "Snapmaker Orca "
-msgstr "Snapmaker Orca切片"
+msgstr "Snapmaker Orca"
 
 msgid "Snapmaker Orca is based on BambuStudio, PrusaSlicer, and SuperSlicer."
 msgstr "Snapmaker Orca基于BambuStudio、PrusaSlicer 以及SuperSlicer开发。"
@@ -15769,7 +15785,7 @@ msgstr ""
 #~ msgstr "配置无法加载。"
 
 #~ msgid "The 3mf is generated by old Snapmaker Orca, load geometry data only."
-#~ msgstr "该3mf文件来自旧版本的Snapmaker Orca切片，将只加载几何数据。"
+#~ msgstr "该3mf文件来自旧版本的Snapmaker Orca，将只加载几何数据。"
 
 #~ msgid "Movement:"
 #~ msgstr "移动："
@@ -16279,7 +16295,7 @@ msgstr ""
 #~ "when the sparse infill density is low.This value determines the thickness "
 #~ "of the support loops. 0 means disable this feature"
 #~ msgstr ""
-#~ "如果开启，Snapmaker Orca切片会沿着内部桥接的边沿在其下方生成支撑轮廓。这些支撑轮廓"
+#~ "如果开启，Snapmaker Orca会沿着内部桥接的边沿在其下方生成支撑轮廓。这些支撑轮廓"
 #~ "可以防止悬空地打印内部桥接并提高顶面质量，特别是在填充密度较低的情况下。这"
 #~ "个设置用于调整支撑轮廓的厚度，0表示关闭此特性。"
 

diff --git a/localization/i18n/zh_TW/Snapmaker_Orca_zh_TW.po b/localization/i18n/zh_TW/Snapmaker_Orca_zh_TW.po
@@ -2741,7 +2741,7 @@ msgstr " Snapmaker Orca 是在"
 msgid "GNU Affero General Public License, version 3"
 msgstr "GNU Affero 通用公共許可證，版本 3 下授權的"
 
-msgid "Snapmaker Orca is based on PrusaSlicer and BambuStudio"
+msgid "Snapmaker Orca is Based on Orca Slicer"
 msgstr ""
 
 msgid "Libraries"

diff --git a/src/slic3r/GUI/AboutDialog.cpp b/src/slic3r/GUI/AboutDialog.cpp
@@ -151,7 +151,7 @@ wxString CopyrightsDialog::get_html_text()
         _L("License"),
         _L("Snapmaker Orca is licensed under "),
         "https://www.gnu.org/licenses/agpl-3.0.html",_L("GNU Affero General Public License, version 3"),
-        _L("Snapmaker Orca is based on PrusaSlicer and BambuStudio"),
+        _L("Snapmaker Orca is Based on Orca Slicer"),
         _L("Libraries"),
         _L("This software uses open source components whose copyright and other proprietary rights belong to their respective owners"));
 
@@ -244,7 +244,7 @@ AboutDialog::AboutDialog()
         vesizer->Add(0, FromDIP(165), 1, wxEXPAND, FromDIP(5));
         auto version_string = _L("Snapmaker Orca ") + " " + std::string(Snapmaker_VERSION);
         wxStaticText* version = new wxStaticText(this, wxID_ANY, version_string.c_str(), wxDefaultPosition, wxDefaultSize);
-        wxStaticText* bs_version = new wxStaticText(this, wxID_ANY, wxString::Format("Based on PrusaSlicer and BambuStudio"), wxDefaultPosition, wxDefaultSize);
+        wxStaticText* bs_version = new wxStaticText(this, wxID_ANY, wxString::Format("Based on Orca Slicer"), wxDefaultPosition, wxDefaultSize);
         bs_version->SetFont(Label::Body_12);
         wxFont version_font = GetFont();
         #ifdef __WXMSW__
@@ -277,11 +277,21 @@ AboutDialog::AboutDialog()
     text_sizer_horiz->Add( 0, 0, 0, wxLEFT, FromDIP(20));
 
     std::vector<wxString> text_list;
-    text_list.push_back(_L("Snapmaker Orca is based on BambuStudio, PrusaSlicer, and SuperSlicer."));
+
+    /*text_list.push_back(_L("Snapmaker Orca is based on BambuStudio, PrusaSlicer, and SuperSlicer."));
     text_list.push_back(_L("BambuStudio is originally based on PrusaSlicer by PrusaResearch."));
     text_list.push_back(_L("PrusaSlicer is originally based on Slic3r by Alessandro Ranellucci."));
-    text_list.push_back(_L("Slic3r was created by Alessandro Ranellucci with the help of many other contributors."));
-
+    text_list.push_back(_L("Slic3r was created by Alessandro Ranellucci with the help of many other contributors."));*/
+
+
+    // SM Beta
+    text_list.push_back(_L("Snapmaker Orca beta is forked from Orca Slicer by SoftFever."));
+    text_list.push_back(_L("OrcaSlicer is forked from Bambu Studio by Bambu Lab."));
+    text_list.push_back(_L("Bambu Studio is forked from PrusaSlicer by Prusa Research, which is from Slic3r by Alessandro Ranellucci and the RepRap community. Orca Slicer incorporates a lot of features from SuperSlicer by @supermerill."));
+    text_list.push_back(_L("Snapmaker Orca integrates some features from the 3D printing open-source community, with specific attributions provided in the code comments."));
+    text_list.push_back(_L(""));
+    text_list.push_back(_L("Snapmaker Orca is licensed under the GNU Affero Generall Public License, version 3."));
+
     text_sizer->Add( 0, 0, 0, wxTOP, FromDIP(33));
     bool is_zh = wxGetApp().app_config->get("language") == "zh_CN";
     for (int i = 0; i < text_list.size(); i++)
@@ -322,7 +332,7 @@ AboutDialog::AboutDialog()
 
     copyright_hor_sizer->Add(copyright_ver_sizer, 0, wxLEFT, FromDIP(20));
 
-    wxStaticText *html_text = new wxStaticText(this, wxID_ANY, "Copyright(C) 2022-2024 Li Jiang All Rights Reserved", wxDefaultPosition, wxDefaultSize);
+    wxStaticText *html_text = new wxStaticText(this, wxID_ANY, "Copyright (C) 2024 Snapmaker All Rights Reserved", wxDefaultPosition, wxDefaultSize);
     html_text->SetForegroundColour(wxColour(107, 107, 107));
 
     copyright_ver_sizer->Add(html_text, 0, wxALL , 0);
@@ -339,7 +349,7 @@ AboutDialog::AboutDialog()
               (boost::format(
               "<html>"
               "<body>"
-              "<p style=\"text-align:left\"><a style=\"color:#009789\" href=\"https://github.com/Snapmaker/OrcaSlicer\">https://github.com/Snapmaker/OrcaSlicer</ a></p>"
+              "<p style=\"text-align:left\"><a style=\"color:#009789\" href=\"www.snapmaker.com\">www.snapmaker.com</ a></p>"
               "</body>"
               "</html>")
             ).str());

diff --git a/src/slic3r/GUI/DailyTips.cpp b/src/slic3r/GUI/DailyTips.cpp
@@ -186,6 +186,8 @@ void DailyTipsDataRenderer::render_text(const ImVec2& start_pos, const ImVec2& s
     }
 
     // wiki
+    // SM Beta
+    /*
     if (!m_data.wiki_url.empty()) {
         std::string tips_line = _u8L("For more information, please check out Wiki");
         std::string wiki_part_text = _u8L("Wiki");
@@ -220,6 +222,7 @@ void DailyTipsDataRenderer::render_text(const ImVec2& start_pos, const ImVec2& s
                 open_wiki();
         }
     }
+    */
     ImGui::PopStyleColor();
 }
 

diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
@@ -347,7 +347,7 @@ class SplashScreen : public wxSplashScreen
 
 		// Based on Text
         memDc.SetFont(m_constant_text.based_on_font);
-        auto bs_version = wxString::Format("Based on PrusaSlicer and BambuStudio").ToStdString();
+        auto bs_version = wxString::Format("Based on Orca Slicer").ToStdString();
         wxSize based_on_ext = memDc.GetTextExtent(bs_version);
         wxRect based_on_rect(
 			wxPoint(0, height - based_on_ext.GetHeight() * 2),

diff --git a/version.inc b/version.inc
@@ -10,7 +10,7 @@ endif()
 if(NOT DEFINED BBL_INTERNAL_TESTING)
 set(BBL_INTERNAL_TESTING "0")
 endif()
-set(Snapmaker_VERSION "0.3.1")
+set(Snapmaker_VERSION "0.4.0")
 string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)"
        Snapmaker_VERSION_MATCH ${Snapmaker_VERSION})
 set(ORCA_VERSION_MAJOR ${CMAKE_MATCH_1})