Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/supermerill/SuperSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbubnikv <bubnikv@gmail.com>2019-08-29 16:35:28 +0300
committerbubnikv <bubnikv@gmail.com>2019-08-29 16:35:28 +0300
commit78697b2acfd3a4fbbb0b49b955f6a2b12df72326 (patch)
tree0e9f22f98efd03d21a1fbf3707c2ac6682871e76 /src/slic3r/GUI/GUI_App.hpp
parentace275af7f539fd623834cd3731ad7b96ac87e6f (diff)
Improvement of selection of language / dictionaries.
When switching the languages, if the newly selected dictionary is "compatible" with the system best language or user's locale, then the system best language locale or user's locale is activated, not the locale connected to the dictionary.
Diffstat (limited to 'src/slic3r/GUI/GUI_App.hpp')
-rw-r--r--src/slic3r/GUI/GUI_App.hpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp
index 83017f176..a8043e991 100644
--- a/src/slic3r/GUI/GUI_App.hpp
+++ b/src/slic3r/GUI/GUI_App.hpp
@@ -88,7 +88,11 @@ class GUI_App : public wxApp
size_t m_em_unit; // width of a "m"-symbol in pixels for current system font
// Note: for 100% Scale m_em_unit = 10 -> it's a good enough coefficient for a size setting of controls
- std::unique_ptr<wxLocale> m_wxLocale;
+ std::unique_ptr<wxLocale> m_wxLocale;
+ // System language, from locales, owned by wxWidgets.
+ const wxLanguageInfo *m_language_info_system = nullptr;
+ // Best translation language, provided by Windows or OSX, owned by wxWidgets.
+ const wxLanguageInfo *m_language_info_best = nullptr;
std::unique_ptr<ImGuiWrapper> m_imgui;
std::unique_ptr<PrintHostJobQueue> m_printhost_job_queue;