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

- added a partial translation for Chinese Simplified language, by 俊霄 余

Browse Source 
- trying to separate the Preferences settings from App init and to make them dependent on the self.defaults dictionary
- updated the language strings from the source
This commit is contained in:
Marius Stanciu
2021-08-23 14:01:28 +03:00
committed by Marius Stanciu
parent dd39657e4f
commit 7dc67e2b05
85 changed files with 40840 additions and 40672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py
View File

@@ -14,12 +14,13 @@ if '_' not in builtins.__dict__:
class GeometryAdvOptPrefGroupUI(OptionsGroupUI):
def __init__(self, decimals=4, parent=None):
def __init__(self, defaults, decimals=4, parent=None):
# OptionsGroupUI.__init__(self, "Geometry Advanced Options Preferences", parent=parent)
super(GeometryAdvOptPrefGroupUI, self).__init__(self, parent=parent)
self.setTitle(str(_("Geometry Adv. Options")))
self.decimals = decimals
self.defaults = defaults
# ------------------------------
# ## Advanced Options

3
appGUI/preferences/geometry/GeometryEditorPrefGroupUI.py
View File

@@ -13,12 +13,13 @@ if '_' not in builtins.__dict__:
class GeometryEditorPrefGroupUI(OptionsGroupUI):
def __init__(self, decimals=4, parent=None):
def __init__(self, defaults, decimals=4, parent=None):
# OptionsGroupUI.__init__(self, "Gerber Adv. Options Preferences", parent=parent)
super(GeometryEditorPrefGroupUI, self).__init__(self, parent=parent)
self.setTitle(str(_("Geometry Editor")))
self.decimals = decimals
self.defaults = defaults
# Editor Parameters
self.param_label = FCLabel("<b>%s:</b>" % _("Parameters"))

3
appGUI/preferences/geometry/GeometryExpPrefGroupUI.py
View File

@@ -13,11 +13,12 @@ if '_' not in builtins.__dict__:
class GeometryExpPrefGroupUI(OptionsGroupUI):
def __init__(self, decimals=4, parent=None):
def __init__(self, defaults, decimals=4, parent=None):
super(GeometryExpPrefGroupUI, self).__init__(self, parent=parent)
self.setTitle(str(_("Geometry Export")))
self.decimals = decimals
self.defaults = defaults
# Plot options
self.export_options_label = FCLabel("<b>%s:</b>" % _("Export Options"))

11
appGUI/preferences/geometry/GeometryGenPrefGroupUI.py
View File

@@ -15,12 +15,13 @@ if '_' not in builtins.__dict__:
class GeometryGenPrefGroupUI(OptionsGroupUI):
def __init__(self, decimals=4, parent=None):
def __init__(self, defaults, decimals=4, parent=None):
# OptionsGroupUI.__init__(self, "Geometry General Preferences", parent=parent)
super(GeometryGenPrefGroupUI, self).__init__(self, parent=parent)
self.setTitle(str(_("Geometry General")))
self.decimals = decimals
self.defaults = defaults
# ## Plot options
self.plot_options_label = FCLabel("<b>%s:</b>" % _("Plot Options"))
@@ -162,6 +163,14 @@ class GeometryGenPrefGroupUI(OptionsGroupUI):
self.app.defaults['geometry_plot_line'] = self.line_color_entry.get_value()[:7] + 'FF'
def optimization_selection(self, val):
if platform.architecture()[0] != '64bit':
# set Geometry path optimizations algorithm to Rtree if the app is run on a 32bit platform
# modes 'M' or 'B' are not allowed when the app is running in 32bit platform
if val in ['M', 'B']:
self.opt_algorithm_radio.blockSignals(True)
self.opt_algorithm_radio.set_value('R')
self.opt_algorithm_radio.blockSignals(False)
if val == 'M':
self.optimization_time_label.setDisabled(False)
self.optimization_time_entry.setDisabled(False)

3
appGUI/preferences/geometry/GeometryOptPrefGroupUI.py
View File

@@ -15,12 +15,13 @@ if '_' not in builtins.__dict__:
class GeometryOptPrefGroupUI(OptionsGroupUI):
def __init__(self, decimals=4, parent=None):
def __init__(self, defaults, decimals=4, parent=None):
# OptionsGroupUI.__init__(self, "Geometry Options Preferences", parent=parent)
super(GeometryOptPrefGroupUI, self).__init__(self, parent=parent)
self.setTitle(str(_("Geometry Options")))
self.decimals = decimals
self.defaults = defaults
# ------------------------------
# ## Create CNC Job

13
appGUI/preferences/geometry/GeometryPreferencesUI.py
View File

@@ -17,21 +17,22 @@ if '_' not in builtins.__dict__:
class GeometryPreferencesUI(QtWidgets.QWidget):
def __init__(self, decimals, parent=None):
def __init__(self, decimals, defaults, parent=None):
QtWidgets.QWidget.__init__(self, parent=parent)
self.layout = QtWidgets.QHBoxLayout()
self.setLayout(self.layout)
self.decimals = decimals
self.defaults = defaults
self.geometry_gen_group = GeometryGenPrefGroupUI(decimals=self.decimals)
self.geometry_gen_group = GeometryGenPrefGroupUI(decimals=self.decimals, defaults=self.defaults)
self.geometry_gen_group.setMinimumWidth(220)
self.geometry_exp_group = GeometryExpPrefGroupUI(decimals=self.decimals)
self.geometry_exp_group = GeometryExpPrefGroupUI(decimals=self.decimals, defaults=self.defaults)
self.geometry_exp_group.setMinimumWidth(220)
self.geometry_opt_group = GeometryOptPrefGroupUI(decimals=self.decimals)
self.geometry_opt_group = GeometryOptPrefGroupUI(decimals=self.decimals, defaults=self.defaults)
self.geometry_opt_group.setMinimumWidth(300)
self.geometry_adv_opt_group = GeometryAdvOptPrefGroupUI(decimals=self.decimals)
self.geometry_adv_opt_group = GeometryAdvOptPrefGroupUI(decimals=self.decimals, defaults=self.defaults)
self.geometry_adv_opt_group.setMinimumWidth(270)
self.geometry_editor_group = GeometryEditorPrefGroupUI(decimals=self.decimals)
self.geometry_editor_group = GeometryEditorPrefGroupUI(decimals=self.decimals, defaults=self.defaults)
self.geometry_editor_group.setMinimumWidth(250)
self.layout.addWidget(self.geometry_gen_group)