3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 16:57:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'remotes/origin/vk-bugfixes'

Browse source
This commit is contained in:
bubnikv 2018-06-07 22:10:49 +02:00
commit 2b5a1f3e60
7 changed files with 66 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -358,8 +358,7 @@ void add_config_menu(wxMenuBar *menu, int event_preferences_changed, int event_l
Config::SnapshotDB::singleton().restore_snapshot(dlg.snapshot_to_activate(), *g_AppConfig).id);
g_PresetBundle->load_presets(*g_AppConfig);
// Load the currently selected preset into the GUI, update the preset selection box.
for (Tab *tab : g_tabs_list)
tab->load_current_preset();
load_current_presets();
}
}
break;
@ -453,9 +452,8 @@ void config_wizard(int reason)
show_error(nullptr, e.what());
}
// Load the currently selected preset into the GUI, update the preset selection box.
for (Tab *tab : g_tabs_list)
tab->load_current_preset();
// Load the currently selected preset into the GUI, update the preset selection box.
load_current_presets();
}
void open_preferences_dialog(int event_preferences)
@ -607,6 +605,13 @@ void add_created_tab(Tab* panel)
g_wxTabPanel->AddPage(panel, panel->title());
}
void load_current_presets()
{
for (Tab *tab : g_tabs_list) {
tab->load_current_preset();
}
}
void show_error(wxWindow* parent, const wxString& message) {
ErrorDialog msg(parent, message);
msg.ShowModal();