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

- on Coppper Thieving Plugin some UI updates

Browse Source 
- updated the GCGridLayout GUi element to automatically stretch the first column but offered also configuration; updated the use throughout the app
This commit is contained in:
Marius Stanciu
2021-09-09 16:28:14 +03:00
parent d61bbbb8d5
commit 241579d670
75 changed files with 222 additions and 558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
appEditors/AppExcEditor.py
View File

@@ -4063,8 +4063,6 @@ class AppExcEditorUI:
# ######################## ADD New Tool Grid ##################################################################
# #############################################################################################################
grid1 = FCGridLayout(v_spacing=5, h_spacing=3)
grid1.setColumnStretch(0, 0)
grid1.setColumnStretch(1, 1)
self.ui_vertical_lay.addLayout(grid1)
# Tool Diameter Label
@@ -4117,8 +4115,6 @@ class AppExcEditorUI:
self.ui_vertical_lay.addWidget(self.resize_frame)
self.resize_grid = FCGridLayout(v_spacing=5, h_spacing=3)
self.resize_grid.setColumnStretch(0, 0)
self.resize_grid.setColumnStretch(1, 1)
self.resize_grid.setContentsMargins(0, 0, 0, 0)
self.resize_frame.setLayout(self.resize_grid)
@@ -4173,8 +4169,6 @@ class AppExcEditorUI:
self.ui_vertical_lay.addWidget(self.array_frame)
self.array_grid = FCGridLayout(v_spacing=5, h_spacing=3)
self.array_grid.setColumnStretch(0, 0)
self.array_grid.setColumnStretch(1, 1)
self.array_grid.setContentsMargins(0, 0, 0, 0)
self.array_frame.setLayout(self.array_grid)
@@ -4216,8 +4210,6 @@ class AppExcEditorUI:
self.array_linear_frame.setContentsMargins(0, 0, 0, 0)
self.array_grid.addWidget(self.array_linear_frame, 6, 0, 1, 2)
self.lin_grid = FCGridLayout(v_spacing=5, h_spacing=3)
self.lin_grid.setColumnStretch(0, 0)
self.lin_grid.setColumnStretch(1, 1)
self.lin_grid.setContentsMargins(0, 0, 0, 0)
self.array_linear_frame.setLayout(self.lin_grid)
@@ -4275,8 +4267,6 @@ class AppExcEditorUI:
self.array_grid.addWidget(self.array_circular_frame, 8, 0, 1, 2)
self.circ_grid = FCGridLayout(v_spacing=5, h_spacing=3)
self.circ_grid.setColumnStretch(0, 0)
self.circ_grid.setColumnStretch(1, 1)
self.circ_grid.setContentsMargins(0, 0, 0, 0)
self.array_circular_frame.setLayout(self.circ_grid)
@@ -4319,8 +4309,6 @@ class AppExcEditorUI:
self.ui_vertical_lay.addWidget(self.slot_frame)
self.slot_grid = FCGridLayout(v_spacing=5, h_spacing=3)
self.slot_grid.setColumnStretch(0, 0)
self.slot_grid.setColumnStretch(1, 1)
self.slot_grid.setContentsMargins(0, 0, 0, 0)
self.slot_frame.setLayout(self.slot_grid)
@@ -4393,8 +4381,6 @@ class AppExcEditorUI:
self.ui_vertical_lay.addWidget(self.slot_array_frame)
self.slot_array_grid = FCGridLayout(v_spacing=5, h_spacing=3)
self.slot_array_grid.setColumnStretch(0, 0)
self.slot_array_grid.setColumnStretch(1, 1)
self.slot_array_grid.setContentsMargins(0, 0, 0, 0)
self.slot_array_frame.setLayout(self.slot_array_grid)
@@ -4437,8 +4423,6 @@ class AppExcEditorUI:
self.slot_array_grid.addWidget(self.slot_array_linear_frame, 6, 0, 1, 2)
self.slot_array_lin_grid = FCGridLayout(v_spacing=5, h_spacing=3)
self.slot_array_lin_grid.setColumnStretch(0, 0)
self.slot_array_lin_grid.setColumnStretch(1, 1)
self.slot_array_lin_grid.setContentsMargins(0, 0, 0, 0)
self.slot_array_linear_frame.setLayout(self.slot_array_lin_grid)
@@ -4497,8 +4481,6 @@ class AppExcEditorUI:
self.slot_array_grid.addWidget(self.slot_array_circular_frame, 8, 0, 1, 2)
self.slot_array_circ_grid = FCGridLayout(v_spacing=5, h_spacing=3)
self.slot_array_circ_grid.setColumnStretch(0, 0)
self.slot_array_circ_grid.setColumnStretch(1, 1)
self.slot_array_circ_grid.setContentsMargins(0, 0, 0, 0)
self.slot_array_circular_frame.setLayout(self.slot_array_circ_grid)

15
appEditors/AppGeoEditor.py
View File

@@ -84,8 +84,6 @@ class BufferSelectionTool(AppTool):
# Grid Layout
grid_buffer = FCGridLayout(v_spacing=5, h_spacing=3)
grid_buffer.setColumnStretch(0, 0)
grid_buffer.setColumnStretch(1, 1)
self.buffer_tools_box.addLayout(grid_buffer)
# Buffer distance
@@ -268,8 +266,6 @@ class TextInputTool(AppTool):
# Grid Layout
self.grid_text = FCGridLayout(v_spacing=5, h_spacing=3)
self.grid_text.setColumnStretch(0, 0)
self.grid_text.setColumnStretch(1, 1)
self.text_tools_box.addLayout(self.grid_text)
# Font type
@@ -507,8 +503,6 @@ class PaintOptionsTool(AppTool):
grid = FCGridLayout(v_spacing=5, h_spacing=3)
self.layout.addLayout(grid)
grid.setColumnStretch(0, 0)
grid.setColumnStretch(1, 1)
# Tool dia
ptdlabel = FCLabel('%s:' % _('Tool Dia'))
@@ -735,11 +729,8 @@ class TransformEditorTool(AppTool):
self.layout.addWidget(FCLabel(''))
# ## Layout
grid0 = FCGridLayout(v_spacing=5, h_spacing=3)
grid0 = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 1, 0])
self.layout.addLayout(grid0)
grid0.setColumnStretch(0, 0)
grid0.setColumnStretch(1, 1)
grid0.setColumnStretch(2, 0)
grid0.addWidget(FCLabel(''))
@@ -3458,8 +3449,6 @@ class AppGeoEditor(QtCore.QObject):
self.title_box.addWidget(self.level)
self.grid_d = FCGridLayout(v_spacing=5, h_spacing=3)
self.grid_d.setColumnStretch(0, 0)
self.grid_d.setColumnStretch(1, 1)
self.tools_box.addLayout(self.grid_d)
# Tool diameter
@@ -3502,8 +3491,6 @@ class AppGeoEditor(QtCore.QObject):
self.tools_box.addWidget(self.adv_frame)
grid0 = FCGridLayout(v_spacing=5, h_spacing=3)
grid0.setColumnStretch(0, 0)
grid0.setColumnStretch(1, 1)
grid0.setContentsMargins(0, 0, 0, 0)
self.adv_frame.setLayout(grid0)

24
appEditors/AppGerberEditor.py
View File

@@ -6094,8 +6094,6 @@ class AppGerberEditorUI:
# #############################################################################################################
grid1 = FCGridLayout(v_spacing=5, h_spacing=3)
self.apertures_box.addLayout(grid1)
grid1.setColumnStretch(0, 0)
grid1.setColumnStretch(1, 1)
# Title
apadd_del_lbl = FCLabel('<b>%s:</b>' % _('Add/Delete Aperture'))
@@ -6194,8 +6192,6 @@ class AppGerberEditorUI:
self.custom_box.addWidget(self.shape_frame)
self.shape_grid = FCGridLayout(v_spacing=5, h_spacing=3)
self.shape_grid.setColumnStretch(0, 0)
self.shape_grid.setColumnStretch(1, 1)
self.shape_grid.setContentsMargins(0, 0, 0, 0)
self.shape_frame.setLayout(self.shape_grid)
@@ -6215,12 +6211,7 @@ class AppGerberEditorUI:
)
self.shape_grid.addWidget(param_title, 4, 0, 1, 3)
p_grid = FCGridLayout(v_spacing=5, h_spacing=3)
p_grid.setColumnStretch(0, 0)
p_grid.setColumnStretch(1, 0)
p_grid.setColumnStretch(2, 0)
p_grid.setColumnStretch(3, 1)
p_grid.setColumnStretch(4, 0)
p_grid = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 0, 0, 1, 0])
# Is Valid
valid_lbl = FCLabel('<b>%s</b>:' % _("Valid"))
@@ -6333,8 +6324,6 @@ class AppGerberEditorUI:
# Grid Layout
buff_grid = FCGridLayout(v_spacing=5, h_spacing=3)
buff_grid.setColumnStretch(0, 0)
buff_grid.setColumnStretch(1, 1)
self.buffer_tools_box.addLayout(buff_grid)
# Buffer distance
@@ -6393,8 +6382,6 @@ class AppGerberEditorUI:
# Grid Layout
scale_grid = FCGridLayout(v_spacing=5, h_spacing=3)
scale_grid.setColumnStretch(0, 0)
scale_grid.setColumnStretch(1, 1)
self.scale_tools_box.addLayout(scale_grid)
self.scale_factor_lbl = FCLabel('%s:' % _("Scale factor"))
@@ -6444,8 +6431,6 @@ class AppGerberEditorUI:
# Form Layout
mark_grid = FCGridLayout(v_spacing=5, h_spacing=3)
mark_grid.setColumnStretch(0, 0)
mark_grid.setColumnStretch(1, 1)
self.ma_tools_box.addLayout(mark_grid)
# Upper Threshold
@@ -6515,8 +6500,6 @@ class AppGerberEditorUI:
self.array_box.addWidget(separator_line)
array_grid = FCGridLayout(v_spacing=5, h_spacing=3)
array_grid.setColumnStretch(0, 0)
array_grid.setColumnStretch(1, 1)
self.array_box.addLayout(array_grid)
# Title
@@ -6691,11 +6674,8 @@ class TransformEditorTool(AppTool):
self.layout.addWidget(FCLabel(''))
# ## Layout
grid0 = FCGridLayout(v_spacing=5, h_spacing=3)
grid0 = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 1, 0])
self.layout.addLayout(grid0)
grid0.setColumnStretch(0, 0)
grid0.setColumnStretch(1, 1)
grid0.setColumnStretch(2, 0)
grid0.addWidget(FCLabel(''))

4
appEditors/appGCodeEditor.py
View File

@@ -827,9 +827,7 @@ class AppGCodeEditorUI:
self.snippet_frame.setContentsMargins(0, 0, 0, 0)
self.edit_box.addWidget(self.snippet_frame)
self.snippet_grid = FCGridLayout(v_spacing=5, h_spacing=3)
# self.snippet_grid.setColumnStretch(0, 0)
# self.snippet_grid.setColumnStretch(1, 1)
self.snippet_grid = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 0])
self.snippet_grid.setContentsMargins(0, 0, 0, 0)
self.snippet_frame.setLayout(self.snippet_grid)