juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-17 14:02:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
0d691403de119f2663d3ca9f34dfc67f40c4cd55
OrcaSlicer/src/slic3r/GUI/UpdateDialogs.cpp
T
NoisyfoxClaudeyw4z
 5ede9711f5 Fix GTK3 dialog min size: SetSizer → SetSizerAndFit for dialogs without explicit SetMinSize (#14948) 
* For dialog without explicitly `SetMinSize`, we should use `SetSizerAndFit` instead, otherwise the dialog will not show correctly on GTK3. (OrcaSlicer/OrcaSlicer#14561)
- and if `SetSizer` is called before the full layout has been built, then an extra `SetSizeHints` should be called before layout/fit so the min size can be properly set automatically based on children's min sizes accordingly.

* Fix GTK3 dialog min size: SetSizer → SetSizerAndFit for dialogs without explicit SetMinSize

Replace SetSizer() with SetSizerAndFit() in 11 dialog constructors that
neither call SetMinSize() nor SetSizeHints(), ensuring proper minimum
size propagation from child widgets on GTK3.

SetSizerAndFit internally calls sizer->SetSizeHints(window), which
sets the window's minimum size based on children — the same fix
applied to ProjectDropDialog in 8a7662083e.

Also drop sizer->Fit(this) calls where present, since they only
resize but don't set the min size hint needed by GTK3.

Co-Authored-By: Claude <noreply@anthropic.com>

* Update code style

* Update TroubleshootDialog.hpp

* Fix unsaved preset dialog layout

* Fix MsgDialog layout

* Fix other 3 instances in MsgDialog.cpp

* Fix a few more instances

* Fix printer option dialog too big on Windows

---------

Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: yw4z <ywsyildiz@gmail.com>
2026-07-28 14:32:55 +08:00

397 lines
15 KiB
C++
Raw Blame History

#include "UpdateDialogs.hpp"
#include <cstring>
#include <boost/format.hpp>
#include <boost/algorithm/string/predicate.hpp>
#include <wx/settings.h>
#include <wx/sizer.h>
#include <wx/event.h>
#include <wx/stattext.h>
#include <wx/button.h>
#include <wx/statbmp.h>
#include <wx/checkbox.h>
#include "libslic3r/libslic3r.h"
#include "libslic3r/Utils.hpp"
#include "GUI.hpp"
#include "GUI_App.hpp"
#include "I18N.hpp"
#include "ConfigWizard.hpp"
#include "wxExtensions.hpp"
#include "MainFrame.hpp"
namespace Slic3r {
namespace GUI {
static const char* URL_CHANGELOG = "%1%";
static const char* URL_DOWNLOAD = "%1%";
static const char* URL_DEV = "%1%";
static const std::string CONFIG_UPDATE_WIKI_URL("");
// MsgUpdateSlic3r
MsgUpdateSlic3r::MsgUpdateSlic3r(const Semver &ver_current, const Semver &ver_online)
: MsgDialog(nullptr, wxString::Format(_(L("%s Update")), SLIC3R_APP_FULL_NAME), _(L("A new version is available")))
{
//TODO: for new dialog with updater
//const bool dev_version = ver_online.prerelease() != nullptr;
//auto *versions = new wxFlexGridSizer(2, 0, VERT_SPACING);
//versions->Add(new wxStaticText(this, wxID_ANY, _(L("Current version:"))));
//versions->Add(new wxStaticText(this, wxID_ANY, ver_current.to_string()));
//versions->Add(new wxStaticText(this, wxID_ANY, _(L("New version:"))));
//versions->Add(new wxStaticText(this, wxID_ANY, ver_online.to_string()));
//content_sizer->Add(versions);
//content_sizer->AddSpacer(VERT_SPACING);
//if (dev_version) {
// const std::string url = (boost::format(URL_DEV) % ver_online.to_string()).str();
// const wxString url_wx = from_u8(url);
// auto *link = new wxHyperlinkCtrl(this, wxID_ANY, _(L("Changelog & Download")), url_wx);
// content_sizer->Add(link);
//} else {
// const auto lang_code = wxGetApp().current_language_code_safe().ToStdString();
// const std::string url_log = (boost::format(URL_CHANGELOG) % lang_code).str();
// const wxString url_log_wx = from_u8(url_log);
// auto *link_log = new wxHyperlinkCtrl(this, wxID_ANY, _(L("Open changelog page")), url_log_wx);
// link_log->Bind(wxEVT_HYPERLINK, &MsgUpdateSlic3r::on_hyperlink, this);
// content_sizer->Add(link_log);
// const std::string url_dw = (boost::format(URL_DOWNLOAD) % lang_code).str();
// const wxString url_dw_wx = from_u8(url_dw);
// auto *link_dw = new wxHyperlinkCtrl(this, wxID_ANY, _(L("Open download page")), url_dw_wx);
// link_dw->Bind(wxEVT_HYPERLINK, &MsgUpdateSlic3r::on_hyperlink, this);
// content_sizer->Add(link_dw);
//}
//content_sizer->AddSpacer(2*VERT_SPACING);
//cbox = new wxCheckBox(this, wxID_ANY, _(L("Don't notify about new releases any more")));
//content_sizer->Add(cbox);
//content_sizer->AddSpacer(VERT_SPACING);
finalize();
}
MsgUpdateSlic3r::~MsgUpdateSlic3r() {}
void MsgUpdateSlic3r::on_hyperlink(wxHyperlinkEvent& evt)
{
wxGetApp().open_browser_with_warning_dialog(evt.GetURL());
}
bool MsgUpdateSlic3r::disable_version_check() const
{
//TODO: for new dialog with updaterpre
//return cbox->GetValue();
return true;
}
// MsgUpdateConfig
MsgUpdateConfig::MsgUpdateConfig(const std::vector<Update> &updates, bool force_before_wizard /* = false*/)
: DPIDialog(wxGetApp().mainframe, wxID_ANY, _L("Configuration update"), wxDefaultPosition, wxDefaultSize, wxCAPTION)
{
auto title = force_before_wizard ? _L("Configuration update") : _L("Configuration update");
SetTitle(title);
SetBackgroundColour(*wxWHITE);
wxBoxSizer *m_sizer_main = new wxBoxSizer(wxVERTICAL);
auto m_line_top = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 1));
m_line_top->SetBackgroundColour(wxColour(166, 169, 170));
m_sizer_main->Add(m_line_top, 0, wxEXPAND, 0);
m_sizer_main->Add(0, 0, 0, wxTOP, FromDIP(30));
wxBoxSizer *m_sizer_body = new wxBoxSizer(wxHORIZONTAL);
m_sizer_body->Add(0, 0, 0, wxLEFT, FromDIP(38));
auto sm = create_scaled_bitmap("OrcaSlicer", nullptr, 70);
auto brand = new wxStaticBitmap(this, wxID_ANY, sm, wxDefaultPosition, wxSize(FromDIP(70), FromDIP(70)));
m_sizer_body->Add(brand, 0, wxALL, 0);
m_sizer_body->Add(0, 0, 0, wxRIGHT, FromDIP(25));
wxBoxSizer *m_sizer_right = new wxBoxSizer(wxVERTICAL);
auto m_text_up_info = new wxStaticText(this, wxID_ANY, _L("A new configuration package is available. Do you want to install it?"), wxDefaultPosition, wxDefaultSize, 0);
m_text_up_info->SetFont(::Label::Head_14);
m_text_up_info->SetForegroundColour(wxColour(0x26, 0x2E, 0x30));
m_text_up_info->Wrap(-1);
m_sizer_right->Add(m_text_up_info, 0, 0, 0);
m_sizer_right->Add(0, 0, 1, wxTOP, FromDIP(15));
auto m_scrollwindw_release_note = new wxScrolledWindow(this, wxID_ANY, wxDefaultPosition, wxSize(FromDIP(560), FromDIP(430)),wxVSCROLL);
m_scrollwindw_release_note->SetScrollRate(0, 5);
m_scrollwindw_release_note->SetBackgroundColour(wxColour(0xF8, 0xF8, 0xF8));
m_scrollwindw_release_note->SetMaxSize(wxSize(FromDIP(560), FromDIP(430)));
m_scrollwindw_release_note->SetWindowStyle(wxVSCROLL);
auto sizer_button = new wxBoxSizer(wxHORIZONTAL);
sizer_button->Add(0, 0, 1, wxEXPAND, 5);
auto m_butto_ok = new Button(this, _L("OK"));
m_butto_ok->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
auto m_button_cancel = new Button(this, _L("Cancel"));
m_button_cancel->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
sizer_button->Add(m_butto_ok, 0, wxALL, 5);
sizer_button->Add(m_button_cancel, 0, wxALL, 5);
m_sizer_right->Add(m_scrollwindw_release_note, 0, wxEXPAND | wxRIGHT, FromDIP(20));
m_sizer_right->Add(sizer_button, 0, wxEXPAND | wxRIGHT, FromDIP(20));
m_sizer_body->Add(m_sizer_right, 1, wxBOTTOM | wxEXPAND, FromDIP(30));
m_sizer_main->Add(m_sizer_body, 0, wxEXPAND, 0);
wxBoxSizer *content_sizer = new wxBoxSizer(wxVERTICAL);
const auto lang_code = wxGetApp().current_language_code_safe().ToStdString();
auto *versions = new wxBoxSizer(wxVERTICAL);
// BBS: use changelog string instead of url
wxStaticText *changelog_textctrl = new wxStaticText(m_scrollwindw_release_note, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(560), -1));
for (const auto &update : updates) {
auto *flex = new wxFlexGridSizer(2, 0, FromDIP(15));
auto *text_vendor = new wxStaticText(m_scrollwindw_release_note, wxID_ANY, update.vendor);
text_vendor->SetFont(::Label::Body_13);
flex->Add(text_vendor);
flex->Add(new wxStaticText(m_scrollwindw_release_note, wxID_ANY, update.version.to_string()));
// BBS: use changelog string instead of url
if (!update.comment.empty()) {
flex->Add(new wxStaticText(m_scrollwindw_release_note, wxID_ANY, _(L("Description:"))), 0, wxALIGN_RIGHT);
auto *update_comment = new Label(m_scrollwindw_release_note,std::string(""));
update_comment->SetLabel(from_u8(update.comment));
update_comment->SetMaxSize(wxSize(FromDIP(545), -1));
update_comment->SetMinSize(wxSize(FromDIP(545), -1));
update_comment->Wrap(FromDIP(450));
flex->Add(update_comment);
}
versions->Add(flex);
// BBS: use changelog string instead of url
//auto change_log = new wxStaticText(m_scrollwindw_release_note, wxID_ANY, from_u8(update.change_log), wxDefaultPosition, wxDefaultSize);
changelog_textctrl->SetLabel(changelog_textctrl->GetLabel() + wxString::Format("%s\n", from_u8(update.change_log)));
}
content_sizer->Add(versions);
////BBS: use changelog string instead of url
if (changelog_textctrl)
content_sizer->Add(changelog_textctrl, 1, wxEXPAND | wxTOP, FromDIP(30));
m_butto_ok->Bind(wxEVT_BUTTON, [this](const wxCommandEvent &) { EndModal(wxID_OK); });
m_button_cancel->Bind(wxEVT_BUTTON, [this](const wxCommandEvent &) { EndModal(wxID_CLOSE); });
m_scrollwindw_release_note->SetSizer(content_sizer);
m_scrollwindw_release_note->Layout();
SetSizerAndFit(m_sizer_main);
Layout();
Centre(wxBOTH);
wxGetApp().UpdateDlgDarkUI(this);
}
void MsgUpdateConfig::on_dpi_changed(const wxRect &suggested_rect) {}
MsgUpdateConfig::~MsgUpdateConfig() {}
//MsgUpdateForced
MsgUpdateForced::MsgUpdateForced(const std::vector<Update>& updates) :
MsgDialog(nullptr, _(L("Configuration incompatible")), _(L("the configuration package is incompatible with the current application.")) + " ", wxOK | wxICON_ERROR)
{
auto* text = new wxStaticText(this, wxID_ANY, wxString::Format(_(L(
"The configuration package is incompatible with the current application.\n"
"%s will update the configuration package to allow the application to start."
)), SLIC3R_APP_FULL_NAME));
text->Wrap(CONTENT_WIDTH * wxGetApp().em_unit());
content_sizer->Add(text);
content_sizer->AddSpacer(VERT_SPACING);
const auto lang_code = wxGetApp().current_language_code_safe().ToStdString();
auto* versions = new wxFlexGridSizer(2, 0, VERT_SPACING);
//BBS: use changelog string instead of url
wxTextCtrl* changelog_textctrl = nullptr;
for (const auto& update : updates) {
auto* text_vendor = new wxStaticText(this, wxID_ANY, update.vendor);
text_vendor->SetFont(boldfont);
versions->Add(text_vendor);
versions->Add(new wxStaticText(this, wxID_ANY, update.version.to_string()));
//BBS: use changelog string instead of url
if (!update.comment.empty()) {
versions->Add(new wxStaticText(this, wxID_ANY, _(L("Description:")))/*, 0, wxALIGN_RIGHT*/);//uncoment if align to right (might not look good if 1 vedor name is longer than other names)
auto* update_comment = new wxStaticText(this, wxID_ANY, from_u8(update.comment));
update_comment->Wrap(CONTENT_WIDTH * wxGetApp().em_unit());
versions->Add(update_comment);
}
//BBS: use changelog string instead of url
if (! update.change_log.empty()) {
if (!changelog_textctrl)
changelog_textctrl = new wxTextCtrl(this, wxID_ANY, from_u8(update.change_log), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL);
else
changelog_textctrl->AppendText(from_u8(update.change_log));
}
//if (!update.changelog_url.empty() && update.version.prerelease() == nullptr) {
// auto* line = new wxBoxSizer(wxHORIZONTAL);
// auto changelog_url = (boost::format(update.changelog_url) % lang_code).str();
// line->AddSpacer(3 * VERT_SPACING);
// line->Add(new wxHyperlinkCtrl(this, wxID_ANY, _(L("Open changelog page")), changelog_url));
// versions->Add(line);
//}
}
content_sizer->Add(versions);
//BBS: use changelog string instead of url
//content_sizer->AddSpacer(2 * VERT_SPACING);
if (changelog_textctrl)
content_sizer->Add(changelog_textctrl);
add_button(wxID_EXIT, false, wxString::Format(_L("Exit %s"), SLIC3R_APP_FULL_NAME));
for (auto ID : { wxID_EXIT, wxID_OK })
get_button(ID)->Bind(wxEVT_BUTTON, [this](const wxCommandEvent& evt) { EndModal(evt.GetId()); });
finalize();
}
MsgUpdateForced::~MsgUpdateForced() {}
// MsgDataIncompatible
MsgDataIncompatible::MsgDataIncompatible(const std::unordered_map<std::string, wxString> &incompats) :
MsgDialog(nullptr, _(L("Configuration incompatible")), _(L("the configuration package is incompatible with the current application.")), wxICON_ERROR)
{
//TODO
//auto *text = new wxStaticText(this, wxID_ANY, wxString::Format(_(L(
// "This version of %s is not compatible with currently installed configuration bundles.\n"
// "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));
//text->Wrap(CONTENT_WIDTH * wxGetApp().em_unit());
//content_sizer->Add(text);
//auto *text2 = new wxStaticText(this, wxID_ANY, wxString::Format(_(L("This %s version: %s")), SLIC3R_APP_NAME, SLIC3R_VERSION));
//text2->Wrap(CONTENT_WIDTH * wxGetApp().em_unit());
//content_sizer->Add(text2);
//content_sizer->AddSpacer(VERT_SPACING);
//auto *text3 = new wxStaticText(this, wxID_ANY, _(L("Incompatible bundles:")));
//text3->Wrap(CONTENT_WIDTH * wxGetApp().em_unit());
//content_sizer->Add(text3);
//content_sizer->AddSpacer(VERT_SPACING);
//auto *versions = new wxFlexGridSizer(2, 0, VERT_SPACING);
//for (const auto &incompat : incompats) {
// auto *text_vendor = new wxStaticText(this, wxID_ANY, incompat.first);
// text_vendor->SetFont(boldfont);
// versions->Add(text_vendor);
// versions->Add(new wxStaticText(this, wxID_ANY, incompat.second));
//}
//content_sizer->Add(versions);
//content_sizer->AddSpacer(2*VERT_SPACING);
//add_button(wxID_REPLACE, true, _L("Re-configure"));
//add_button(wxID_EXIT, false, wxString::Format(_L("Exit %s"), SLIC3R_APP_NAME));
//for (auto ID : {wxID_EXIT, wxID_REPLACE})
// get_button(ID)->Bind(wxEVT_BUTTON, [this](const wxCommandEvent& evt) { this->EndModal(evt.GetId()); });
finalize();
}
MsgDataIncompatible::~MsgDataIncompatible() {}
// MsgDataLegacy
//MsgDataLegacy::MsgDataLegacy() :
// MsgDialog(nullptr, _(L("Configuration update")), _(L("Configuration update")))
//{
// auto *text = new wxStaticText(this, wxID_ANY, from_u8((boost::format(
// _utf8(L(
// "%s now uses an updated configuration structure.\n\n"
//
// "So called 'System presets' have been introduced, which hold the built-in default settings for various "
// "printers. These System presets cannot be modified, instead, users now may create their "
// "own presets inheriting settings from one of the System presets.\n"
// "An inheriting preset may either inherit a particular value from its parent or override it with a customized value.\n\n"
//
// "Please proceed with the %s that follows to set up the new presets "
// "and to choose whether to enable automatic preset updates."
// )))
// % SLIC3R_APP_NAME
// % _utf8(ConfigWizard::name())).str()
// ));
// text->Wrap(CONTENT_WIDTH * wxGetApp().em_unit());
// content_sizer->Add(text);
// content_sizer->AddSpacer(VERT_SPACING);
//
// auto *text2 = new wxStaticText(this, wxID_ANY, _(L("For more information please visit our wiki page:")));
// static const wxString url("");
// // The wiki page name is intentionally not localized:
// auto *link = new wxHyperlinkCtrl(this, wxID_ANY, wxString::Format("%s 1.40 configuration update", SLIC3R_APP_NAME), CONFIG_UPDATE_WIKI_URL);
// content_sizer->Add(text2);
// content_sizer->Add(link);
// content_sizer->AddSpacer(VERT_SPACING);
//
// finalize();
//}
//
//MsgDataLegacy::~MsgDataLegacy() {}
// MsgNoUpdate
MsgNoUpdates::MsgNoUpdates() :
MsgDialog(nullptr, _(L("Configuration updates")), _(L("No updates available.")), wxICON_ERROR | wxOK)
{
auto* text = new wxStaticText(this, wxID_ANY, _(L("The configuration is up to date.")));
text->Wrap(CONTENT_WIDTH * wxGetApp().em_unit());
content_sizer->Add(text);
content_sizer->AddSpacer(VERT_SPACING);
finalize();
}
MsgNoUpdates::~MsgNoUpdates() {}
}
}
Reference in New Issue View Git Blame Copy Permalink