caojiawei
/
BambuStudio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

页面左右调换，上传按钮取消，打开文件拓展

This commit is contained in:
cjw 2024-12-26 17:31:50 +08:00
parent a84f101d37
commit 164cb10035
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slic3r/GUI/GUI_App.cpp
View File

@ -788,7 +788,7 @@ static const FileWildcards file_wildcards_by_type[FT_SIZE] = {
/* FT_MODEL */ /* FT_MODEL */
{"Supported files"sv, {".3mf"sv, ".stl"sv, ".oltp"sv, ".stp"sv, ".step"sv, ".svg"sv, ".amf"sv, ".obj"sv}}, {"Supported files"sv, {".3mf"sv, ".stl"sv, ".oltp"sv, ".stp"sv, ".step"sv, ".svg"sv, ".amf"sv, ".obj"sv}},
#endif #endif
/* FT_PROJECT */ { "Project files"sv, { ".3mf"sv} }, /* FT_PROJECT */ { "Project files"sv, { ".3mf"sv,"*.*"sv}},
/* FT_GALLERY */ { "Known files"sv, { ".stl"sv, ".obj"sv } }, /* FT_GALLERY */ { "Known files"sv, { ".stl"sv, ".obj"sv } },
/* FT_INI */ { "INI files"sv, { ".ini"sv } }, /* FT_INI */ { "INI files"sv, { ".ini"sv } },
@ -2708,7 +2708,7 @@ bool GUI_App::on_init_inner()
skip_this_version = false; skip_this_version = false;
} }
} }
if (!skip_this_version /*if (!skip_this_version
|| evt.GetInt() != 0) { || evt.GetInt() != 0) {
UpdateVersionDialog dialog(this->mainframe); UpdateVersionDialog dialog(this->mainframe);
wxString extmsg = wxString::FromUTF8(version_info.description); wxString extmsg = wxString::FromUTF8(version_info.description);
@ -2727,7 +2727,7 @@ bool GUI_App::on_init_inner()
default: default:
; ;
} }
} }*/
} }
}); });

2
slic3r/GUI/MainFrame.cpp
View File

@ -1571,7 +1571,7 @@ wxBoxSizer* MainFrame::create_side_tools()
m_publish_btn->Hide(); m_publish_btn->Hide();
m_slice_option_btn->Enable(); m_slice_option_btn->Enable();
m_print_option_btn->Enable(); m_print_option_btn->Enable();
sizer->Add(m_publish_btn, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, FromDIP(1)); //sizer->Add(m_publish_btn, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, FromDIP(1));
sizer->Add(FromDIP(15), 0, 0, 0, 0); sizer->Add(FromDIP(15), 0, 0, 0, 0);
sizer->Add(m_slice_option_btn, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, FromDIP(1)); sizer->Add(m_slice_option_btn, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, FromDIP(1));
sizer->Add(m_slice_btn, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, FromDIP(1)); sizer->Add(m_slice_btn, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, FromDIP(1));

3
slic3r/GUI/Plater.cpp
View File

@ -2835,7 +2835,8 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
panel_sizer->Add(preview, 1, wxEXPAND | wxALL, 0); panel_sizer->Add(preview, 1, wxEXPAND | wxALL, 0);
panel_sizer->Add(assemble_view, 1, wxEXPAND | wxALL, 0); panel_sizer->Add(assemble_view, 1, wxEXPAND | wxALL, 0);
vsizer->Add(panel_sizer, 1, wxEXPAND | wxALL, 0); vsizer->Add(panel_sizer, 1, wxEXPAND | wxALL, 0);
hsizer->Add(vsizer, 1, wxEXPAND | wxALL, 0); //hsizer->Add(vsizer, 1, wxEXPAND | wxALL, 0);
hsizer->Insert(0, vsizer, 1, wxEXPAND | wxALL, 0);
q->SetSizer(hsizer); q->SetSizer(hsizer);