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

ErrorDialog: Fix size and message encoding

Browse source
This commit is contained in:
Vojtech Kral 2018-05-22 14:33:11 +02:00
parent 306d77559e
commit 360b34944d
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -607,7 +607,7 @@ void show_error(wxWindow* parent, const wxString& message) {
void show_error_id(int id, const std::string& message) { void show_error_id(int id, const std::string& message) {
auto *parent = id != 0 ? wxWindow::FindWindowById(id) : nullptr; auto *parent = id != 0 ? wxWindow::FindWindowById(id) : nullptr;
show_error(parent, message); show_error(parent, wxString::FromUTF8(message.data()));
} }
void show_info(wxWindow* parent, const wxString& message, const wxString& title){ void show_info(wxWindow* parent, const wxString& message, const wxString& title){

3
xs/src/slic3r/GUI/MsgDialog.cpp
View file

@ -71,11 +71,12 @@ ErrorDialog::ErrorDialog(wxWindow *parent, const wxString &msg) :
text->Wrap(CONTENT_WIDTH); text->Wrap(CONTENT_WIDTH);
p_sizer->Add(text, 1, wxEXPAND); p_sizer->Add(text, 1, wxEXPAND);
panel->SetMinSize(wxSize(CONTENT_WIDTH, CONTENT_HEIGHT)); panel->SetMinSize(wxSize(CONTENT_WIDTH, 0));
panel->SetScrollRate(0, 5); panel->SetScrollRate(0, 5);
content_sizer->Add(panel, 1, wxEXPAND); content_sizer->Add(panel, 1, wxEXPAND);
SetMaxSize(wxSize(-1, CONTENT_MAX_HEIGHT));
Fit(); Fit();
} }

2
xs/src/slic3r/GUI/MsgDialog.hpp
View file

@ -31,7 +31,7 @@ struct MsgDialog : wxDialog
protected: protected:
enum { enum {
CONTENT_WIDTH = 500, CONTENT_WIDTH = 500,
CONTENT_HEIGHT = 300, CONTENT_MAX_HEIGHT = 600,
BORDER = 30, BORDER = 30,
VERT_SPACING = 15, VERT_SPACING = 15,
HORIZ_SPACING = 5, HORIZ_SPACING = 5,