3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ac4d9ea172
PrusaSlicer-NonPlainar/src/slic3r/GUI/MsgDialog.cpp

114 lines
3.8 KiB
C++
Raw Normal View History

Add a new error dialog
2018-04-30 12:31:57 +00:00
#include "MsgDialog.hpp"
#include <wx/settings.h>
#include <wx/sizer.h>
#include <wx/stattext.h>
#include <wx/button.h>
#include <wx/statbmp.h>
#include <wx/scrolwin.h>
Http & ErrorDialog: Improve error reporting
2018-12-18 17:40:35 +00:00
#include <wx/clipbrd.h>
Replaced the static text control in error dialog with HTML control, which supports copying of the text into clipboard. Removed the "copy to clipboard" button from the error dialog.
2019-02-22 10:13:48 +00:00
#include <wx/html/htmlwin.h>
#include <boost/algorithm/string/replace.hpp>
Add a new error dialog
2018-04-30 12:31:57 +00:00
#include "libslic3r/libslic3r.h"
#include "libslic3r/Utils.hpp"
#include "GUI.hpp"
Removed some obsolete Perl bindings. Removed libslic3r from the default include paths for all modules but libslic3r. Now headers from libslic3r need to be included with an explicit path (libslic3r/libslic3r.h etc) Split the localization macros into I18N.{cpp,h}
2018-11-26 13:41:58 +00:00
#include "I18N.hpp"
Add a new error dialog
2018-04-30 12:31:57 +00:00
#include "ConfigWizard.hpp"
Added scaling for more some dialogs + Set size for mode buttons
2019-02-11 13:14:35 +00:00
#include "wxExtensions.hpp"
#include "GUI_App.hpp"
Add a new error dialog
2018-04-30 12:31:57 +00:00
namespace Slic3r {
namespace GUI {
Fix SVG & bitmap scaling on Mac depending on Retina scaling
2019-04-05 16:53:02 +00:00
MsgDialog::MsgDialog(wxWindow *parent, const wxString &title, const wxString &headline, wxWindowID button_id, wxBitmap bitmap)
: wxDialog(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
Added _fiction_ resizing for correct MainFrame rendering after DPI changed_object + Added a calculation of a empty bitmaps inside presets in respect to em_unit (to avoid assert) + Added scaling for PrintHostDialogs and MsgDialog + some code refactoring
2019-04-23 14:33:06 +00:00
, boldfont(wxGetApp().normal_font()/*wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)*/)
Fix SVG & bitmap scaling on Mac depending on Retina scaling
2019-04-05 16:53:02 +00:00
, content_sizer(new wxBoxSizer(wxVERTICAL))
, btn_sizer(new wxBoxSizer(wxHORIZONTAL))
Add a new error dialog
2018-04-30 12:31:57 +00:00
{
boldfont.SetWeight(wxFONTWEIGHT_BOLD);
Added _fiction_ resizing for correct MainFrame rendering after DPI changed_object + Added a calculation of a empty bitmaps inside presets in respect to em_unit (to avoid assert) + Added scaling for PrintHostDialogs and MsgDialog + some code refactoring
2019-04-23 14:33:06 +00:00
this->SetFont(wxGetApp().normal_font());
Add a new error dialog
2018-04-30 12:31:57 +00:00
auto *topsizer = new wxBoxSizer(wxHORIZONTAL);
auto *rightsizer = new wxBoxSizer(wxVERTICAL);
auto *headtext = new wxStaticText(this, wxID_ANY, headline);
headtext->SetFont(boldfont);
Added scaling for more some dialogs + Set size for mode buttons
2019-02-11 13:14:35 +00:00
headtext->Wrap(CONTENT_WIDTH*wxGetApp().em_unit());
Add a new error dialog
2018-04-30 12:31:57 +00:00
rightsizer->Add(headtext);
rightsizer->AddSpacer(VERT_SPACING);
rightsizer->Add(content_sizer, 1, wxEXPAND);
if (button_id != wxID_NONE) {
auto *button = new wxButton(this, button_id);
button->SetFocus();
btn_sizer->Add(button);
}
Replaced the static text control in error dialog with HTML control, which supports copying of the text into clipboard. Removed the "copy to clipboard" button from the error dialog.
2019-02-22 10:13:48 +00:00
rightsizer->Add(btn_sizer, 0, wxALIGN_RIGHT);
Add a new error dialog
2018-04-30 12:31:57 +00:00
Fix SVG & bitmap scaling on Mac depending on Retina scaling
2019-04-05 16:53:02 +00:00
if (! bitmap.IsOk()) {
To fix blurred icons under OSX there is implemented PresetBitmapComboBox, derived from wxBitmapComboBox, which now will be used for preset choosers on sidebar a preset tabs. + for BitmapCache class added m_scale used for correct scaling of SVG images on Retina displays + some code clearing from unused functions or function's parameters
2020-01-31 15:50:11 +00:00
bitmap = create_scaled_bitmap("PrusaSlicer_192px.png", this, 192);
Fix SVG & bitmap scaling on Mac depending on Retina scaling
2019-04-05 16:53:02 +00:00
}
logo = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap);
Add a new error dialog
2018-04-30 12:31:57 +00:00
topsizer->Add(logo, 0, wxALL, BORDER);
topsizer->Add(rightsizer, 1, wxALL | wxEXPAND, BORDER);
SetSizerAndFit(topsizer);
}
MsgDialog::~MsgDialog() {}
// ErrorDialog
Http & ErrorDialog: Improve error reporting
2018-12-18 17:40:35 +00:00
ErrorDialog::ErrorDialog(wxWindow *parent, const wxString &msg)
Fixed app name interpolation for : GUI_App, MainFrame, MsgDialog, Preferences, Tab and UpdateDialogs + added edit_tooltip(), wich replaces Slic3r for SLIC3R_APP_KEY
2019-04-26 08:52:38 +00:00
: MsgDialog(parent, wxString::Format(_(L("%s error")), SLIC3R_APP_NAME),
wxString::Format(_(L("%s has encountered an error")), SLIC3R_APP_NAME),
Http & ErrorDialog: Improve error reporting
2018-12-18 17:40:35 +00:00
wxID_NONE)
, msg(msg)
Add a new error dialog
2018-04-30 12:31:57 +00:00
{
Replaced the static text control in error dialog with HTML control, which supports copying of the text into clipboard. Removed the "copy to clipboard" button from the error dialog.
2019-02-22 10:13:48 +00:00
// Text shown as HTML, so that mouse selection and Ctrl-V to copy will work.
wxHtmlWindow* html = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO);
{
html->SetMinSize(wxSize(40 * wxGetApp().em_unit(), -1));
wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
wxColour text_clr = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
Fix of #3775 - wrong background color in ErrorDialog on macOS Sierra
2020-03-05 11:00:39 +00:00
wxColour bgr_clr = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
Replaced the static text control in error dialog with HTML control, which supports copying of the text into clipboard. Removed the "copy to clipboard" button from the error dialog.
2019-02-22 10:13:48 +00:00
auto text_clr_str = wxString::Format(wxT("#%02X%02X%02X"), text_clr.Red(), text_clr.Green(), text_clr.Blue());
auto bgr_clr_str = wxString::Format(wxT("#%02X%02X%02X"), bgr_clr.Red(), bgr_clr.Green(), bgr_clr.Blue());
const int font_size = font.GetPointSize()-1;
int size[] = {font_size, font_size, font_size, font_size, font_size, font_size, font_size};
html->SetFonts(font.GetFaceName(), font.GetFaceName(), size);
html->SetBorders(2);
std::string msg_escaped = xml_escape(msg.ToUTF8().data());
boost::replace_all(msg_escaped, "\r\n", "<br>");
boost::replace_all(msg_escaped, "\n", "<br>");
html->SetPage("<html><body bgcolor=\"" + bgr_clr_str + "\"><font color=\"" + text_clr_str + "\">" + wxString::FromUTF8(msg_escaped.data()) + "</font></body></html>");
content_sizer->Add(html, 1, wxEXPAND);
}
Http & ErrorDialog: Improve error reporting
2018-12-18 17:40:35 +00:00
auto *btn_ok = new wxButton(this, wxID_OK);
btn_ok->SetFocus();
Replaced the static text control in error dialog with HTML control, which supports copying of the text into clipboard. Removed the "copy to clipboard" button from the error dialog.
2019-02-22 10:13:48 +00:00
btn_sizer->Add(btn_ok, 0, wxRIGHT, HORIZ_SPACING);
Http & ErrorDialog: Improve error reporting
2018-12-18 17:40:35 +00:00
To fix blurred icons under OSX there is implemented PresetBitmapComboBox, derived from wxBitmapComboBox, which now will be used for preset choosers on sidebar a preset tabs. + for BitmapCache class added m_scale used for correct scaling of SVG images on Retina displays + some code clearing from unused functions or function's parameters
2020-01-31 15:50:11 +00:00
logo->SetBitmap(create_scaled_bitmap("PrusaSlicer_192px_grayscale.png", this, 192));
Fix SVG & bitmap scaling on Mac depending on Retina scaling
2019-04-05 16:53:02 +00:00
Added scaling for more some dialogs + Set size for mode buttons
2019-02-11 13:14:35 +00:00
SetMaxSize(wxSize(-1, CONTENT_MAX_HEIGHT*wxGetApp().em_unit()));
Add a new error dialog
2018-04-30 12:31:57 +00:00
Fit();
}
ErrorDialog::~ErrorDialog() {}
}
}
Reference in New Issue Copy Permalink