diff --git a/resources/web/data/text.js b/resources/web/data/text.js index 52b448b..ef9cf36 100644 --- a/resources/web/data/text.js +++ b/resources/web/data/text.js @@ -11,6 +11,12 @@ var LangText={ "t8": "Product Info", "t9": "Contact with us", "t10": "Filament", + "t11": "Add Text", + "t12": "Cut Model", + "t13": "Download Model", + "ls1": "You can download 3D models from the following websites.", + "ls2": "If you have any questions about the Printer or QIDISlicer, please contact us via the appropriate E-mail address or Skype.", + "ls3": "Note: please try to tell us your requirements in the form of video or pictures, and provide 3MF file, G-code file, machine number and other necessary information.", }, "zh_CN": { "t0": "欢迎使用QIDISlicer", @@ -24,6 +30,12 @@ var LangText={ "t8": "产品信息", "t9": "与我们联系", "t10": "耗材", + "t11": "添加文本", + "t12": "切割模型", + "t13": "下载模型", + "ls1": "您可以从以下网站下载 3D 模型。", + "ls2": "如果您对打印机或 QIDISlicer 有任何疑问，请通过相应的电子邮件地址或 Skype 与我们联系。", + "ls3": "注：请尽量以视频或图片的形式告诉我们您的需求，并提供3MF文件、G-Code文件、机器编号等必要信息。", }, "ja": { "t0": "QIDISlicerへようこそ", @@ -37,6 +49,12 @@ var LangText={ "t8": "製品情報", "t9": "お問い合わせください", "t10": "フィラメント", + "t11": "テキストを追加", + "t12": "カットモデル", + "t13": "モデルをダウンロード", + "ls1": "3Dモデルは以下のWebサイトからダウンロードできます。", + "ls2": "如果您对打印机或 QIDISlicer 有任何疑问，请通过相应的电子邮件地址或 Skype 与我们联系。", + "ls3": "注：请尽量以视频或图片的形式告诉我们您的需求，并提供3MF文件、G-Code文件、机器编号等必要信息。", }, "fr": { "t0": "Bienvenue dans QIDISlicer", @@ -50,6 +68,12 @@ var LangText={ "t8": "Informations sur le produit", "t9": "Contactez-nous", "t10": "Filament", + "t11": "Ajouter du texte", + "t12": "Couper le modèle", + "t13": "Télécharger le modèle", + "ls1": "Vous pouvez télécharger des modèles 3D à partir des sites Web suivants.", + "ls2": "Si vous avez des questions sur l'imprimante ou le QIDISlicer, veuillez nous contacter via l'adresse e-mail appropriée ou via Skype.", + "ls3": "Remarque : veuillez essayer de nous indiquer vos besoins sous forme de vidéo ou d'images, et fournir un fichier 3MF, un fichier G-code, un numéro de machine et d'autres informations nécessaires.", }, "de": { "t0": "Willkommen bei QIDISlicer", @@ -63,6 +87,12 @@ var LangText={ "t8": "Produktinformationen", "t9": "Kontaktieren Sie uns", "t10": "Filament", + "t11": "Text hinzufügen", + "t12": "Modell schneiden", + "t13": "Modell herunterladen", + "ls1": "Sie können 3D-Modelle von den folgenden Websites herunterladen.", + "ls2": "Wenn Sie Fragen zum Drucker oder QIDISlicer haben, kontaktieren Sie uns bitte über die entsprechende E-Mail-Adresse oder Skype.", + "ls3": "Hinweis: Bitte versuchen Sie, uns Ihre Anforderungen in Form von Videos oder Bildern mitzuteilen und geben Sie die 3MF-Datei, die G-Code-Datei, die Maschinennummer und andere notwendige Informationen an.", }, "be": { "t0": "Вітаем у QIDISlicer", @@ -76,6 +106,12 @@ var LangText={ "t8": "Інфармацыя аб прадукце", "t9": "Звязацца з намі", "t10": "Філамент", + "t11": "Дадаць тэкст", + "t12": "Разрэзаная мадэль", + "t13": "Спампаваць мадэль", + "ls1": "Вы можаце загрузіць 3D-мадэлі з наступных сайтаў.", + "ls2": "Калі ў вас ёсць якія-небудзь пытанні аб прынтары або QIDISlicer, калі ласка, звяжыцеся з намі праз адпаведны адрас электроннай пошты або Skype.", + "ls3": "Заўвага: калі ласка, паспрабуйце паведаміць нам свае патрабаванні ў выглядзе відэа ці малюнкаў, а таксама прадаставіць файл 3MF, файл G-кода, нумар машыны і іншую неабходную інфармацыю.", }, "ca": { "t0": "Benvingut a QIDISlicer", @@ -89,6 +125,12 @@ var LangText={ "t8": "Informació del producte", "t9": "Contacteu amb nosaltres", "t10": "Filament", + "t11": "Afegeix text", + "t12": "Tallar el model", + "t13": "Baixa el model", + "ls1": "Podeu descarregar models 3D dels següents llocs web.", + "ls2": "Si teniu cap pregunta sobre la impressora o QIDISlicer, poseu-vos en contacte amb nosaltres mitjançant l'adreça de correu electrònic corresponent o Skype.", + "ls3": "Nota: proveu d'indicar-nos els vostres requisits en forma de vídeo o imatges i proporcioneu un fitxer 3MF, un fitxer de codi G, un número de màquina i altra informació necessària.", }, "cs": { "t0": "Vítejte v QIDISlicer", @@ -102,6 +144,12 @@ var LangText={ "t8": "Informace o produktu", "t9": "Kontaktujte nás", "t10": "Filament", + "t11": "Přidat text", + "t12": "Vyříznutý model", + "t13": "Stáhnout model", + "ls1": "3D modely si můžete stáhnout z následujících webových stránek.", + "ls2": "Máte-li jakékoli dotazy týkající se tiskárny nebo QIDISlicer, kontaktujte nás prosím prostřednictvím příslušné e-mailové adresy nebo Skype.", + "ls3": "Poznámka: Zkuste nám prosím sdělit své požadavky ve formě videa nebo obrázků a poskytněte soubor 3MF, soubor G-kódu, číslo stroje a další potřebné informace.", }, "es": { "t0": "Bienvenido a QIDISlicer", @@ -115,6 +163,12 @@ var LangText={ "t8": "Información del producto", "t9": "Contacta con nosotros", "t10": "Filamento", + "t11": "Agregar texto", + "t12": "Modelo cortado", + "t13": "Descargar Modelo", + "ls1": "Puede descargar modelos 3D de los siguientes sitios web.", + "ls2": "Si tiene alguna pregunta sobre la impresora o QIDISlicer, comuníquese con nosotros a través de la dirección de correo electrónico correspondiente o Skype.", + "ls3": "Nota: intente decirnos sus requisitos en forma de video o imágenes, y proporcione el archivo 3MF, el archivo de código G, el número de máquina y otra información necesaria.", }, }; diff --git a/resources/web/guide/css/home.css b/resources/web/guide/css/home.css index c1950b8..678f3d8 100644 --- a/resources/web/guide/css/home.css +++ b/resources/web/guide/css/home.css @@ -322,6 +322,15 @@ li { left: 0px; } +@media screen{ + .halfBlock { + text-align: center; + justify-content: center; + width: calc(50% - 20px); + margin: 0px 10px; + } +} + @media screen and (max-width: 1100px) { .PrintBlock { text-align:center; @@ -404,7 +413,8 @@ td, th { } th { - background-color: lightblue; + background-color: #4F6EBC; + color: #fff; } table { @@ -416,11 +426,11 @@ td:first-child, th:first-child { position: sticky; left: 0; /* 首行永远固定在左侧 */ z-index: 1; - background-color: lightpink; + background: #CDDBFB; } -td:not(:first-child), th:not(:first-child) { - padding +th:nth-child(odd) { /*奇表头*/ + background-color: #6993FB; } thead tr th { @@ -428,9 +438,12 @@ thead tr th { top: 0; /* 列首永远固定在头部 */ } +tbody tr:nth-child(odd) { + background: #B7B9BF; +} + th:first-child { z-index: 2; - background-color: lightblue; } /*------Gif------*/ @@ -470,6 +483,8 @@ th:first-child { } .UG_IMG { + justify-content:center; + text-align:center; width: 100%; } @@ -496,8 +511,10 @@ th:first-child { } .UG_CDESC { + margin-top:35px; + margin-bottom:5px; text-align: center; - font-size: 14px; + font-size: 24px; width: 100%; line-height: 20px; } @@ -509,7 +526,7 @@ th:first-child { line-height: 25px; width: 100%; margin-top: 20px; - margin-bottom: 4px; + margin-bottom: 25px; color: #4479FB; } @@ -517,6 +534,5 @@ th:first-child { font-size: 16px; width: 100%; line-height: 20px; - margin-top: 30px; margin-bottom: 50px; } \ No newline at end of file diff --git a/resources/web/guide/img/AddText.gif b/resources/web/guide/img/AddText.gif new file mode 100644 index 0000000..255e55b Binary files /dev/null and b/resources/web/guide/img/AddText.gif differ diff --git a/resources/web/guide/img/CutModel.gif b/resources/web/guide/img/CutModel.gif new file mode 100644 index 0000000..a08b735 Binary files /dev/null and b/resources/web/guide/img/CutModel.gif differ diff --git a/resources/web/guide/img/DownloadModel.png b/resources/web/guide/img/DownloadModel.png new file mode 100644 index 0000000..b0721dc Binary files /dev/null and b/resources/web/guide/img/DownloadModel.png differ diff --git a/resources/web/guide/img/printables.png b/resources/web/guide/img/printables.png new file mode 100644 index 0000000..44a4c1f Binary files /dev/null and b/resources/web/guide/img/printables.png differ diff --git a/resources/web/guide/img/thingiverse.png b/resources/web/guide/img/thingiverse.png new file mode 100644 index 0000000..688b9e0 Binary files /dev/null and b/resources/web/guide/img/thingiverse.png differ diff --git a/resources/web/guide/index.html b/resources/web/guide/index.html index ad414b9..af62967 100644 --- a/resources/web/guide/index.html +++ b/resources/web/guide/index.html @@ -48,6 +48,18 @@
UserGuide
+
  • +
    +
    UserGuide
    +
    • +
  • +
    +
    UserGuide
    +
    • +
  • +
    +
    UserGuide
    +
  • @@ -100,13 +112,25 @@
    AddSupport
    +
    +
    +
    WifiSend
    +
    ConnectDevice
    -
    -
    -
    WifiSend
    +
    +
    +
    AddText
    +
    +
    +
    +
    CutModel
    +
    +
    +
    +
    AddText
    @@ -146,16 +170,72 @@
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    download
    +
    +
    +
    +
    +
    +
    URL:https://www.thingiverse.com/
    +
    +
    +
    +
    URL:https://www.printables.com/model
    +
    +
    +
    +
    + +
    -
    +
    +
    +
    -
    +
    +
    +
    -
    +
    +
    +
    @@ -334,11 +414,9 @@
    -
    Issue Report
    -
    - If you have any questions about the Printer or QIDISlicer, please contact us via the appropriate E-mail address or Skype.
    - Note: please try to tell us your requirements in the form of video or pictures, and provide 3MF file, G-code file, machine number and other necessary information. -
    +
    +
    +
    diff --git a/resources/web/qidi/css/home.css b/resources/web/qidi/css/home.css index 3524a3f..e5bc468 100644 --- a/resources/web/qidi/css/home.css +++ b/resources/web/qidi/css/home.css @@ -1,18 +1,60 @@ -body -{ - background-color:#F4F7FE; - font-family: Arial, sans-serif; - display: flex; - justify-content: center; - align-items: center; - height: 100vh; - margin: 0; +body { + display: flex; + justify-content: center; + align-items: center; + /* ҳռĸ߶ */ + height: 100vh; } -.container { - text-align: center; - padding: 30px; - border-radius: 10px; - background-color: #ffffff; - box-shadow: 0 4px 6px rgba(39, 39, 39, 0.1); +#GifBoard { + display: flex; + flex-wrap: wrap; + align-content: flex-start; + align-items: center; + justify-content: center; + overflow-y: auto; + margin: 30px 40px; + position: relative; + top: 0px; + bottom: 0px; + right: 0px; + left: 0px; +} + +@media screen { + .GifBlock { + margin: 0px 0px 0px 0px; + cursor: pointer; + } +} + +.UG_IMG { + justify-content:center; + text-align:center; + width: 100%; +} + +.UG_IMG img { + width: 100%; + border-radius: 5px 5px 5px 5px; +} + +.UG_TITLE { + text-align: center; + font-size: 36px; + font-weight: 700; + line-height: 25px; + width: 100%; + margin-top: 20px; + color: #4479FB; +} + +.UG_DESC { + text-align:center; + font-size: 24px; + font-weight:lighter; + width: 100%; + line-height: 20px; + margin-top: 30px; + margin-bottom: 20px; } \ No newline at end of file diff --git a/resources/web/qidi/missing_connection.html b/resources/web/qidi/missing_connection.html index 5afaaa6..b5a1c48 100644 --- a/resources/web/qidi/missing_connection.html +++ b/resources/web/qidi/missing_connection.html @@ -6,16 +6,23 @@ Printer Connection Required - - - - + + + + -
    -

    Printer Connection

    -

    Please set up your printer connection to view the device.

    - Printer connection setup demonstration +
    +
    +
    +
    + Please set up your printer connection to view the device. +
    +
    +
    + diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp index 85be51f..11dc910 100644 --- a/src/libslic3r/AppConfig.cpp +++ b/src/libslic3r/AppConfig.cpp @@ -90,6 +90,8 @@ void AppConfig::set_defaults() set("associate_3mf", "0"); if (get("associate_stl").empty()) set("associate_stl", "0"); + if (get("associate_step").empty()) + set("associate_step", "0"); if (get("tabs_as_menu").empty()) set("tabs_as_menu", "0"); diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 246a51a..e88a7fe 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -888,9 +888,8 @@ void PrintConfigDef::init_fff_params() def = this->add("extra_perimeters", coBool); def->label = L("Extra perimeters if needed"); def->category = L("Layers and Perimeters"); - def->tooltip = L("Add more perimeters when needed for avoiding gaps in sloping walls. " - "Slic3r keeps adding perimeters, until more than 70% of the loop immediately above " - "is supported."); + def->tooltip = L("Add more perimeters when needed for avoiding gaps in sloping walls. Slic3r keeps adding " + "perimeters, until more than 70% of the loop immediately above is supported."); def->mode = comExpert; def->set_default_value(new ConfigOptionBool(true)); diff --git a/src/slic3r/GUI/ConfigWizard.cpp b/src/slic3r/GUI/ConfigWizard.cpp index b87799b..00ee272 100644 --- a/src/slic3r/GUI/ConfigWizard.cpp +++ b/src/slic3r/GUI/ConfigWizard.cpp @@ -1610,11 +1610,13 @@ PageFilesAssociation::PageFilesAssociation(ConfigWizard* parent) { cb_3mf = new wxCheckBox(this, wxID_ANY, _L("Associate .3mf files to QIDISlicer")); cb_stl = new wxCheckBox(this, wxID_ANY, _L("Associate .stl files to QIDISlicer")); -// cb_gcode = new wxCheckBox(this, wxID_ANY, _L("Associate .gcode files to QIDISlicer G-code Viewer")); + cb_step = new wxCheckBox(this, wxID_ANY, _L("Associate .step/.stp files to QIDISlicer")); + // cb_gcode = new wxCheckBox(this, wxID_ANY, _L("Associate .gcode files to QIDISlicer G-code Viewer")); append(cb_3mf); append(cb_stl); -// append(cb_gcode); + append(cb_step); + // append(cb_gcode); } #endif // _WIN32 @@ -3268,13 +3270,16 @@ bool ConfigWizard::priv::apply_config(AppConfig *app_config, PresetBundle *prese #ifdef _WIN32 app_config->set("associate_3mf", page_files_association->associate_3mf() ? "1" : "0"); app_config->set("associate_stl", page_files_association->associate_stl() ? "1" : "0"); -// app_config->set("associate_gcode", page_files_association->associate_gcode() ? "1" : "0"); + app_config->set("associate_step", page_files_association->associate_step() ? "1" : "0"); + // app_config->set("associate_gcode", page_files_association->associate_gcode() ? "1" : "0"); if (wxGetApp().is_editor()) { if (page_files_association->associate_3mf()) wxGetApp().associate_3mf_files(); if (page_files_association->associate_stl()) wxGetApp().associate_stl_files(); + if (page_files_association->associate_step()) + wxGetApp().associate_step_files(); } // else { // if (page_files_association->associate_gcode()) diff --git a/src/slic3r/GUI/ConfigWizard_private.hpp b/src/slic3r/GUI/ConfigWizard_private.hpp index c59086e..51700f9 100644 --- a/src/slic3r/GUI/ConfigWizard_private.hpp +++ b/src/slic3r/GUI/ConfigWizard_private.hpp @@ -439,6 +439,7 @@ struct PageFilesAssociation : ConfigWizardPage private: wxCheckBox* cb_3mf{ nullptr }; wxCheckBox* cb_stl{ nullptr }; + wxCheckBox* cb_step{ nullptr }; // wxCheckBox* cb_gcode; public: @@ -446,7 +447,8 @@ public: bool associate_3mf() const { return cb_3mf->IsChecked(); } bool associate_stl() const { return cb_stl->IsChecked(); } -// bool associate_gcode() const { return cb_gcode->IsChecked(); } + bool associate_step() const { return cb_step->IsChecked(); } + // bool associate_gcode() const { return cb_gcode->IsChecked(); } }; #endif // _WIN32 diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index efaf33a..3afc160 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -1291,6 +1291,8 @@ bool GUI_App::on_init_inner() associate_3mf_files(); if (app_config->get_bool("associate_stl")) associate_stl_files(); + if (app_config->get_bool("associate_step")) + associate_step_files(); #endif // __WXMSW__ preset_updater = new PresetUpdater(); @@ -2605,6 +2607,8 @@ void GUI_App::open_preferences(const std::string& highlight_option /*= std::stri associate_3mf_files(); if (app_config->get_bool("associate_stl")) associate_stl_files(); + if (app_config->get_bool("associate_step")) + associate_step_files(); } else { if (app_config->get_bool("associate_gcode")) @@ -3389,6 +3393,12 @@ void GUI_App::associate_stl_files() associate_file_type(L".stl", L"QIDI.Slicer.1", L"QIDISlicer", true); } +void GUI_App::associate_step_files() +{ + associate_file_type(L".step", L"QIDI.Slicer.1", L"QIDISlicer", true); + associate_file_type(L".stp", L"QIDI.Slicer.1", L"QIDISlicer", true); +} + void GUI_App::associate_gcode_files() { associate_file_type(L".gcode", L"QIDISlicer.GCodeViewer.1", L"QIDISlicerGCodeViewer", true); diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp index f47de4a..0d76700 100644 --- a/src/slic3r/GUI/GUI_App.hpp +++ b/src/slic3r/GUI/GUI_App.hpp @@ -373,6 +373,7 @@ public: #ifdef __WXMSW__ void associate_3mf_files(); void associate_stl_files(); + void associate_step_files(); void associate_gcode_files(); #endif // __WXMSW__ diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp index 7d418d8..8af4976 100644 --- a/src/slic3r/GUI/Preferences.cpp +++ b/src/slic3r/GUI/Preferences.cpp @@ -279,6 +279,11 @@ void PreferencesDialog::build() L("Associate .stl files to QIDISlicer"), L("If enabled, sets QIDISlicer as default application to open .stl files."), app_config->get_bool("associate_stl")); + + append_bool_option(m_optgroup_general, "associate_step", + L("Associate .stp files to QIDISlicer"), + L("If enabled, sets QIDISlicer as default application to open .stp files."), + app_config->get_bool("associate_step")); #endif // _WIN32 m_optgroup_general->append_separator();