- overwritten the Beta_8.995 branch with the Gerber_Editor_Upgrade branch

appTranslation.py

@@ -89,7 +89,7 @@ def on_language_apply_click(app, restart=False):
     """
     name = app.ui.general_pref_form.general_app_group.language_combo.currentText()
 
-    theme_settings = QSettings("Open Source", "FlatCAM")
+    theme_settings = QSettings("Open Source", "FlatCAM_EVO")
     if theme_settings.contains("theme"):
         theme = theme_settings.value('theme', type=str)
     else:
@@ -101,7 +101,7 @@ def on_language_apply_click(app, restart=False):
         resource_loc = 'assets/resources/dark_resources'
 
     # do nothing if trying to apply the language that is the current language (already applied).
-    settings = QSettings("Open Source", "FlatCAM")
+    settings = QSettings("Open Source", "FlatCAM_EVO")
     if settings.contains("language"):
         current_language = settings.value('language', type=str)
         if current_language == name:
@@ -127,7 +127,7 @@ def on_language_apply_click(app, restart=False):
         if response == bt_no:
             return
         else:
-            settings = QSettings("Open Source", "FlatCAM")
+            settings = QSettings("Open Source", "FlatCAM_EVO")
             saved_language = name
             settings.setValue('language', saved_language)
             # This will write the setting to the platform specific storage.
@@ -140,7 +140,7 @@ def apply_language(domain, lang=None):
     lang_code = ''
 
     if lang is None:
-        settings = QSettings("Open Source", "FlatCAM")
+        settings = QSettings("Open Source", "FlatCAM_EVO")
         if settings.contains("language"):
             name = settings.value('language')
         else:
@@ -186,7 +186,7 @@ def restart_program(app, ask=None):
     """
     log.debug("FlatCAMTranslation.restart_program()")
 
-    theme_settings = QSettings("Open Source", "FlatCAM")
+    theme_settings = QSettings("Open Source", "FlatCAM_EVO")
     if theme_settings.contains("theme"):
         theme = theme_settings.value('theme', type=str)
     else:
@@ -208,6 +208,7 @@ def restart_program(app, ask=None):
     # try to quit the QThread that run ArgsThread class
     try:
         app.listen_th.quit()
+        app.listen_th.wait(1000)
     except Exception as err:
         log.error("FlatCAMTranslation.restart_program() --> %s" % str(err))