From 100f3e5394de5950c3016f951e2f29404e2030d4 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Sun, 3 May 2020 16:01:06 +0100 Subject: [PATCH] clean up --- flatcamGUI/preferences/general/GeneralAppPrefGroupUI.py | 2 -- flatcamGUI/preferences/general/GeneralAppSettingsGroupUI.py | 2 +- flatcamGUI/preferences/general/GeneralGUIPrefGroupUI.py | 4 +--- flatcamGUI/preferences/general/GeneralPreferencesUI.py | 3 +-- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/flatcamGUI/preferences/general/GeneralAppPrefGroupUI.py b/flatcamGUI/preferences/general/GeneralAppPrefGroupUI.py index 68bcd5d7..96ac84b7 100644 --- a/flatcamGUI/preferences/general/GeneralAppPrefGroupUI.py +++ b/flatcamGUI/preferences/general/GeneralAppPrefGroupUI.py @@ -1,7 +1,5 @@ import sys - from PyQt5.QtCore import QSettings - from flatcamGUI.GUIElements import OptionalInputSection from flatcamGUI.preferences.OptionUI import * from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI2 diff --git a/flatcamGUI/preferences/general/GeneralAppSettingsGroupUI.py b/flatcamGUI/preferences/general/GeneralAppSettingsGroupUI.py index 5c37c527..1978bd6d 100644 --- a/flatcamGUI/preferences/general/GeneralAppSettingsGroupUI.py +++ b/flatcamGUI/preferences/general/GeneralAppSettingsGroupUI.py @@ -1,4 +1,4 @@ -from PyQt5 import QtCore, QtGui +from PyQt5 import QtCore from PyQt5.QtCore import QSettings from flatcamGUI.GUIElements import OptionalInputSection from flatcamGUI.preferences import settings diff --git a/flatcamGUI/preferences/general/GeneralGUIPrefGroupUI.py b/flatcamGUI/preferences/general/GeneralGUIPrefGroupUI.py index c16cec4a..6ee4a6fa 100644 --- a/flatcamGUI/preferences/general/GeneralGUIPrefGroupUI.py +++ b/flatcamGUI/preferences/general/GeneralGUIPrefGroupUI.py @@ -1,5 +1,5 @@ from PyQt5 import QtWidgets, QtCore -from PyQt5.QtCore import QSettings, Qt +from PyQt5.QtCore import QSettings from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI2 import gettext @@ -235,8 +235,6 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI2): current_layout = self.layout_field.get_value() self.app.ui.set_layout(current_layout) - - @staticmethod def handle_style(style): # FIXME: this should be moved out to a view model diff --git a/flatcamGUI/preferences/general/GeneralPreferencesUI.py b/flatcamGUI/preferences/general/GeneralPreferencesUI.py index 34151506..c582ccd6 100644 --- a/flatcamGUI/preferences/general/GeneralPreferencesUI.py +++ b/flatcamGUI/preferences/general/GeneralPreferencesUI.py @@ -9,13 +9,12 @@ class GeneralPreferencesUI(PreferencesSectionUI): def __init__(self, decimals, **kwargs): self.decimals = decimals - self.general_gui_group = GeneralGUIPrefGroupUI(decimals=self.decimals) super().__init__(**kwargs) def build_groups(self) -> [OptionsGroupUI]: return [ GeneralAppPrefGroupUI(decimals=self.decimals), - self.general_gui_group, + GeneralGUIPrefGroupUI(decimals=self.decimals), GeneralAppSettingsGroupUI(decimals=self.decimals) ]