QIDITECH/QIDISlicer
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDISlicer.git synced 2026-02-03 01:18:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update details

Browse Source
This commit is contained in:
sunsets
2023-11-02 09:46:12 +08:00
parent d8dc67aea0
commit b2d3a0ed41
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/slic3r/GUI/MsgDialog.cpp
View File

@@ -57,8 +57,9 @@ MsgDialog::MsgDialog(wxWindow *parent, const wxString &title, const wxString &he
//B44 //B44
logo = new wxStaticBitmap(this, wxID_ANY, bitmap.IsOk() ? bitmap : wxNullBitmap); logo = new wxStaticBitmap(this, wxID_ANY, bitmap.IsOk() ? bitmap : wxNullBitmap);
if (style == 4) { if (title == "App Update available") {
topsizer->Add(rightsizer, 1, wxLEFT | wxTOP | wxRIGHT | wxEXPAND, BORDER); topsizer->Add(rightsizer, 1, wxLEFT | wxTOP | wxRIGHT | wxEXPAND, BORDER);
} else { } else {
topsizer->Add(logo, 0, wxALL, BORDER); topsizer->Add(logo, 0, wxALL, BORDER);
topsizer->Add(rightsizer, 1, wxTOP | wxBOTTOM | wxRIGHT | wxEXPAND, BORDER); topsizer->Add(rightsizer, 1, wxTOP | wxBOTTOM | wxRIGHT | wxEXPAND, BORDER);
@@ -66,9 +67,11 @@ MsgDialog::MsgDialog(wxWindow *parent, const wxString &title, const wxString &he
main_sizer->Add(topsizer, 1, wxEXPAND); main_sizer->Add(topsizer, 1, wxEXPAND);
main_sizer->Add(new StaticLine(this), 0, wxEXPAND | wxLEFT | wxRIGHT, HORIZ_SPACING); main_sizer->Add(new StaticLine(this), 0, wxEXPAND | wxLEFT | wxRIGHT, HORIZ_SPACING);
main_sizer->Add(btn_sizer, 0, wxALL | wxEXPAND, VERT_SPACING); main_sizer->Add(btn_sizer, 0, wxALL | wxEXPAND, VERT_SPACING);
if (style & wxOK)
apply_style(style); add_button(wxID_OK, true);
if (title != "App Update available") {
apply_style(style);
}
SetSizerAndFit(main_sizer); SetSizerAndFit(main_sizer);
} }
@@ -100,9 +103,9 @@ wxButton* MsgDialog::get_button(wxWindowID btn_id){
return static_cast<wxButton*>(FindWindowById(btn_id, this)); return static_cast<wxButton*>(FindWindowById(btn_id, this));
} }
//B44
void MsgDialog::apply_style(long style) void MsgDialog::apply_style(long style)
{ {
if (style & wxOK) add_button(wxID_OK, true);
if (style & wxYES) add_button(wxID_YES, !(style & wxNO_DEFAULT)); if (style & wxYES) add_button(wxID_YES, !(style & wxNO_DEFAULT));
if (style & wxNO) add_button(wxID_NO, (style & wxNO_DEFAULT)); if (style & wxNO) add_button(wxID_NO, (style & wxNO_DEFAULT));
if (style & wxCANCEL) add_button(wxID_CANCEL, (style & wxCANCEL_DEFAULT)); if (style & wxCANCEL) add_button(wxID_CANCEL, (style & wxCANCEL_DEFAULT));
@@ -110,10 +113,7 @@ void MsgDialog::apply_style(long style)
std::string icon_name = style & wxICON_WARNING ? "exclamation" : std::string icon_name = style & wxICON_WARNING ? "exclamation" :
style & wxICON_INFORMATION ? "info" : style & wxICON_INFORMATION ? "info" :
style & wxICON_QUESTION ? "question" : "QIDISlicer"; style & wxICON_QUESTION ? "question" : "QIDISlicer";
//B44 logo->SetBitmap(*get_bmp_bundle(icon_name, 64));
if (style != 4) {
logo->SetBitmap(*get_bmp_bundle(icon_name, 64));
}
} }
void MsgDialog::finalize() void MsgDialog::finalize()

3
src/slic3r/GUI/UpdateDialogs.cpp
View File

@@ -199,7 +199,8 @@ AppUpdateDownloadDialog::AppUpdateDownloadDialog( const Semver& ver_online, boos
} }
})); }));
content_sizer->SetMinSize(AppUpdateAvailableDialog::AUAD_size); //B44
content_sizer->SetMinSize(wxSize(400, 200));
add_button(wxID_CANCEL); add_button(wxID_CANCEL);