mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-11 00:37:51 -06:00
parent
f65eb9afdb
commit
c8291c6e52
2 changed files with 40 additions and 4 deletions
|
@ -203,7 +203,16 @@ bool GUI_App::OnInit()
|
||||||
load_current_presets();
|
load_current_presets();
|
||||||
|
|
||||||
mainframe->Show(true);
|
mainframe->Show(true);
|
||||||
|
|
||||||
|
/* Temporary workaround for the correct behavior of the Scrolled sidebar panel:
|
||||||
|
* change min hight of object list to the normal min value (15 * wxGetApp().em_unit())
|
||||||
|
* after first whole Mainframe updating/layouting
|
||||||
|
*/
|
||||||
|
if (obj_list()->GetMinSize().GetY() > 15 * em_unit())
|
||||||
|
obj_list()->SetMinSize(wxSize(-1, 15 * em_unit()));
|
||||||
|
|
||||||
update_mode(); // update view mode after fix of the object_list size
|
update_mode(); // update view mode after fix of the object_list size
|
||||||
|
|
||||||
m_initialized = true;
|
m_initialized = true;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -317,6 +326,13 @@ void GUI_App::recreate_GUI()
|
||||||
|
|
||||||
dlg.Update(90, _(L("Loading of a mode view")) + dots);
|
dlg.Update(90, _(L("Loading of a mode view")) + dots);
|
||||||
|
|
||||||
|
/* Temporary workaround for the correct behavior of the Scrolled sidebar panel:
|
||||||
|
* change min hight of object list to the normal min value (15 * wxGetApp().em_unit())
|
||||||
|
* after first whole Mainframe updating/layouting
|
||||||
|
*/
|
||||||
|
if (obj_list()->GetMinSize().GetY() > 15 * em_unit())
|
||||||
|
obj_list()->SetMinSize(wxSize(-1, 15 * em_unit()));
|
||||||
|
|
||||||
update_mode();
|
update_mode();
|
||||||
|
|
||||||
// #ys_FIXME_delete_after_testing Do we still need this ?
|
// #ys_FIXME_delete_after_testing Do we still need this ?
|
||||||
|
@ -633,12 +649,28 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
|
||||||
}
|
}
|
||||||
case ConfigMenuLanguage:
|
case ConfigMenuLanguage:
|
||||||
{
|
{
|
||||||
|
/* Before change application language, let's check unsaved changes
|
||||||
|
* and draw user's attention to the application restarting after a language change
|
||||||
|
*/
|
||||||
|
wxMessageDialog dialog(nullptr,
|
||||||
|
_(L("Application will be restarted after language change, "
|
||||||
|
"and 3D-Scene will be cleaned.")) + "\n" +
|
||||||
|
_(L("Please, check your changes before.")) + "\n\n" +
|
||||||
|
_(L("Continue anyway?")),
|
||||||
|
_(L("Attention!")),
|
||||||
|
wxICON_QUESTION | wxYES_NO | wxNO_DEFAULT);
|
||||||
|
if ( dialog.ShowModal() != wxID_YES)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (!wxGetApp().check_unsaved_changes())
|
||||||
|
return;
|
||||||
|
|
||||||
wxArrayString names;
|
wxArrayString names;
|
||||||
wxArrayLong identifiers;
|
wxArrayLong identifiers;
|
||||||
get_installed_languages(names, identifiers);
|
get_installed_languages(names, identifiers);
|
||||||
if (select_language(names, identifiers)) {
|
if (select_language(names, identifiers)) {
|
||||||
save_language();
|
save_language();
|
||||||
show_info(mainframe->m_tabpanel, _(L("Application will be restarted")), _(L("Attention!")));
|
// show_info(mainframe->m_tabpanel, _(L("Application will be restarted")), _(L("Attention!")));
|
||||||
_3DScene::remove_all_canvases();// remove all canvas before recreate GUI
|
_3DScene::remove_all_canvases();// remove all canvas before recreate GUI
|
||||||
recreate_GUI();
|
recreate_GUI();
|
||||||
}
|
}
|
||||||
|
@ -674,11 +706,11 @@ bool GUI_App::check_unsaved_changes()
|
||||||
// No changes, the application may close or reload presets.
|
// No changes, the application may close or reload presets.
|
||||||
return true;
|
return true;
|
||||||
// Ask the user.
|
// Ask the user.
|
||||||
auto dialog = new wxMessageDialog(mainframe,
|
wxMessageDialog dialog(mainframe,
|
||||||
_(L("You have unsaved changes ")) + dirty + _(L(". Discard changes and continue anyway?")),
|
_(L("You have unsaved changes ")) + dirty + _(L(". Discard changes and continue anyway?")),
|
||||||
_(L("Unsaved Presets")),
|
_(L("Unsaved Presets")),
|
||||||
wxICON_QUESTION | wxYES_NO | wxNO_DEFAULT);
|
wxICON_QUESTION | wxYES_NO | wxNO_DEFAULT);
|
||||||
return dialog->ShowModal() == wxID_YES;
|
return dialog.ShowModal() == wxID_YES;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool GUI_App::checked_tab(Tab* tab)
|
bool GUI_App::checked_tab(Tab* tab)
|
||||||
|
|
|
@ -127,7 +127,11 @@ ObjectList::~ObjectList()
|
||||||
|
|
||||||
void ObjectList::create_objects_ctrl()
|
void ObjectList::create_objects_ctrl()
|
||||||
{
|
{
|
||||||
SetMinSize(wxSize(-1, 15 * wxGetApp().em_unit()));
|
/* Temporary workaround for the correct behavior of the Scrolled sidebar panel:
|
||||||
|
* 1. set a height of the list to some big value
|
||||||
|
* 2. change it to the normal min value (15 * wxGetApp().em_unit()) after first whole Mainframe updating/layouting
|
||||||
|
*/
|
||||||
|
SetMinSize(wxSize(-1, 3000));
|
||||||
|
|
||||||
m_sizer = new wxBoxSizer(wxVERTICAL);
|
m_sizer = new wxBoxSizer(wxVERTICAL);
|
||||||
m_sizer->Add(this, 1, wxGROW);
|
m_sizer->Add(this, 1, wxGROW);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue