GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-16 05:36:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove icons from embossed text type selection

Browse Source
This commit is contained in:
Filip Sykala - NTB T15p 2023-01-10 22:12:54 +01:00
parent 4d12f08da7
commit 8197322249
2 changed files with 19 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
View File

@ -1403,25 +1403,6 @@ void GLGizmoEmboss::draw_window()
m_imgui->text_colored(ImGuiWrapper::COL_GREY_DARK, m_style_manager.get_style().path); m_imgui->text_colored(ImGuiWrapper::COL_GREY_DARK, m_style_manager.get_style().path);
#endif // SHOW_WX_FONT_DESCRIPTOR #endif // SHOW_WX_FONT_DESCRIPTOR
if (false) {
ImGui::Separator();
ImGui::PushStyleColor(ImGuiCol_Button, ImGuiWrapper::COL_GREY_DARK);
if (ImGui::Button(_u8L("Close").c_str()))
discard_and_close();
else if (ImGui::IsItemHovered())
ImGui::SetTooltip("%s", _u8L("Discard changes on embossed text and close.").c_str());
ImGui::PopStyleColor();
ImGui::SameLine();
if (ImGui::Button(_u8L("Apply").c_str())) {
if (m_is_unknown_font) {
process();
} else {
close();
}
}
}
#ifdef SHOW_CONTAIN_3MF_FIX #ifdef SHOW_CONTAIN_3MF_FIX
if (m_volume!=nullptr && if (m_volume!=nullptr &&
m_volume->text_configuration.has_value() && m_volume->text_configuration.has_value() &&
@ -2025,48 +2006,31 @@ void GLGizmoEmboss::draw_model_type()
ModelVolumeType part = ModelVolumeType::MODEL_PART; ModelVolumeType part = ModelVolumeType::MODEL_PART;
ModelVolumeType type = m_volume->type(); ModelVolumeType type = m_volume->type();
if (type == part) { if (ImGui::RadioButton(_u8L("Added").c_str(), type == part))
draw_icon(IconType::part, IconState::hovered); new_type = part;
} else { else if (ImGui::IsItemHovered())
if (draw_button(IconType::part)) new_type = part; ImGui::SetTooltip("%s", _u8L("Click to change text into object part.").c_str());
if (ImGui::IsItemHovered())
ImGui::SetTooltip("%s", _u8L("Click to change text into object part.").c_str());
}
ImGui::SameLine(); ImGui::SameLine();
ImGui::Text("%s", _u8L("Added").c_str());
std::string last_solid_part_hint = _u8L("You can't change a type of the last solid part of the object."); std::string last_solid_part_hint = _u8L("You can't change a type of the last solid part of the object.");
ImGui::SameLine(); if (ImGui::RadioButton(_u8L("Subtracted").c_str(), type == negative))
if (type == negative) { new_type = negative;
draw_icon(IconType::negative, IconState::hovered); else if (ImGui::IsItemHovered()) {
} else { if (is_last_solid_part)
if (draw_button(IconType::negative, is_last_solid_part)) ImGui::SetTooltip("%s", last_solid_part_hint.c_str());
new_type = negative; else if (type != negative)
if(ImGui::IsItemHovered()){ ImGui::SetTooltip("%s", _u8L("Click to change part type into negative volume.").c_str());
if(is_last_solid_part)
ImGui::SetTooltip("%s", last_solid_part_hint.c_str());
else if (type != negative)
ImGui::SetTooltip("%s", _u8L("Click to change part type into negative volume.").c_str());
}
} }
ImGui::SameLine(); ImGui::SameLine();
ImGui::Text("%s", _u8L("Subtracted").c_str());
ImGui::SameLine(); if (ImGui::RadioButton(_u8L("Modifier").c_str(), type == modifier))
if (type == modifier) { new_type = modifier;
draw_icon(IconType::modifier, IconState::hovered); else if (ImGui::IsItemHovered()) {
} else { if (is_last_solid_part)
if(draw_button(IconType::modifier, is_last_solid_part)) ImGui::SetTooltip("%s", last_solid_part_hint.c_str());
new_type = modifier; else if (type != modifier)
if (ImGui::IsItemHovered()) { ImGui::SetTooltip("%s", _u8L("Click to change part type into modifier.").c_str());
if(is_last_solid_part)
ImGui::SetTooltip("%s", last_solid_part_hint.c_str());
else if (type != modifier)
ImGui::SetTooltip("%s", _u8L("Click to change part type into modifier.").c_str());
}
} }
ImGui::SameLine();
ImGui::Text("%s", _u8L("Modifier").c_str());
if (m_volume != nullptr && new_type.has_value() && !is_last_solid_part) { if (m_volume != nullptr && new_type.has_value() && !is_last_solid_part) {
GUI_App &app = wxGetApp(); GUI_App &app = wxGetApp();
@ -3438,10 +3402,7 @@ void GLGizmoEmboss::init_icons()
"make_bold.svg", "make_bold.svg",
"make_unbold.svg", "make_unbold.svg",
"search.svg", "search.svg",
"open.svg", "open.svg"
"add_text_part.svg",
"add_text_negative.svg",
"add_text_modifier.svg"
}; };
assert(filenames.size() == static_cast<size_t>(IconType::_count)); assert(filenames.size() == static_cast<size_t>(IconType::_count));
std::string path = resources_dir() + "/icons/"; std::string path = resources_dir() + "/icons/";

4
src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp
View File

@ -329,10 +329,6 @@ private:
unbold, unbold,
system_selector, system_selector,
open_file, open_file,
// VolumeType icons
part,
negative,
modifier,
// automatic calc of icon's count // automatic calc of icon's count
_count _count
}; };