bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

translated the gui prefs group

Browse Source
This commit is contained in:
David Robertson
2020-05-02 03:08:42 +01:00
parent b24474be65
commit b6593b41e2
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
flatcamGUI/GUIElements.py
View File

@@ -655,7 +655,7 @@ class EvalEntry2(QtWidgets.QLineEdit):
return QtCore.QSize(EDIT_SIZE_HINT, default_hint_size.height()) return QtCore.QSize(EDIT_SIZE_HINT, default_hint_size.height())
class FCColorEntry(QtWidgets.QWidget): class FCColorEntry(QtWidgets.QFrame):
def __init__(self, **kwargs): def __init__(self, **kwargs):
super().__init__(**kwargs) super().__init__(**kwargs)
@@ -668,6 +668,7 @@ class FCColorEntry(QtWidgets.QWidget):
self.layout = QtWidgets.QHBoxLayout() self.layout = QtWidgets.QHBoxLayout()
self.layout.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) self.layout.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
self.layout.setContentsMargins(0, 0, 0, 0)
self.layout.addWidget(self.entry) self.layout.addWidget(self.entry)
self.layout.addWidget(self.button) self.layout.addWidget(self.button)
self.setLayout(self.layout) self.setLayout(self.layout)

3
flatcamGUI/preferences/OptionUI.py
View File

@@ -102,7 +102,8 @@ class ComboboxOptionUI(BasicOptionUI):
class ColorOptionUI(BasicOptionUI): class ColorOptionUI(BasicOptionUI):
def build_entry_widget(self) -> QtWidgets.QWidget: def build_entry_widget(self) -> QtWidgets.QWidget:
return FCColorEntry() entry = FCColorEntry()
return entry
class HeadingOptionUI(OptionUI): class HeadingOptionUI(OptionUI):

6
flatcamGUI/preferences/general/GeneralGUIPrefGroupUI.py
View File

@@ -13,12 +13,12 @@ from flatcamGUI.preferences.OptionUI import OptionUI, CheckboxOptionUI, RadioSet
SeparatorOptionUI, HeadingOptionUI, ComboboxOptionUI, ColorOptionUI, FullWidthButtonOptionUI SeparatorOptionUI, HeadingOptionUI, ComboboxOptionUI, ColorOptionUI, FullWidthButtonOptionUI
class GeneralGUIPrefGroupUI2(OptionsGroupUI2): class GeneralGUIPrefGroupUI(OptionsGroupUI2):
def __init__(self, decimals=4, **kwargs): def __init__(self, decimals=4, **kwargs):
super().__init__(**kwargs) super().__init__(**kwargs)
self.decimals = decimals self.decimals = decimals
self.setTitle(str(_("GUI Preferences 2"))) self.setTitle(str(_("GUI Preferences")))
self.layout_field = self.option_dict()["layout"].get_field() self.layout_field = self.option_dict()["layout"].get_field()
self.layout_field.activated.connect(self.on_layout) self.layout_field.activated.connect(self.on_layout)
@@ -117,6 +117,8 @@ class GeneralGUIPrefGroupUI2(OptionsGroupUI2):
"First 6 digits are the color and the last 2\n" "First 6 digits are the color and the last 2\n"
"digits are for alpha (transparency) level." "digits are for alpha (transparency) level."
), ),
# FIXME: opacity slider?
SeparatorOptionUI(),
HeadingOptionUI(label_text="Right-Left Selection Color", label_tooltip=None), HeadingOptionUI(label_text="Right-Left Selection Color", label_tooltip=None),
ColorOptionUI( ColorOptionUI(

4
flatcamGUI/preferences/general/GeneralPreferencesUI.py
View File

@@ -2,14 +2,14 @@ from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI
from flatcamGUI.preferences.PreferencesSectionUI import PreferencesSectionUI from flatcamGUI.preferences.PreferencesSectionUI import PreferencesSectionUI
from flatcamGUI.preferences.general.GeneralAppPrefGroupUI import GeneralAppPrefGroupUI from flatcamGUI.preferences.general.GeneralAppPrefGroupUI import GeneralAppPrefGroupUI
from flatcamGUI.preferences.general.GeneralAPPSetGroupUI import GeneralAPPSetGroupUI from flatcamGUI.preferences.general.GeneralAPPSetGroupUI import GeneralAPPSetGroupUI
from flatcamGUI.preferences.general.GeneralGUIPrefGroupUI import GeneralGUIPrefGroupUI2 from flatcamGUI.preferences.general.GeneralGUIPrefGroupUI import GeneralGUIPrefGroupUI
class GeneralPreferencesUI(PreferencesSectionUI): class GeneralPreferencesUI(PreferencesSectionUI):
def __init__(self, decimals, **kwargs): def __init__(self, decimals, **kwargs):
self.decimals = decimals self.decimals = decimals
self.general_gui_group = GeneralGUIPrefGroupUI2(decimals=self.decimals) self.general_gui_group = GeneralGUIPrefGroupUI(decimals=self.decimals)
self.general_app_group = GeneralAppPrefGroupUI(decimals=self.decimals) self.general_app_group = GeneralAppPrefGroupUI(decimals=self.decimals)
self.general_app_set_group = GeneralAPPSetGroupUI(decimals=self.decimals) self.general_app_set_group = GeneralAPPSetGroupUI(decimals=self.decimals)
super().__init__(**kwargs) super().__init__(**kwargs)