3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-15 10:47:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Prompt language selection on fresh startup

Browse source
This commit is contained in:
Vojtech Kral 2019-04-29 18:27:46 +02:00
parent 69f81120e0
commit ba297a929a
3 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/slic3r/GUI/GUI.cpp
View file

@ -104,6 +104,7 @@ const std::string& shortkey_alt_prefix()
bool config_wizard_startup(bool app_config_exists) bool config_wizard_startup(bool app_config_exists)
{ {
if (!app_config_exists || wxGetApp().preset_bundle->printers.size() <= 1) { if (!app_config_exists || wxGetApp().preset_bundle->printers.size() <= 1) {
wxGetApp().switch_language();
config_wizard(ConfigWizard::RR_DATA_EMPTY); config_wizard(ConfigWizard::RR_DATA_EMPTY);
return true; return true;
} else if (get_app_config()->legacy_datadir()) { } else if (get_app_config()->legacy_datadir()) {

26
src/slic3r/GUI/GUI_App.cpp
View file

@ -255,7 +255,7 @@ bool GUI_App::on_init_inner()
CallAfter([this] { CallAfter([this] {
if (!config_wizard_startup(app_conf_exists)) { if (!config_wizard_startup(app_conf_exists)) {
// Only notify if there was not wizard so as not to bother too much ... // Only notify if there was no wizard so as not to bother too much ...
preset_updater->slic3r_update_notify(); preset_updater->slic3r_update_notify();
} }
preset_updater->sync(preset_bundle); preset_updater->sync(preset_bundle);
@ -514,6 +514,21 @@ void GUI_App::import_model(wxWindow *parent, wxArrayString& input_files)
dialog.GetPaths(input_files); dialog.GetPaths(input_files);
} }
bool GUI_App::switch_language()
{
wxArrayString names;
wxArrayLong identifiers;
get_installed_languages(names, identifiers);
if (select_language(names, identifiers)) {
save_language();
_3DScene::remove_all_canvases();
recreate_GUI();
return true;
} else {
return false;
}
}
// select language from the list of installed languages // select language from the list of installed languages
bool GUI_App::select_language( wxArrayString & names, bool GUI_App::select_language( wxArrayString & names,
wxArrayLong & identifiers) wxArrayLong & identifiers)
@ -753,14 +768,7 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
if ( dialog.ShowModal() == wxID_CANCEL) if ( dialog.ShowModal() == wxID_CANCEL)
return; return;
wxArrayString names; switch_language();
wxArrayLong identifiers;
get_installed_languages(names, identifiers);
if (select_language(names, identifiers)) {
save_language();
_3DScene::remove_all_canvases();// remove all canvas before recreate GUI
recreate_GUI();
}
break; break;
} }
case ConfigMenuFlashFirmware: case ConfigMenuFlashFirmware:

1
src/slic3r/GUI/GUI_App.hpp
View file

@ -127,6 +127,7 @@ public:
void persist_window_geometry(wxTopLevelWindow *window, bool default_maximized = false); void persist_window_geometry(wxTopLevelWindow *window, bool default_maximized = false);
void update_ui_from_settings(); void update_ui_from_settings();
bool switch_language();
bool select_language(wxArrayString & names, wxArrayLong & identifiers); bool select_language(wxArrayString & names, wxArrayLong & identifiers);
bool load_language(); bool load_language();
void save_language(); void save_language();