3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-22 14:13:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

FIX:fixed some ui issues

Browse source 
Change-Id: I96f3e3ec56a07a7b5ca4723c92715df58e0baaf6
This commit is contained in:
tao wang 2023-03-22 14:24:37 +08:00 • committed by Lane.Wei
parent 7142119f03
commit bf08a0b2e2
4 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/ConfigManipulation.cpp
View file

@ -281,7 +281,7 @@ void ConfigManipulation::update_print_fff_config(DynamicPrintConfig* config, con
! config->opt_bool("detect_thin_wall") && ! config->opt_bool("detect_thin_wall") &&
config->opt_enum<TimelapseType>("timelapse_type") == TimelapseType::tlTraditional)) config->opt_enum<TimelapseType>("timelapse_type") == TimelapseType::tlTraditional))
{ {
wxString msg_text = _(L("Spiral mode only works when wall loops is 1, support is disabled, top shell layers is 0, sparse infill density is 0 and timelapse type is traditional")); wxString msg_text = _(L("Spiral mode only works when wall loops is 1, support is disabled, top shell layers is 0, sparse infill density is 0 and timelapse type is traditional."));
if (is_global_config) if (is_global_config)
msg_text += "\n\n" + _(L("Change these settings automatically? \n" msg_text += "\n\n" + _(L("Change these settings automatically? \n"
"Yes - Change these settings and enable spiral mode automatically\n" "Yes - Change these settings and enable spiral mode automatically\n"

2
src/slic3r/GUI/NotificationManager.cpp
View file

@ -861,7 +861,7 @@ void NotificationManager::ExportFinishedNotification::render_eject_button(ImGuiW
ImGui::PushStyleColor(ImGuiCol_Border, { 0,0,0,0 }); ImGui::PushStyleColor(ImGuiCol_Border, { 0,0,0,0 });
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, { 8 * scale, 1 * scale }); ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, { 8 * scale, 1 * scale });
ImGui::BeginTooltip(); ImGui::BeginTooltip();
imgui.text(_u8L("Safely remove hardware.")); imgui.text(_L("Safely remove hardware."));
ImGui::EndTooltip(); ImGui::EndTooltip();
ImGui::PopStyleColor(2); ImGui::PopStyleColor(2);
ImGui::PopStyleVar(); ImGui::PopStyleVar();

6
src/slic3r/GUI/UpgradePanel.cpp
View file

@ -854,8 +854,8 @@ UpgradePanel::~UpgradePanel()
void UpgradePanel::msw_rescale() void UpgradePanel::msw_rescale()
{ {
/*if (m_push_upgrade_panel) if (m_push_upgrade_panel)
m_push_upgrade_panel->msw_rescale();*/ m_push_upgrade_panel->msw_rescale();
} }
void UpgradePanel::clean_push_upgrade_panel() void UpgradePanel::clean_push_upgrade_panel()
@ -907,7 +907,7 @@ void UpgradePanel::update(MachineObject *obj)
force_dlg->Bind(EVT_SECONDARY_CHECK_CONFIRM, [this](wxCommandEvent& e) { force_dlg->Bind(EVT_SECONDARY_CHECK_CONFIRM, [this](wxCommandEvent& e) {
if (m_obj) { if (m_obj) {
m_obj->command_upgrade_confirm(); m_obj->command_upgrade_confirm();
m_obj->upgrade_display_state == MachineObject::UpgradingDisplayState::UpgradingInProgress; m_obj->upgrade_display_state = MachineObject::UpgradingDisplayState::UpgradingInProgress;
m_obj->upgrade_display_hold_count = HOLD_COUNT_MAX; m_obj->upgrade_display_hold_count = HOLD_COUNT_MAX;
} }
}); });

5
src/slic3r/GUI/Widgets/AMSControl.cpp
View file

@ -2768,8 +2768,11 @@ void AMSControl::SetAmsStep(std::string ams_id, std::string canid, AMSPassRoadTy
if (notfound) return; if (notfound) return;
if (cans == nullptr) return; if (cans == nullptr) return;
if (!ams_id.empty() && !canid.empty() && (ams_id != m_last_ams_id || m_last_tray_id != canid)) { if (!ams_id.empty() && (ams_id != m_last_ams_id || m_last_tray_id != canid)) {
SetAmsStep(m_last_ams_id, m_last_tray_id, AMSPassRoadType::AMS_ROAD_TYPE_UNLOAD, AMSPassRoadSTEP::AMS_ROAD_STEP_NONE); SetAmsStep(m_last_ams_id, m_last_tray_id, AMSPassRoadType::AMS_ROAD_TYPE_UNLOAD, AMSPassRoadSTEP::AMS_ROAD_STEP_NONE);
m_vams_extra_road->OnVamsLoading(false);
m_extruder->OnVamsLoading(false);
m_vams_road->OnVamsLoading(false);
} }