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

- modified the GUI in Objects Selected Tab to accommodate 2 different modes: basic and Advanced. In Basic mode, some of the functionality's are hidden from the user.

Browse Source
This commit is contained in:
Marius Stanciu
2019-02-18 21:19:57 +02:00
committed by Marius S
parent 8c882cfdc4
commit 88a0be7cf1
5 changed files with 177 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
FlatCAMGUI.py
View File

@@ -1165,6 +1165,10 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
<td height="20">&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr height="20">
<td height="20"><strong>ALT+R</strong></td>
<td>&nbsp;Editor Transformation Tool</td>
</tr>
<tr height="20">
<td height="20"><strong>ALT+X</strong></td>
<td>&nbsp;Offset shape on X axis</td>
@@ -3104,6 +3108,25 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
# to the main layout of this TAB
self.layout.addLayout(self.form_box)
hlay = QtWidgets.QHBoxLayout()
self.layout.addLayout(hlay)
# Advanced CB
self.advanced_cb = FCCheckBox('Show Advanced Options')
self.advanced_cb.setToolTip(
"When checked, Advanced Options will be\n"
"displayed in the Selected Tab for all\n"
"kind of objects."
)
# self.advanced_cb.setLayoutDirection(QtCore.Qt.RightToLeft)
hlay.addWidget(self.advanced_cb)
hlay.addStretch()
self.form_box_2 = QtWidgets.QFormLayout()
self.layout.addLayout(self.form_box_2)
self.layout.addStretch()
class GerberGenPrefGroupUI(OptionsGroupUI):
def __init__(self, parent=None):
@@ -3519,8 +3542,11 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
self.optimization_time_label.setDisabled(True)
self.optimization_time_entry.setDisabled(True)
## Create CNC Job
self.cncjob_label = QtWidgets.QLabel('<b>Create CNC Job</b>')
######################
## ADVANCED OPTIONS ##
######################
self.cncjob_label = QtWidgets.QLabel('<b>Advanced Options:</b>')
self.cncjob_label.setToolTip(
"Parameters used to create a CNC Job object\n"
"for this drill object that are not changed very often."
@@ -3965,9 +3991,9 @@ class GeometryGenPrefGroupUI(OptionsGroupUI):
# ------------------------------
## Create CNC Job
## Advanced Options
# ------------------------------
self.cncjob_label = QtWidgets.QLabel('<b>Create CNC Job:</b>')
self.cncjob_label = QtWidgets.QLabel('<b>Advanced Options:</b>')
self.cncjob_label.setToolTip(
"Parameters to create a CNC Job object\n"
"tracing the contours of a Geometry object."