Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/prusa3d/PrusaSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src/slic3r/GUI
diff options
context:
space:
mode:
Diffstat (limited to 'src/slic3r/GUI')
-rw-r--r--src/slic3r/GUI/GLToolbar.cpp10
-rw-r--r--src/slic3r/GUI/GUI_ObjectList.cpp2
-rw-r--r--src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp8
-rw-r--r--src/slic3r/GUI/Plater.cpp14
-rw-r--r--src/slic3r/GUI/PresetHints.cpp4
-rw-r--r--src/slic3r/GUI/UpdateDialogs.cpp4
6 files changed, 21 insertions, 21 deletions
diff --git a/src/slic3r/GUI/GLToolbar.cpp b/src/slic3r/GUI/GLToolbar.cpp
index 51d787d9d..bd87778c9 100644
--- a/src/slic3r/GUI/GLToolbar.cpp
+++ b/src/slic3r/GUI/GLToolbar.cpp
@@ -368,7 +368,7 @@ void GLToolbar::get_additional_tooltip(int item_id, std::string& text)
}
}
- text = L("");
+ text.clear();
}
void GLToolbar::set_additional_tooltip(int item_id, const std::string& text)
@@ -443,7 +443,7 @@ bool GLToolbar::on_mouse(wxMouseEvent& evt, GLCanvas3D& parent)
if (item_id == -1)
{
// mouse is outside the toolbar
- m_tooltip = L("");
+ m_tooltip.clear();
}
else
{
@@ -610,7 +610,7 @@ void GLToolbar::do_action(GLToolbarItem::EActionType type, int item_id, GLCanvas
std::string GLToolbar::update_hover_state(const Vec2d& mouse_pos, GLCanvas3D& parent)
{
if (!m_enabled)
- return L("");
+ return "";
switch (m_layout.type)
{
@@ -665,7 +665,7 @@ std::string GLToolbar::update_hover_state_horizontal(const Vec2d& mouse_pos, GLC
{
const std::string& additional_tooltip = item->get_additional_tooltip();
if (!additional_tooltip.empty())
- tooltip += L("\n") + additional_tooltip;
+ tooltip += "\n" + additional_tooltip;
}
}
@@ -769,7 +769,7 @@ std::string GLToolbar::update_hover_state_vertical(const Vec2d& mouse_pos, GLCan
{
const std::string& additional_tooltip = item->get_additional_tooltip();
if (!additional_tooltip.empty())
- tooltip += L("\n") + additional_tooltip;
+ tooltip += "\n" + additional_tooltip;
}
}
diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp
index aa10aca52..268ae93cf 100644
--- a/src/slic3r/GUI/GUI_ObjectList.cpp
+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
@@ -328,7 +328,7 @@ wxString ObjectList::get_mesh_errors_list(const int obj_idx, const int vol_idx /
return ""; // hide tooltip
// Create tooltip string, if there are errors
- wxString tooltip = wxString::Format(_(L("Auto-repaired (%d errors):\n")), errors);
+ wxString tooltip = wxString::Format(_(L("Auto-repaired (%d errors):")), errors) + "\n";
const stl_stats& stats = vol_idx == -1 ?
(*m_objects)[obj_idx]->get_object_stl_stats() :
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
index 000ddf8c9..f58d1885f 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
@@ -1186,10 +1186,10 @@ void GLGizmoSlaSupports::get_data_from_backend()
void GLGizmoSlaSupports::auto_generate()
{
- wxMessageDialog dlg(GUI::wxGetApp().plater(), _(L(
- "Autogeneration will erase all manually edited points.\n\n"
- "Are you sure you want to do it?\n"
- )), _(L("Warning")), wxICON_WARNING | wxYES | wxNO);
+ wxMessageDialog dlg(GUI::wxGetApp().plater(),
+ _(L("Autogeneration will erase all manually edited points.")) + "\n\n" +
+ _(L("Are you sure you want to do it?")) + "\n",
+ _(L("Warning")), wxICON_WARNING | wxYES | wxNO);
if (m_model_object->sla_points_status != sla::PointsStatus::UserModified || m_normal_cache.empty() || dlg.ShowModal() == wxID_YES) {
Plater::TakeSnapshot snapshot(wxGetApp().plater(), _(L("Autogenerate support points")));
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index 169cbcb60..7014b96a6 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -2284,7 +2284,7 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
for (size_t i = 0; i < input_files.size(); i++) {
const auto &path = input_files[i];
const auto filename = path.filename();
- const auto dlg_info = wxString::Format(_(L("Processing input file %s\n")), from_path(filename));
+ const auto dlg_info = wxString::Format(_(L("Processing input file %s")), from_path(filename)) + "\n";
dlg.Update(100 * i / input_files.size(), dlg_info);
const bool type_3mf = std::regex_match(path.string(), pattern_3mf);
@@ -2358,17 +2358,17 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
if (! is_project_file) {
if (model.looks_like_multipart_object()) {
wxMessageDialog msg_dlg(q, _(L(
- "This file contains several objects positioned at multiple heights. "
+ "This file contains several objects positioned at multiple heights.\n"
"Instead of considering them as multiple objects, should I consider\n"
- "this file as a single object having multiple parts?\n"
- )), _(L("Multi-part object detected")), wxICON_WARNING | wxYES | wxNO);
+ "this file as a single object having multiple parts?")) + "\n",
+ _(L("Multi-part object detected")), wxICON_WARNING | wxYES | wxNO);
if (msg_dlg.ShowModal() == wxID_YES) {
model.convert_multipart_object(nozzle_dmrs->values.size());
}
}
}
else if ((wxGetApp().get_mode() == comSimple) && (type_3mf || type_any_amf) && model_has_advanced_features(model)) {
- wxMessageDialog msg_dlg(q, _(L("This file cannot be loaded in a simple mode. Do you want to switch to an advanced mode?\n")),
+ wxMessageDialog msg_dlg(q, _(L("This file cannot be loaded in a simple mode. Do you want to switch to an advanced mode?"))+"\n",
_(L("Detected advanced data")), wxICON_WARNING | wxYES | wxNO);
if (msg_dlg.ShowModal() == wxID_YES)
{
@@ -2413,8 +2413,8 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
wxMessageDialog msg_dlg(q, _(L(
"Multiple objects were loaded for a multi-material printer.\n"
"Instead of considering them as multiple objects, should I consider\n"
- "these files to represent a single object having multiple parts?\n"
- )), _(L("Multi-part object detected")), wxICON_WARNING | wxYES | wxNO);
+ "these files to represent a single object having multiple parts?")) + "\n",
+ _(L("Multi-part object detected")), wxICON_WARNING | wxYES | wxNO);
if (msg_dlg.ShowModal() == wxID_YES) {
new_model->convert_multipart_object(nozzle_dmrs->values.size());
}
diff --git a/src/slic3r/GUI/PresetHints.cpp b/src/slic3r/GUI/PresetHints.cpp
index a02772c4d..f6281d7af 100644
--- a/src/slic3r/GUI/PresetHints.cpp
+++ b/src/slic3r/GUI/PresetHints.cpp
@@ -32,11 +32,11 @@ std::string PresetHints::cooling_description(const Preset &preset)
% slowdown_below_layer_time % max_fan_speed % slowdown_below_layer_time % min_print_speed).str();
if (fan_below_layer_time > slowdown_below_layer_time) {
- out += (boost::format(_utf8(L("\nIf estimated layer time is greater, but still below ~%1%s, "
+ out += "\n" + (boost::format(_utf8(L("If estimated layer time is greater, but still below ~%1%s, "
"fan will run at a proportionally decreasing speed between %2%%% and %3%%%.")))
% fan_below_layer_time % max_fan_speed % min_fan_speed).str();
}
- out += _utf8(L("\nDuring the other layers, fan")) + " ";
+ out += "\n" + _utf8(L("During the other layers, fan")) + " ";
} else {
out = _utf8(L("Fan")) + " ";
}
diff --git a/src/slic3r/GUI/UpdateDialogs.cpp b/src/slic3r/GUI/UpdateDialogs.cpp
index d2a5e185a..00e7725ac 100644
--- a/src/slic3r/GUI/UpdateDialogs.cpp
+++ b/src/slic3r/GUI/UpdateDialogs.cpp
@@ -156,8 +156,8 @@ MsgDataIncompatible::MsgDataIncompatible(const std::unordered_map<std::string, w
"This probably happened as a result of running an older %s after using a newer one.\n\n"
"You may either exit %s and try again with a newer version, or you may re-run the initial configuration. "
- "Doing so will create a backup snapshot of the existing configuration before installing files compatible with this %s.\n"
- )), SLIC3R_APP_NAME, SLIC3R_APP_NAME, SLIC3R_APP_NAME, SLIC3R_APP_NAME));
+ "Doing so will create a backup snapshot of the existing configuration before installing files compatible with this %s.")) + "\n",
+ SLIC3R_APP_NAME, SLIC3R_APP_NAME, SLIC3R_APP_NAME, SLIC3R_APP_NAME));
text->Wrap(CONTENT_WIDTH * wxGetApp().em_unit());
content_sizer->Add(text);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-25 04:37:39 +0300