- made some corrections - due of recent refactoring PyCharm reported errors all over (not correct but it made programming difficult)

- modified the requirements.txt file to force svg.path module to be at least version 4.0

flatcamGUI/preferences/general/GeneralAPPSetGroupUI.py

@@ -6,10 +6,24 @@ from flatcamGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCComboBox, Radi
 from flatcamGUI.preferences import settings
 from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
+import gettext
+import FlatCAMTranslation as fcTranslate
+import builtins
+
+fcTranslate.apply_language('strings')
+if '_' not in builtins.__dict__:
+    _ = gettext.gettext
+
+settings = QSettings("Open Source", "FlatCAM")
+if settings.contains("machinist"):
+    machinist_setting = settings.value('machinist', type=int)
+else:
+    machinist_setting = 0
+
 
 class GeneralAPPSetGroupUI(OptionsGroupUI):
     def __init__(self, decimals=4, parent=None):
-        super(GeneralAPPSetGroupUI, self).__init__(self)
+        super(GeneralAPPSetGroupUI, self).__init__(self, parent=parent)
 
         self.setTitle(str(_("App Settings")))
         self.decimals = decimals
@@ -466,4 +480,4 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
         self.mouse_cursor_entry.set_value(new_val_sel)
         self.app.defaults['global_cursor_color'] = new_val_sel
 
-        self.app.cursor_color_3D = self.app.defaults["global_cursor_color"]
+        self.app.cursor_color_3D = self.app.defaults["global_cursor_color"]

flatcamGUI/preferences/general/GeneralAppPrefGroupUI.py

@@ -3,15 +3,28 @@ import sys
 from PyQt5 import QtWidgets
 from PyQt5.QtCore import QSettings
 
-import FlatCAMTranslation as fcTranslate
 from flatcamGUI.GUIElements import RadioSet, FCSpinner, FCCheckBox, FCComboBox, FCButton, OptionalInputSection, \
     FCDoubleSpinner
 from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
+import gettext
+import FlatCAMTranslation as fcTranslate
+import builtins
+
+fcTranslate.apply_language('strings')
+if '_' not in builtins.__dict__:
+    _ = gettext.gettext
+
+settings = QSettings("Open Source", "FlatCAM")
+if settings.contains("machinist"):
+    machinist_setting = settings.value('machinist', type=int)
+else:
+    machinist_setting = 0
+
 
 class GeneralAppPrefGroupUI(OptionsGroupUI):
     def __init__(self, decimals=4, parent=None):
-        super(GeneralAppPrefGroupUI, self).__init__(self)
+        super(GeneralAppPrefGroupUI, self).__init__(self, parent=parent)
 
         self.setTitle(_("App Preferences"))
         self.decimals = decimals
@@ -371,4 +384,4 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
         qsettings.setValue('splash_screen', 1) if state else qsettings.setValue('splash_screen', 0)
 
         # This will write the setting to the platform specific storage.
-        del qsettings
+        del qsettings

flatcamGUI/preferences/general/GeneralGUIPrefGroupUI.py

@@ -4,10 +4,24 @@ from PyQt5.QtCore import QSettings, Qt
 from flatcamGUI.GUIElements import RadioSet, FCCheckBox, FCButton, FCComboBox, FCEntry, FCSpinner
 from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
+import gettext
+import FlatCAMTranslation as fcTranslate
+import builtins
+
+fcTranslate.apply_language('strings')
+if '_' not in builtins.__dict__:
+    _ = gettext.gettext
+
+settings = QSettings("Open Source", "FlatCAM")
+if settings.contains("machinist"):
+    machinist_setting = settings.value('machinist', type=int)
+else:
+    machinist_setting = 0
+
 
 class GeneralGUIPrefGroupUI(OptionsGroupUI):
     def __init__(self, decimals=4, parent=None):
-        super(GeneralGUIPrefGroupUI, self).__init__(self)
+        super(GeneralGUIPrefGroupUI, self).__init__(self, parent=parent)
 
         self.setTitle(str(_("GUI Preferences")))
         self.decimals = decimals
@@ -629,6 +643,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
         :param lay:     Type of layout to be set on the toolbard
         :return:        None
         """
+
         self.app.defaults.report_usage("on_layout()")
         if lay:
             current_layout = lay
@@ -769,4 +784,4 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
         self.app.ui.grid_gap_x_entry.setText(str(self.app.defaults["global_gridx"]))
         self.app.ui.grid_gap_y_entry.setText(str(self.app.defaults["global_gridy"]))
         self.app.ui.snap_max_dist_entry.setText(str(self.app.defaults["global_snap_max"]))
-        self.app.ui.grid_gap_link_cb.setChecked(True)
+        self.app.ui.grid_gap_link_cb.setChecked(True)

flatcamGUI/preferences/general/GeneralPreferencesUI.py

@@ -1,9 +1,24 @@
 from PyQt5 import QtWidgets
+from PyQt5.QtCore import QSettings
 
 from flatcamGUI.preferences.general.GeneralAppPrefGroupUI import GeneralAppPrefGroupUI
 from flatcamGUI.preferences.general.GeneralAPPSetGroupUI import GeneralAPPSetGroupUI
 from flatcamGUI.preferences.general.GeneralGUIPrefGroupUI import GeneralGUIPrefGroupUI
 
+import gettext
+import FlatCAMTranslation as fcTranslate
+import builtins
+
+fcTranslate.apply_language('strings')
+if '_' not in builtins.__dict__:
+    _ = gettext.gettext
+
+settings = QSettings("Open Source", "FlatCAM")
+if settings.contains("machinist"):
+    machinist_setting = settings.value('machinist', type=int)
+else:
+    machinist_setting = 0
+
 
 class GeneralPreferencesUI(QtWidgets.QWidget):
     def __init__(self, decimals, parent=None):
@@ -25,4 +40,4 @@ class GeneralPreferencesUI(QtWidgets.QWidget):
         self.layout.addWidget(self.general_gui_group)
         self.layout.addWidget(self.general_app_set_group)
 
-        self.layout.addStretch()
+        self.layout.addStretch()