From 164cb10035a91a783794adde40cc652a8c8b4ac7 Mon Sep 17 00:00:00 2001 From: cjw Date: Thu, 26 Dec 2024 17:31:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B7=A6=E5=8F=B3=E8=B0=83?= =?UTF-8?q?=E6=8D=A2=EF=BC=8C=E4=B8=8A=E4=BC=A0=E6=8C=89=E9=92=AE=E5=8F=96?= =?UTF-8?q?=E6=B6=88=EF=BC=8C=E6=89=93=E5=BC=80=E6=96=87=E4=BB=B6=E6=8B=93?= =?UTF-8?q?=E5=B1=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- slic3r/GUI/GUI_App.cpp | 6 +++--- slic3r/GUI/MainFrame.cpp | 2 +- slic3r/GUI/Plater.cpp | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/slic3r/GUI/GUI_App.cpp b/slic3r/GUI/GUI_App.cpp index 24bcfb6..09dc930 100644 --- a/slic3r/GUI/GUI_App.cpp +++ b/slic3r/GUI/GUI_App.cpp @@ -788,7 +788,7 @@ static const FileWildcards file_wildcards_by_type[FT_SIZE] = { /* FT_MODEL */ {"Supported files"sv, {".3mf"sv, ".stl"sv, ".oltp"sv, ".stp"sv, ".step"sv, ".svg"sv, ".amf"sv, ".obj"sv}}, #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_INI */ { "INI files"sv, { ".ini"sv } }, @@ -2708,7 +2708,7 @@ bool GUI_App::on_init_inner() skip_this_version = false; } } - if (!skip_this_version + /*if (!skip_this_version || evt.GetInt() != 0) { UpdateVersionDialog dialog(this->mainframe); wxString extmsg = wxString::FromUTF8(version_info.description); @@ -2727,7 +2727,7 @@ bool GUI_App::on_init_inner() default: ; } - } + }*/ } }); diff --git a/slic3r/GUI/MainFrame.cpp b/slic3r/GUI/MainFrame.cpp index 1c828b5..512f0f1 100644 --- a/slic3r/GUI/MainFrame.cpp +++ b/slic3r/GUI/MainFrame.cpp @@ -1571,7 +1571,7 @@ wxBoxSizer* MainFrame::create_side_tools() m_publish_btn->Hide(); m_slice_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(m_slice_option_btn, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, FromDIP(1)); sizer->Add(m_slice_btn, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, FromDIP(1)); diff --git a/slic3r/GUI/Plater.cpp b/slic3r/GUI/Plater.cpp index fdd3509..b36fbc4 100644 --- a/slic3r/GUI/Plater.cpp +++ b/slic3r/GUI/Plater.cpp @@ -2835,7 +2835,8 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame) panel_sizer->Add(preview, 1, wxEXPAND | wxALL, 0); panel_sizer->Add(assemble_view, 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);