Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix some msvc compile error under Chinese Windows system. #5583

Closed
wants to merge 1 commit into from
Closed

fix some msvc compile error under Chinese Windows system. #5583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/slic3r/GUI/GUI_App.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ enum ConfigMenuIDs {
class Tab;
class ConfigWizard;

static wxString dots("…", wxConvUTF8);
static wxString dots("...", wxConvUTF8);

// Does our wxWidgets version support markup?
// https://github.com/prusa3d/PrusaSlicer/issues/4282#issuecomment-634676371
Expand Down
2 changes: 1 addition & 1 deletion src/slic3r/GUI/MainFrame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1361,7 +1361,7 @@ void MainFrame::quick_slice(const int qs)
// auto sprint = new Slic3r::Print::Simple(
// print_center = > print_center,
// status_cb = > [](int percent, const wxString& msg) {
// m_progress_dialog->Update(percent, msg+"…");
// m_progress_dialog->Update(percent, msg+"...");
// });

// keep model around
Expand Down
2 changes: 1 addition & 1 deletion src/slic3r/GUI/Plater.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3569,7 +3569,7 @@ void Plater::priv::on_slicing_update(SlicingStatusEvent &evt)
}

this->statusbar()->set_progress(evt.status.percent);
this->statusbar()->set_status_text(_(evt.status.text) + wxString::FromUTF8("…"));
this->statusbar()->set_status_text(_(evt.status.text) + wxString::FromUTF8("..."));
//notification_manager->set_progress_bar_percentage("Slicing progress", (float)evt.status.percent / 100.0f);
}
if (evt.status.flags & (PrintBase::SlicingStatus::RELOAD_SCENE | PrintBase::SlicingStatus::RELOAD_SLA_SUPPORT_POINTS)) {
Expand Down
4 changes: 2 additions & 2 deletions src/slic3r/GUI/PresetComboBoxes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ class PresetComboBox : public wxBitmapComboBox
static const char* separator_head() { return "------- "; }
static const char* separator_tail() { return " -------"; }
#else // __linux__
static const char* separator_head() { return "————— "; }
static const char* separator_tail() { return " —————"; }
static const char* separator_head() { return "------- "; }
static const char* separator_tail() { return " -------"; }
#endif // __linux__
static wxString separator(const std::string& label);

Expand Down