This commit is contained in:
David Robertson
2020-05-03 16:01:06 +01:00
parent c2c4375893
commit 100f3e5394
4 changed files with 3 additions and 8 deletions

View File

@@ -1,7 +1,5 @@
import sys import sys
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import OptionalInputSection from flatcamGUI.GUIElements import OptionalInputSection
from flatcamGUI.preferences.OptionUI import * from flatcamGUI.preferences.OptionUI import *
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI2 from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI2

View File

@@ -1,4 +1,4 @@
from PyQt5 import QtCore, QtGui from PyQt5 import QtCore
from PyQt5.QtCore import QSettings 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

View File

@@ -1,5 +1,5 @@
from PyQt5 import QtWidgets, QtCore from PyQt5 import QtWidgets, QtCore
from PyQt5.QtCore import QSettings, Qt from PyQt5.QtCore import QSettings
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI2 from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI2
import gettext import gettext
@@ -235,8 +235,6 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI2):
current_layout = self.layout_field.get_value() current_layout = self.layout_field.get_value()
self.app.ui.set_layout(current_layout) self.app.ui.set_layout(current_layout)
@staticmethod @staticmethod
def handle_style(style): def handle_style(style):
# FIXME: this should be moved out to a view model # FIXME: this should be moved out to a view model

View File

@@ -9,13 +9,12 @@ class GeneralPreferencesUI(PreferencesSectionUI):
def __init__(self, decimals, **kwargs): def __init__(self, decimals, **kwargs):
self.decimals = decimals self.decimals = decimals
self.general_gui_group = GeneralGUIPrefGroupUI(decimals=self.decimals)
super().__init__(**kwargs) super().__init__(**kwargs)
def build_groups(self) -> [OptionsGroupUI]: def build_groups(self) -> [OptionsGroupUI]:
return [ return [
GeneralAppPrefGroupUI(decimals=self.decimals), GeneralAppPrefGroupUI(decimals=self.decimals),
self.general_gui_group, GeneralGUIPrefGroupUI(decimals=self.decimals),
GeneralAppSettingsGroupUI(decimals=self.decimals) GeneralAppSettingsGroupUI(decimals=self.decimals)
] ]