QIDITECH/QIDIStudio
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDIStudio.git synced 2026-02-02 09:58:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix some bug

Browse Source
This commit is contained in:
QIDI TECH
2025-02-26 20:25:18 +08:00
parent ffb5d3da8a
commit a19b41c650
17 changed files with 511 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/slic3r/GUI/GUI_App.cpp
View File

@@ -4590,7 +4590,7 @@ void GUI_App::on_http_error(wxCommandEvent &evt)
}
else if (status == 400 && code == HttpErrorCertRevoked) {
if (!m_show_error_msgdlg) {
MessageDialog msg_dlg(nullptr, _L("Your software certificate has been revoked, please update Bambu Studio software."), "", wxAPPLY | wxOK);
MessageDialog msg_dlg(nullptr, _L("Your software certificate has been revoked, please update QIDI Studio software."), "", wxAPPLY | wxOK);
m_show_error_msgdlg = true;
auto modal_result = msg_dlg.ShowModal();
m_show_error_msgdlg = false;
@@ -5025,7 +5025,7 @@ void GUI_App::process_network_msg(std::string dev_id, std::string msg)
else if (msg == "update_studio") {
BOOST_LOG_TRIVIAL(info) << "process_network_msg, update_studio";
if (!m_show_error_msgdlg) {
MessageDialog msg_dlg(nullptr, _L("Please try updating Bambu Studio and then try again."), "", wxAPPLY | wxOK);
MessageDialog msg_dlg(nullptr, _L("Please try updating QIDI Studio and then try again."), "", wxAPPLY | wxOK);
m_show_error_msgdlg = true;
auto modal_result = msg_dlg.ShowModal();
m_show_error_msgdlg = false;
@@ -5034,7 +5034,7 @@ void GUI_App::process_network_msg(std::string dev_id, std::string msg)
else if (msg == "update_fixed_studio") {
BOOST_LOG_TRIVIAL(info) << "process_network_msg, update_fixed_studio";
if (!m_show_error_msgdlg) {
MessageDialog msg_dlg(nullptr, _L("Please try updating Bambu Studio and then try again."), "", wxAPPLY | wxOK);
MessageDialog msg_dlg(nullptr, _L("Please try updating QIDI Studio and then try again."), "", wxAPPLY | wxOK);
m_show_error_msgdlg = true;
auto modal_result = msg_dlg.ShowModal();
m_show_error_msgdlg = false;
@@ -5043,7 +5043,7 @@ void GUI_App::process_network_msg(std::string dev_id, std::string msg)
else if (msg == "cert_expired") {
BOOST_LOG_TRIVIAL(info) << "process_network_msg, cert_expired";
if (!m_show_error_msgdlg) {
MessageDialog msg_dlg(nullptr, _L("The certificate has expired. Please check the time settings or update Bambu Studio and try again."), "", wxAPPLY | wxOK);
MessageDialog msg_dlg(nullptr, _L("The certificate has expired. Please check the time settings or update QIDI Studio and try again."), "", wxAPPLY | wxOK);
m_show_error_msgdlg = true;
auto modal_result = msg_dlg.ShowModal();
m_show_error_msgdlg = false;
@@ -5052,7 +5052,7 @@ void GUI_App::process_network_msg(std::string dev_id, std::string msg)
else if (msg == "cert_revoked") {
BOOST_LOG_TRIVIAL(info) << "process_network_msg, cert_revoked";
if (!m_show_error_msgdlg) {
MessageDialog msg_dlg(nullptr, _L("The certificate is no longer valid and the printing functions are unavailable. If you need printing. Please visit the official website at https://bambulab.com/ to download and update."), "", wxAPPLY | wxOK);
MessageDialog msg_dlg(nullptr, _L("The certificate is no longer valid and the printing functions are unavailable. If you need printing. Please visit the official website at https://qidi3d.com/ to download and update."), "", wxAPPLY | wxOK);
m_show_error_msgdlg = true;
auto modal_result = msg_dlg.ShowModal();
m_show_error_msgdlg = false;

10
src/slic3r/GUI/MainFrame.cpp
View File

@@ -1889,7 +1889,7 @@ wxBoxSizer* MainFrame::create_side_tools()
//y
// if (check_qdt_farm_client_installed()) {
// SideButton *send_to_multi_app_btn = new SideButton(p, _L("Send to Bambu Farm Manager Client"), "");
// SideButton *send_to_multi_app_btn = new SideButton(p, _L("Send to QIDI Farm Manager Client"), "");
// send_to_multi_app_btn->SetCornerRadius(0);
// p->append_button(send_to_multi_app_btn);
@@ -4031,15 +4031,15 @@ bool MainFrame::check_qdt_farm_client_installed()
{
#ifdef WIN32
HKEY hKey;
LONG result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\Bambulab\\Bambu Farm Manager Client"), 0, KEY_READ, &hKey);
LONG result_backup = RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("HKEY_CLASSES_ROOT\\bambu-farm-client\\shell\\open\\command"), 0, KEY_READ, &hKey);
LONG result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\QIDITech\\QIDI Farm Manager Client"), 0, KEY_READ, &hKey);
LONG result_backup = RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("HKEY_CLASSES_ROOT\\qidi-farm-client\\shell\\open\\command"), 0, KEY_READ, &hKey);
if (result == ERROR_SUCCESS || result_backup == ERROR_SUCCESS) {
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << "Bambu Farm Manager Client found.";
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << "QIDI Farm Manager Client found.";
RegCloseKey(hKey);
return true;
} else {
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << "Bambu Farm Manager Client Not found.";
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << "QIDI Farm Manager Client Not found.";
return false;
}

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

@@ -7599,8 +7599,8 @@ void Plater::priv::on_action_send_to_multi_app(SimpleEvent &)
#ifdef WIN32
HKEY hKey;
LONG result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\Bambulab\\Bambu Farm Manager Client"), 0, KEY_READ, &hKey);
LONG result_backup = RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("HKEY_CLASSES_ROOT\\bambu-farm-client\\shell\\open\\command"), 0, KEY_READ, &hKey);
LONG result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\QIDITech\\QIDI Farm Manager Client"), 0, KEY_READ, &hKey);
LONG result_backup = RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("HKEY_CLASSES_ROOT\\bqidi-farm-client\\shell\\open\\command"), 0, KEY_READ, &hKey);
if (result == ERROR_SUCCESS || result_backup == ERROR_SUCCESS) {
RegCloseKey(hKey);
@@ -7624,14 +7624,14 @@ void Plater::priv::on_action_send_to_multi_app(SimpleEvent &)
wxString filepath = wxString::FromUTF8(data._3mf_path.string());
filepath.Replace("\\", "/");
std::string filePath = "?version=v1.6.0&path=" + filepath.ToStdString() + "&name=" + filename.utf8_string();
wxString url = "bambu-farm-client://upload-file" + Http::url_encode(filePath);
wxString url = "qidi-farm-client://upload-file" + Http::url_encode(filePath);
if (!wxLaunchDefaultBrowser(url)) {
GUI::MessageDialog msgdialog(nullptr, _L("Failed to start Bambu Farm Manager Client."), "", wxAPPLY | wxOK);
GUI::MessageDialog msgdialog(nullptr, _L("Failed to start QIDI Farm Manager Client."), "", wxAPPLY | wxOK);
msgdialog.ShowModal();
}
} else {
GUI::MessageDialog msgdialog(nullptr, _L("No Bambu Farm Manager Client found."), "", wxAPPLY | wxOK);
GUI::MessageDialog msgdialog(nullptr, _L("No QIDI Farm Manager Client found."), "", wxAPPLY | wxOK);
msgdialog.ShowModal();
}
#endif // WIN32

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

@@ -904,7 +904,7 @@ static wxString MACHINE_BED_TYPE_STRING[BED_TYPE_COUNT] = {
_L("QIDI Cool Plate"),
_L("QIDI Engineering Plate"),
_L("QIDI Smooth PEI Plate") + "/" + _L("High temperature Plate"),
_L("Bamabu Textured PEI Plate"),
_L("QIDI Textured PEI Plate"),
_L("QIDI Cool Plate SuperTack")
};

8
src/slic3r/GUI/WebViewDialog.cpp
View File

@@ -812,9 +812,9 @@ void WebViewPanel::SetMakerlabUrl(std::string url) {
auto host = wxGetApp().get_model_http_url(wxGetApp().app_config->get_country_code());
std::string LabUrl;
if (url == "")
LabUrl = (boost::format("%1%makerlab?from=bambustudio") % host).str();
LabUrl = (boost::format("%1%makerlab?from=qidistudio") % host).str();
else
LabUrl = (boost::format("%1%%2%?from=bambustudio") % host % url).str();
LabUrl = (boost::format("%1%%2%?from=qidistudio") % host % url).str();
m_MakerLab_LastUrl = LabUrl;
}
@@ -1740,9 +1740,9 @@ void WebViewPanel::SwitchWebContent(std::string modelname, int refresh)
std::string strRegion = wxGetApp().app_config->get_country_code();
wxString MakerSupplyUrl;
if (strRegion == "CN")
MakerSupplyUrl = "https://bambulab.tmall.com/category-1761686934.htm?from=bambustudio";
MakerSupplyUrl = "https://qiditech.tmall.com/category-1761686934.htm?from=qidistudio";
else
MakerSupplyUrl = "https://store.bambulab.com/collections/makers-supply?from=bambustudio";
MakerSupplyUrl = "https://store.qiditech.com/collections/makers-supply?from=qidistudio";
wxLaunchDefaultBrowser(MakerSupplyUrl);
}

4
src/slic3r/Utils/NetworkAgent.cpp
View File

@@ -276,8 +276,8 @@ int NetworkAgent::initialize_network_module(bool using_backup)
connect_printer_ptr = reinterpret_cast<func_connect_printer>(get_network_function("qidi_network_connect_printer"));
disconnect_printer_ptr = reinterpret_cast<func_disconnect_printer>(get_network_function("qidi_network_disconnect_printer"));
send_message_to_printer_ptr = reinterpret_cast<func_send_message_to_printer>(get_network_function("qidi_network_send_message_to_printer"));
check_cert_ptr = reinterpret_cast<func_check_cert>(get_network_function("bambu_network_update_cert"));
install_device_cert_ptr = reinterpret_cast<func_install_device_cert>(get_network_function("bambu_network_install_device_cert"));
check_cert_ptr = reinterpret_cast<func_check_cert>(get_network_function("qidi_network_update_cert"));
install_device_cert_ptr = reinterpret_cast<func_install_device_cert>(get_network_function("qidi_network_install_device_cert"));
start_discovery_ptr = reinterpret_cast<func_start_discovery>(get_network_function("qidi_network_start_discovery"));
change_user_ptr = reinterpret_cast<func_change_user>(get_network_function("qidi_network_change_user"));
is_user_login_ptr = reinterpret_cast<func_is_user_login>(get_network_function("qidi_network_is_user_login"));