juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-22 18:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dev/bbl-network-upd

Browse Source
This commit is contained in:
Noisyfox
2025-06-01 19:33:39 +08:00
committed by GitHub
parent 3d64af917a b8c5ddd0ee
commit 9444d61bb6
59 changed files with 2853 additions and 3014 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -311,7 +311,7 @@ void MediaPlayCtrl::Play()
if (m_lan_proto <= MachineObject::LVL_Disable && (m_lan_mode || !m_remote_proto)) {
Stop(m_lan_proto == MachineObject::LVL_None
? _L("Problem occurred. Please update the printer firmware and try again.")
? _L("A problem occurred. Please update the printer firmware and try again.")
: _L("LAN Only Liveview is off. Please turn on the liveview on printer screen."));
return;
}
@@ -383,7 +383,7 @@ void MediaPlayCtrl::Stop(wxString const &msg, wxString const &msg2)
else if (m_failed_code) {
auto iter = error_messages.find(m_failed_code);
auto msg2 = iter == error_messages.end()
? _L("Please check the network and try again, You can restart or update the printer if the issue persists.")
? _L("Please check the network and try again. You can restart or update the printer if the issue persists.")
: _L(iter->second.c_str());
if (m_failed_code == 1) {
if (m_last_state == wxMEDIASTATE_PLAYING)