QIDITECH/QIDISlicer
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDISlicer.git synced 2026-02-02 17:08:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
sunsets
2024-01-09 09:19:16 +08:00
parent bfff15eb8e
commit cad0b137b4
31 changed files with 52 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/AboutDialog.cpp
View File

@@ -276,7 +276,7 @@ AboutDialog::AboutDialog()
const wxString s_url_str = _L("Shopify : https://qidi3d.com/");
const wxString is_lecensed_str = _L("is licensed under the");
const wxString license_str = _L("GNU Affero General Public License, version 3");
const wxString version_str = std::string(SLIC3R_APP_NAME) + " " + std::string(SLIC3R_VERSION) + _L(" is based on PrusaSlicer.");
const wxString version_str = std::string(SLIC3R_APP_NAME) + " " + std::string(SLIC3R_VERSION) + _L(" is based on QIDISlicer.");
const wxString based_on_str = _L("QIDISlicer is based on Slic3r by Alessandro Ranellucci and the RepRap community.");
const wxString contributors_str = _L("QIDISlicer has made targeted adjustment and adaptation to QIDITech 3D printers, so that QIDITech 3D printers are more friendly to novices. It is recommended to use QIDITech 3D printers.");
const auto text = format_wxstr(
@@ -289,7 +289,7 @@ AboutDialog::AboutDialog()
"<a href=\"https://qidi3d.com/\">%6%</a>"
"<br /><br />"
"%7%<br />"
"%8% &copy; 2016-2023 Prusa Research. <br />"
"%8% &copy; 2016-2023 QIDI Research. <br />"
"%9% &copy; 2011-2018 Alessandro Ranellucci. <br />"
"<a href=\"http://slic3r.org/\">Slic3r</a> %10% "
"<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\">%11%</a>."

2
src/slic3r/GUI/ConfigWizard.cpp
View File

@@ -1489,7 +1489,7 @@ PageDownloader::PageDownloader(ConfigWizard* parent)
const wxString link = format_wxstr("<a href = \"%1%\">%1%</a>", "printables.com");
// TRN ConfigWizard : Downloader : %1% = "printables.com", %2% = "PrusaSlicer"
// TRN ConfigWizard : Downloader : %1% = "printables.com", %2% = "QIDISlicer"
const wxString main_text = format_wxstr(_L("If enabled, you will be able to open models from the %1% "
"online database with a single click (using a %2% logo button)."
), link, SLIC3R_APP_NAME);

2
src/slic3r/GUI/EditGCodeDialog.cpp
View File

@@ -55,7 +55,7 @@ EditGCodeDialog::EditGCodeDialog(wxWindow* parent, const std::string& key, const
const auto text_clr_str = encode_color(ColorRGB(text_clr.Red(), text_clr.Green(), text_clr.Blue()));
//TRN this word-combination is a part of phraze "For more information about placeholders and its use visit our help page"
const wxString link = format_wxstr("<a href = \"%1%\">%2%</a>", "help.prusa3d.com/article/macros_1775", _L("help page"));
const wxString link = format_wxstr("<a href = \"%1%\">%2%</a>", "help.qidi3d.com/article/macros_1775", _L("help page"));
// TRN ConfigWizard : Downloader : %1% = "help page"
const wxString main_text = format_wxstr(_L("For more information about placeholders and its use visit our %1%."), link);

2
src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
View File

@@ -3274,7 +3274,7 @@ static void check_objects_after_cut(const ModelObjectPtrs& objects)
names += ", " + from_u8(err_objects_names[i]);
WarningDialog(wxGetApp().plater(), format_wxstr("Objects(%1%) have duplicated connectors. "
"Some connectors may be missing in slicing result.\n"
"Please report to PrusaSlicer team in which scenario this issue happened.\n"
"Please report to QIDISlicer team in which scenario this issue happened.\n"
"Thank you.", names)).ShowModal();
}
void synchronize_model_after_cut(Model& model, const CutObjectBase& cut_id)

2
src/slic3r/GUI/PhysicalPrinterDialog.cpp
View File

@@ -488,7 +488,7 @@ void PhysicalPrinterDialog::update(bool printer_change)
const auto opt = m_config->option<ConfigOptionEnum<PrintHostType>>("host_type");
m_optgroup->show_field("host_type");
if (opt->value == htQIDILink) { // PrusaConnect does NOT allow http digest
if (opt->value == htQIDILink) { // QIDIConnect does NOT allow http digest
m_optgroup->show_field("printhost_authorization_type");
AuthorizationType auth_type = m_config->option<ConfigOptionEnum<AuthorizationType>>("printhost_authorization_type")->value;
m_optgroup->show_field("printhost_apikey", auth_type == AuthorizationType::atKeyPassword);

6
src/slic3r/GUI/Plater.cpp
View File

@@ -2300,7 +2300,7 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
notification_manager->device_ejected();
});
this->q->Bind(EVT_REMOVABLE_DRIVE_ADDED, [this](wxCommandEvent& evt) {
if (!fs::exists(fs::path(evt.GetString().utf8_string()) / "prusa_printer_settings.ini"))
if (!fs::exists(fs::path(evt.GetString().utf8_string()) / "qidi_printer_settings.ini"))
return;
if (evt.GetInt() == 0) { // not at startup, show dialog
wxGetApp().open_wifi_config_dialog(false, evt.GetString());
@@ -2484,8 +2484,8 @@ void Plater::notify_about_installed_presets()
// show notification about temporarily installed presets
if (!names.empty()) {
std::string notif_text = into_u8(_L_PLURAL("The preset below was temporarily installed on the active instance of PrusaSlicer",
"The presets below were temporarily installed on the active instance of PrusaSlicer", names.size())) + ":";
std::string notif_text = into_u8(_L_PLURAL("The preset below was temporarily installed on the active instance of QIDISlicer",
"The presets below were temporarily installed on the active instance of QIDISlicer", names.size())) + ":";
for (const std::string& name : names)
notif_text += "\n - " + name;
get_notification_manager()->push_notification(NotificationType::CustomNotification,

2
src/slic3r/GUI/Plater.hpp
View File

@@ -19,7 +19,7 @@
#include "libslic3r/GCode.hpp"
#include "libslic3r/Gcode/GCodeWriter.hpp"
// #include "libslic3r/Gcode/GCodeWriter.hpp"
#include "libslic3r/PrintConfig.hpp"
class wxButton;

4
src/slic3r/GUI/Preferences.cpp
View File

@@ -399,8 +399,8 @@ void PreferencesDialog::build()
L("If enabled, sets QIDISlicer G-code Viewer as default application to open .gcode files."),
app_config->get_bool("associate_gcode"));
append_bool_option(m_optgroup_general, "associate_bgcode",
L("Associate .bgcode files to PrusaSlicer G-code Viewer"),
L("If enabled, sets PrusaSlicer G-code Viewer as default application to open .bgcode files."),
L("Associate .bgcode files to QIDISlicer G-code Viewer"),
L("If enabled, sets QIDISlicer G-code Viewer as default application to open .bgcode files."),
app_config->get_bool("associate_bgcode"));
}
#endif // _WIN32

8
src/slic3r/GUI/Widgets/WebView.cpp
View File

@@ -180,12 +180,12 @@ wxWebView *WebView::CreateWebView(wxWindow *parent, wxString const &url)
if (webView) {
//webView->SetBackgroundColour(StateColor::darkModeColorFor(*wxWHITE));
#ifdef __WIN32__
webView->SetUserAgent(wxString::Format("BBL-Slicer/v%s (%s) Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
webView->SetUserAgent(wxString::Format("QIDI-Slicer/v%s (%s) Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
"AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36 Edg/107.0.1418.52",
SLIC3R_VERSION, Slic3r::GUI::wxGetApp().dark_mode() ? "dark" : "light"));
webView->Create(parent, wxID_ANY, url2, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE);
// We register the wxfs:// protocol for testing purposes
webView->RegisterHandler(wxSharedPtr<wxWebViewHandler>(new wxWebViewArchiveHandler("bbl")));
webView->RegisterHandler(wxSharedPtr<wxWebViewHandler>(new wxWebViewArchiveHandler("qidi")));
// And the memory: file system
webView->RegisterHandler(wxSharedPtr<wxWebViewHandler>(new wxWebViewFSHandler("memory")));
#else
@@ -195,7 +195,7 @@ wxWebView *WebView::CreateWebView(wxWindow *parent, wxString const &url)
webView->RegisterHandler(wxSharedPtr<wxWebViewHandler>(new wxWebViewFSHandler("memory")));
webView->Create(parent, wxID_ANY, url2, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE);
webView->SetUserAgent(
wxString::Format("BBL-Slicer/v%s (%s) Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko)",
wxString::Format("QIDI-Slicer/v%s (%s) Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko)",
SLIC3R_VERSION, Slic3r::GUI::wxGetApp().dark_mode() ? "dark" : "light"));
#endif
#ifdef __WXMAC__
@@ -291,7 +291,7 @@ void WebView::RecreateAll()
{
for (auto webView : g_webviews) {
webView->SetUserAgent(
wxString::Format("BBL-Slicer/v%s (%s) Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko)",
wxString::Format("QIDI-Slicer/v%s (%s) Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko)",
SLIC3R_VERSION, Slic3r::GUI::wxGetApp().dark_mode() ? "dark" : "light"));
webView->Reload();
}

2
src/slic3r/GUI/WifiConfigDialog.cpp
View File

@@ -20,7 +20,7 @@
namespace Slic3r {
namespace GUI {
const char* WIFI_CONFIGFILE_NAME = "prusa_printer_settings.ini";
const char* WIFI_CONFIGFILE_NAME = "qidi_printer_settings.ini";
WifiConfigDialog::WifiConfigDialog(wxWindow* parent, std::string& file_path, RemovableDriveManager* removable_manager, const wxString& preffered_drive)
// TRN: This is the dialog title.