mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-11 00:37:51 -06:00
Layouts:
1. Fixed crash on OSX after change of the settings layout (PreferencesDialog should be destroyed before call of recreate_GUI) 2. Fixed dialog message during GUI recreation 3. In PreferencesDialog changed radio buttons view (under OSX they were bold) 4. slDlg mode - fixed switching between main frame and settings dialog (dialog->SetFocus() doesn't work under OSX, so we just hide it and show again)
This commit is contained in:
parent
8969613a5a
commit
3c996111aa
6 changed files with 33 additions and 24 deletions
|
@ -591,11 +591,10 @@ float GUI_App::toolbar_icon_scale(const bool is_limited/* = false*/) const
|
||||||
return 0.01f * int_val * icon_sc;
|
return 0.01f * int_val * icon_sc;
|
||||||
}
|
}
|
||||||
|
|
||||||
void GUI_App::recreate_GUI()
|
void GUI_App::recreate_GUI(const wxString& msg_name)
|
||||||
{
|
{
|
||||||
mainframe->shutdown();
|
mainframe->shutdown();
|
||||||
|
|
||||||
const auto msg_name = _(L("Changing of an application language")) + dots;
|
|
||||||
wxProgressDialog dlg(msg_name, msg_name);
|
wxProgressDialog dlg(msg_name, msg_name);
|
||||||
dlg.Pulse();
|
dlg.Pulse();
|
||||||
dlg.Update(10, _(L("Recreating")) + dots);
|
dlg.Update(10, _(L("Recreating")) + dots);
|
||||||
|
@ -726,7 +725,7 @@ void GUI_App::import_model(wxWindow *parent, wxArrayString& input_files) const
|
||||||
bool GUI_App::switch_language()
|
bool GUI_App::switch_language()
|
||||||
{
|
{
|
||||||
if (select_language()) {
|
if (select_language()) {
|
||||||
recreate_GUI();
|
recreate_GUI(_L("Changing of an application language") + dots);
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
return false;
|
return false;
|
||||||
|
@ -1030,8 +1029,17 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
|
||||||
break;
|
break;
|
||||||
case ConfigMenuPreferences:
|
case ConfigMenuPreferences:
|
||||||
{
|
{
|
||||||
PreferencesDialog dlg(mainframe);
|
bool recreate_app = false;
|
||||||
dlg.ShowModal();
|
{
|
||||||
|
// the dialog needs to be destroyed before the call to recreate_GUI()
|
||||||
|
// or sometimes the application crashes into wxDialogBase() destructor
|
||||||
|
// so we put it into an inner scope
|
||||||
|
PreferencesDialog dlg(mainframe);
|
||||||
|
dlg.ShowModal();
|
||||||
|
recreate_app = dlg.settings_layout_changed();
|
||||||
|
}
|
||||||
|
if (recreate_app)
|
||||||
|
recreate_GUI(_L("Changing of the settings layout") + dots);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case ConfigMenuLanguage:
|
case ConfigMenuLanguage:
|
||||||
|
|
|
@ -136,7 +136,7 @@ public:
|
||||||
int em_unit() const { return m_em_unit; }
|
int em_unit() const { return m_em_unit; }
|
||||||
float toolbar_icon_scale(const bool is_limited = false) const;
|
float toolbar_icon_scale(const bool is_limited = false) const;
|
||||||
|
|
||||||
void recreate_GUI();
|
void recreate_GUI(const wxString& message);
|
||||||
void system_info();
|
void system_info();
|
||||||
void keyboard_shortcuts();
|
void keyboard_shortcuts();
|
||||||
void load_project(wxWindow *parent, wxString& input_file) const;
|
void load_project(wxWindow *parent, wxString& input_file) const;
|
||||||
|
|
|
@ -1267,9 +1267,8 @@ void MainFrame::select_tab(size_t tab/* = size_t(-1)*/)
|
||||||
}
|
}
|
||||||
// Show/Activate Settings Dialog
|
// Show/Activate Settings Dialog
|
||||||
if (m_settings_dialog->IsShown())
|
if (m_settings_dialog->IsShown())
|
||||||
m_settings_dialog->SetFocus();
|
m_settings_dialog->Hide();
|
||||||
else
|
m_settings_dialog->Show();
|
||||||
m_settings_dialog->Show();
|
|
||||||
}
|
}
|
||||||
else if (m_layout == slNew) {
|
else if (m_layout == slNew) {
|
||||||
m_plater->Show(tab == 0);
|
m_plater->Show(tab == 0);
|
||||||
|
|
|
@ -178,7 +178,7 @@ public:
|
||||||
if (staticbox) {
|
if (staticbox) {
|
||||||
stb = new wxStaticBox(_parent, wxID_ANY, _(title));
|
stb = new wxStaticBox(_parent, wxID_ANY, _(title));
|
||||||
if (!wxOSX) stb->SetBackgroundStyle(wxBG_STYLE_PAINT);
|
if (!wxOSX) stb->SetBackgroundStyle(wxBG_STYLE_PAINT);
|
||||||
stb->SetFont(wxGetApp().bold_font());
|
stb->SetFont(wxOSX ? wxGetApp().normal_font() : wxGetApp().bold_font());
|
||||||
} else
|
} else
|
||||||
stb = nullptr;
|
stb = nullptr;
|
||||||
sizer = (staticbox ? new wxStaticBoxSizer(stb, wxVERTICAL) : new wxBoxSizer(wxVERTICAL));
|
sizer = (staticbox ? new wxStaticBoxSizer(stb, wxVERTICAL) : new wxBoxSizer(wxVERTICAL));
|
||||||
|
|
|
@ -117,13 +117,6 @@ void PreferencesDialog::build()
|
||||||
m_optgroup_general->append_single_option_line(option);
|
m_optgroup_general->append_single_option_line(option);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
def.label = L("Show the button for the collapse sidebar");
|
|
||||||
def.type = coBool;
|
|
||||||
def.tooltip = L("If enabled, the button for the collapse sidebar will be appeared in top right corner of the 3D Scene");
|
|
||||||
def.set_default_value(new ConfigOptionBool{ app_config->get("show_collapse_button") == "1" });
|
|
||||||
option = Option(def, "show_collapse_button");
|
|
||||||
m_optgroup_general->append_single_option_line(option);
|
|
||||||
|
|
||||||
m_optgroup_camera = std::make_shared<ConfigOptionsGroup>(this, _(L("Camera")));
|
m_optgroup_camera = std::make_shared<ConfigOptionsGroup>(this, _(L("Camera")));
|
||||||
m_optgroup_camera->label_width = 40;
|
m_optgroup_camera->label_width = 40;
|
||||||
m_optgroup_camera->m_on_change = [this](t_config_option_key opt_key, boost::any value) {
|
m_optgroup_camera->m_on_change = [this](t_config_option_key opt_key, boost::any value) {
|
||||||
|
@ -154,6 +147,13 @@ void PreferencesDialog::build()
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
def.label = L("Show the button for the collapse sidebar");
|
||||||
|
def.type = coBool;
|
||||||
|
def.tooltip = L("If enabled, the button for the collapse sidebar will be appeared in top right corner of the 3D Scene");
|
||||||
|
def.set_default_value(new ConfigOptionBool{ app_config->get("show_collapse_button") == "1" });
|
||||||
|
option = Option(def, "show_collapse_button");
|
||||||
|
m_optgroup_gui->append_single_option_line(option);
|
||||||
|
|
||||||
def.label = L("Use custom size for toolbar icons");
|
def.label = L("Use custom size for toolbar icons");
|
||||||
def.type = coBool;
|
def.type = coBool;
|
||||||
def.tooltip = L("If enabled, you can change size of toolbar icons manually.");
|
def.tooltip = L("If enabled, you can change size of toolbar icons manually.");
|
||||||
|
@ -190,11 +190,11 @@ void PreferencesDialog::accept()
|
||||||
|
|
||||||
auto app_config = get_app_config();
|
auto app_config = get_app_config();
|
||||||
|
|
||||||
bool settings_layout_changed = m_values.find("old_settings_layout_mode") != m_values.end() ||
|
m_settings_layout_changed = m_values.find("old_settings_layout_mode") != m_values.end() ||
|
||||||
m_values.find("new_settings_layout_mode") != m_values.end() ||
|
m_values.find("new_settings_layout_mode") != m_values.end() ||
|
||||||
m_values.find("dlg_settings_layout_mode") != m_values.end();
|
m_values.find("dlg_settings_layout_mode") != m_values.end();
|
||||||
|
|
||||||
if (settings_layout_changed) {
|
if (m_settings_layout_changed) {
|
||||||
// the dialog needs to be destroyed before the call to recreate_gui()
|
// the dialog needs to be destroyed before the call to recreate_gui()
|
||||||
// or sometimes the application crashes into wxDialogBase() destructor
|
// or sometimes the application crashes into wxDialogBase() destructor
|
||||||
// so we put it into an inner scope
|
// so we put it into an inner scope
|
||||||
|
@ -222,9 +222,8 @@ void PreferencesDialog::accept()
|
||||||
app_config->save();
|
app_config->save();
|
||||||
EndModal(wxID_OK);
|
EndModal(wxID_OK);
|
||||||
|
|
||||||
if (settings_layout_changed)
|
if (m_settings_layout_changed)
|
||||||
// recreate application, if settings layout was changed
|
;// application will be recreated after Preference dialog will be destroyed
|
||||||
wxGetApp().recreate_GUI();
|
|
||||||
else
|
else
|
||||||
// Nothify the UI to update itself from the ini file.
|
// Nothify the UI to update itself from the ini file.
|
||||||
wxGetApp().update_ui_from_settings();
|
wxGetApp().update_ui_from_settings();
|
||||||
|
|
|
@ -23,10 +23,13 @@ class PreferencesDialog : public DPIDialog
|
||||||
wxSizer* m_icon_size_sizer;
|
wxSizer* m_icon_size_sizer;
|
||||||
wxRadioBox* m_layout_mode_box;
|
wxRadioBox* m_layout_mode_box;
|
||||||
bool isOSX {false};
|
bool isOSX {false};
|
||||||
|
bool m_settings_layout_changed {false};
|
||||||
public:
|
public:
|
||||||
PreferencesDialog(wxWindow* parent);
|
PreferencesDialog(wxWindow* parent);
|
||||||
~PreferencesDialog() {}
|
~PreferencesDialog() {}
|
||||||
|
|
||||||
|
bool settings_layout_changed() { return m_settings_layout_changed; }
|
||||||
|
|
||||||
void build();
|
void build();
|
||||||
void accept();
|
void accept();
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue