- made some corrections - due of recent refactoring PyCharm reported errors all over (not correct but it made programming difficult)

- modified the requirements.txt file to force svg.path module to be at least version 4.0
This commit is contained in:
Marius Stanciu
2020-04-30 12:47:07 +03:00
committed by Marius
parent 0ac5bb777b
commit 98541775d4
56 changed files with 843 additions and 108 deletions

View File

@@ -4,10 +4,24 @@ from PyQt5.QtCore import QSettings, Qt
from flatcamGUI.GUIElements import RadioSet, FCCheckBox, FCButton, FCComboBox, FCEntry, FCSpinner
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
import FlatCAMTranslation as fcTranslate
import builtins
fcTranslate.apply_language('strings')
if '_' not in builtins.__dict__:
_ = gettext.gettext
settings = QSettings("Open Source", "FlatCAM")
if settings.contains("machinist"):
machinist_setting = settings.value('machinist', type=int)
else:
machinist_setting = 0
class GeneralGUIPrefGroupUI(OptionsGroupUI):
def __init__(self, decimals=4, parent=None):
super(GeneralGUIPrefGroupUI, self).__init__(self)
super(GeneralGUIPrefGroupUI, self).__init__(self, parent=parent)
self.setTitle(str(_("GUI Preferences")))
self.decimals = decimals
@@ -629,6 +643,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
:param lay: Type of layout to be set on the toolbard
:return: None
"""
self.app.defaults.report_usage("on_layout()")
if lay:
current_layout = lay
@@ -769,4 +784,4 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
self.app.ui.grid_gap_x_entry.setText(str(self.app.defaults["global_gridx"]))
self.app.ui.grid_gap_y_entry.setText(str(self.app.defaults["global_gridy"]))
self.app.ui.snap_max_dist_entry.setText(str(self.app.defaults["global_snap_max"]))
self.app.ui.grid_gap_link_cb.setChecked(True)
self.app.ui.grid_gap_link_cb.setChecked(True)