Browse Source

minor cleanup

David Robertson 5 years ago
parent
commit
df9ebaf2c9

+ 4 - 4
flatcamGUI/preferences/general/GeneralAppSettingsGroupUI.py

@@ -3,7 +3,7 @@ from PyQt5.QtCore import QSettings
 from flatcamGUI.GUIElements import OptionalInputSection
 from flatcamGUI.GUIElements import OptionalInputSection
 from flatcamGUI.preferences import settings
 from flatcamGUI.preferences import settings
 from flatcamGUI.preferences.OptionUI import *
 from flatcamGUI.preferences.OptionUI import *
-from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI, OptionsGroupUI2
+from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI2
 
 
 import gettext
 import gettext
 import FlatCAMTranslation as fcTranslate
 import FlatCAMTranslation as fcTranslate
@@ -159,7 +159,7 @@ class GeneralAppSettingsGroupUI(OptionsGroupUI2):
 
 
             HeadingOptionUI(label_text="Font Size", label_tooltip=None),
             HeadingOptionUI(label_text="Font Size", label_tooltip=None),
             SpinnerOptionUI(
             SpinnerOptionUI(
-                option="notebook_font_size", #FIXME qsettings
+                option="notebook_font_size",
                 label_text="Notebook",
                 label_text="Notebook",
                 label_tooltip="This sets the font size for the elements found in the Notebook.\n"
                 label_tooltip="This sets the font size for the elements found in the Notebook.\n"
                               "The notebook is the collapsible area in the left side of the GUI,\n"
                               "The notebook is the collapsible area in the left side of the GUI,\n"
@@ -167,13 +167,13 @@ class GeneralAppSettingsGroupUI(OptionsGroupUI2):
                 min_value=8, max_value=40, step=1
                 min_value=8, max_value=40, step=1
             ),
             ),
             SpinnerOptionUI(
             SpinnerOptionUI(
-                option="axis_font_size", #FIXME qsettings
+                option="axis_font_size",
                 label_text="Axis",
                 label_text="Axis",
                 label_tooltip="This sets the font size for canvas axis.",
                 label_tooltip="This sets the font size for canvas axis.",
                 min_value=8, max_value=40, step=1
                 min_value=8, max_value=40, step=1
             ),
             ),
             SpinnerOptionUI(
             SpinnerOptionUI(
-                option="textbox_font_size", #FIXME qsettings,
+                option="textbox_font_size",
                 label_text="Textbox",
                 label_text="Textbox",
                 label_tooltip="This sets the font size for the Textbox GUI\n"
                 label_tooltip="This sets the font size for the Textbox GUI\n"
                               "elements that are used in FlatCAM.",
                               "elements that are used in FlatCAM.",

+ 3 - 4
flatcamGUI/preferences/general/GeneralPreferencesUI.py

@@ -8,10 +8,9 @@ from flatcamGUI.preferences.general.GeneralGUIPrefGroupUI import GeneralGUIPrefG
 class GeneralPreferencesUI(PreferencesSectionUI):
 class GeneralPreferencesUI(PreferencesSectionUI):
 
 
     def __init__(self, decimals, **kwargs):
     def __init__(self, decimals, **kwargs):
-        self.decimals = decimals
-        self.general_gui_group = GeneralGUIPrefGroupUI(decimals=self.decimals)
-        self.general_app_group = GeneralAppPrefGroupUI(decimals=self.decimals)
-        self.general_app_settings_group = GeneralAppSettingsGroupUI(decimals=self.decimals)
+        self.general_app_group = GeneralAppPrefGroupUI(decimals=decimals)
+        self.general_gui_group = GeneralGUIPrefGroupUI(decimals=decimals)
+        self.general_app_settings_group = GeneralAppSettingsGroupUI(decimals=decimals)
         super().__init__(**kwargs)
         super().__init__(**kwargs)
 
 
     def build_groups(self) -> [OptionsGroupUI]:
     def build_groups(self) -> [OptionsGroupUI]: