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

Merge branch 'Beta' into separate-PreferencesUI-classes-into-individual-files

Browse Source
This commit is contained in:
David Robertson
2020-04-29 23:42:35 +01:00
parent f7989c029f debf27d746
commit 6b36667c15
26 changed files with 5672 additions and 5668 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
flatcamGUI/preferences/GeneralAppPrefGroupUI.py
View File

@@ -26,7 +26,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
self.unitslabel = QtWidgets.QLabel('<span style="color:red;"><b>%s:</b></span>' % _('Units'))
self.unitslabel.setToolTip(_("The default value for FlatCAM units.\n"
"Whatever is selected here is set every time\n"
"FLatCAM is started."))
"FlatCAM is started."))
self.units_radio = RadioSet([{'label': _('MM'), 'value': 'MM'},
{'label': _('IN'), 'value': 'IN'}])

2
flatcamGUI/preferences/PreferencesUIManager.py
View File

@@ -605,7 +605,7 @@ class PreferencesUIManager:
:param field: the GUI element in Preferences GUI to be updated
:param factor: factor to be applied to the field parameter
:param units: current FLatCAM measuring units
:param units: current FlatCAM measuring units
:param defaults_dict: the defaults storage
:return: None, it updates GUI elements
"""

4
flatcamGUI/preferences/ToolsNCCPrefGroupUI.py
View File

@@ -142,7 +142,7 @@ class ToolsNCCPrefGroupUI(OptionsGroupUI):
self.ncc_order_label.setToolTip(_("This set the way that the tools in the tools table are used.\n"
"'No' --> means that the used order is the one in the tool table\n"
"'Forward' --> means that the tools will be ordered from small to big\n"
"'Reverse' --> menas that the tools will ordered from big to small\n\n"
"'Reverse' --> means that the tools will ordered from big to small\n\n"
"WARNING: using rest machining will automatically set the order\n"
"in reverse and disable this control."))
@@ -152,7 +152,7 @@ class ToolsNCCPrefGroupUI(OptionsGroupUI):
self.ncc_order_radio.setToolTip(_("This set the way that the tools in the tools table are used.\n"
"'No' --> means that the used order is the one in the tool table\n"
"'Forward' --> means that the tools will be ordered from small to big\n"
"'Reverse' --> menas that the tools will ordered from big to small\n\n"
"'Reverse' --> means that the tools will ordered from big to small\n\n"
"WARNING: using rest machining will automatically set the order\n"
"in reverse and disable this control."))
grid0.addWidget(self.ncc_order_label, 8, 0)

2
flatcamGUI/preferences/ToolsPaintPrefGroupUI.py
View File

@@ -128,7 +128,7 @@ class ToolsPaintPrefGroupUI(OptionsGroupUI):
self.paint_order_label.setToolTip(_("This set the way that the tools in the tools table are used.\n"
"'No' --> means that the used order is the one in the tool table\n"
"'Forward' --> means that the tools will be ordered from small to big\n"
"'Reverse' --> menas that the tools will ordered from big to small\n\n"
"'Reverse' --> means that the tools will ordered from big to small\n\n"
"WARNING: using rest machining will automatically set the order\n"
"in reverse and disable this control."))