- 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:
@@ -4,6 +4,20 @@ from PyQt5.QtCore import QSettings
|
||||
from flatcamGUI.GUIElements import FCButton, FCTextArea, FCEntry
|
||||
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 AutoCompletePrefGroupUI(OptionsGroupUI):
|
||||
def __init__(self, decimals=4, parent=None):
|
||||
@@ -66,4 +80,4 @@ class AutoCompletePrefGroupUI(OptionsGroupUI):
|
||||
hlay2.addWidget(self.add_btn)
|
||||
hlay2.addWidget(self.del_btn)
|
||||
|
||||
# self.layout.addStretch()
|
||||
# self.layout.addStretch()
|
||||
|
||||
@@ -4,11 +4,25 @@ from PyQt5.QtCore import QSettings
|
||||
from flatcamGUI.GUIElements import VerticalScrollArea, FCButton, FCTextArea, FCEntry
|
||||
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 FAExcPrefGroupUI(OptionsGroupUI):
|
||||
def __init__(self, decimals=4, parent=None):
|
||||
# OptionsGroupUI.__init__(self, "Excellon File associations Preferences", parent=None)
|
||||
super().__init__(self)
|
||||
super().__init__(self, parent=parent)
|
||||
|
||||
self.setTitle(str(_("Excellon File associations")))
|
||||
self.decimals = decimals
|
||||
@@ -85,4 +99,4 @@ class FAExcPrefGroupUI(OptionsGroupUI):
|
||||
scroll_widget.setLayout(self.vertical_lay)
|
||||
self.layout.addWidget(scroll)
|
||||
|
||||
# self.vertical_lay.addStretch()
|
||||
# self.vertical_lay.addStretch()
|
||||
|
||||
@@ -4,11 +4,25 @@ from PyQt5.QtCore import QSettings
|
||||
from flatcamGUI.GUIElements import FCButton, FCTextArea, FCEntry
|
||||
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 FAGcoPrefGroupUI(OptionsGroupUI):
|
||||
def __init__(self, decimals=4, parent=None):
|
||||
# OptionsGroupUI.__init__(self, "Gcode File associations Preferences", parent=None)
|
||||
super(FAGcoPrefGroupUI, self).__init__(self)
|
||||
super(FAGcoPrefGroupUI, self).__init__(self, parent=parent)
|
||||
|
||||
self.setTitle(str(_("GCode File associations")))
|
||||
self.decimals = decimals
|
||||
@@ -72,4 +86,4 @@ class FAGcoPrefGroupUI(OptionsGroupUI):
|
||||
"This work only in Windows."))
|
||||
self.layout.addWidget(self.gco_list_btn)
|
||||
|
||||
# self.layout.addStretch()
|
||||
# self.layout.addStretch()
|
||||
|
||||
@@ -4,11 +4,25 @@ from PyQt5.QtCore import QSettings
|
||||
from flatcamGUI.GUIElements import FCButton, FCTextArea, FCEntry
|
||||
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 FAGrbPrefGroupUI(OptionsGroupUI):
|
||||
def __init__(self, decimals=4, parent=None):
|
||||
# OptionsGroupUI.__init__(self, "Gerber File associations Preferences", parent=None)
|
||||
super(FAGrbPrefGroupUI, self).__init__(self)
|
||||
super(FAGrbPrefGroupUI, self).__init__(self, parent=parent)
|
||||
|
||||
self.setTitle(str(_("Gerber File associations")))
|
||||
self.decimals = decimals
|
||||
@@ -72,4 +86,4 @@ class FAGrbPrefGroupUI(OptionsGroupUI):
|
||||
|
||||
self.layout.addWidget(self.grb_list_btn)
|
||||
|
||||
# self.layout.addStretch()
|
||||
# self.layout.addStretch()
|
||||
|
||||
@@ -34,4 +34,4 @@ class UtilPreferencesUI(QtWidgets.QWidget):
|
||||
self.layout.addWidget(self.fa_gerber_group)
|
||||
self.layout.addWidget(self.kw_group)
|
||||
|
||||
self.layout.addStretch()
|
||||
self.layout.addStretch()
|
||||
|
||||
Reference in New Issue
Block a user