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

- some reformatting and class rename

Browse Source 
- when clicking the coordinates toolbars in the status bar now the Distance Plugin is shown and if already displayed, it is closed (toggle action)
This commit is contained in:
Marius Stanciu
2022-04-03 15:06:36 +03:00
committed by Marius
parent 1b9e2feb75
commit a59f996819
90 changed files with 569 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
appGUI/preferences/general/GeneralAPPSetGroupUI.py
View File

@@ -2,7 +2,7 @@ from PyQt6 import QtCore, QtGui
from PyQt6.QtCore import QSettings
from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCComboBox, RadioSet, OptionalInputSection, FCSpinner, \
FCColorEntry, FCLabel, FCGridLayout, FCFrame
FCColorEntry, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -44,7 +44,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
self.layout.addWidget(grids_frame)
# Create a grid layout for the Application general settings
grids_grid = FCGridLayout(v_spacing=5, h_spacing=3)
grids_grid = GLay(v_spacing=5, h_spacing=3)
grids_frame.setLayout(grids_grid)
# Grid X Entry
@@ -96,7 +96,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
wk_frame = FCFrame()
self.layout.addWidget(wk_frame)
wk_grid = FCGridLayout(v_spacing=5, h_spacing=3)
wk_grid = GLay(v_spacing=5, h_spacing=3)
wk_frame.setLayout(wk_grid)
self.workspace_cb = FCCheckBox('%s' % _('Active'))
@@ -197,7 +197,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
fnt_frame = FCFrame()
self.layout.addWidget(fnt_frame)
fnt_grid = FCGridLayout(v_spacing=5, h_spacing=3)
fnt_grid = GLay(v_spacing=5, h_spacing=3)
fnt_frame.setLayout(fnt_grid)
# Notebook Font Size
@@ -289,7 +289,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
ax_frame = FCFrame()
self.layout.addWidget(ax_frame)
ax_grid = FCGridLayout(v_spacing=5, h_spacing=3)
ax_grid = GLay(v_spacing=5, h_spacing=3)
ax_frame.setLayout(ax_grid)
# Axis Color
@@ -311,7 +311,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
m_frame = FCFrame()
self.layout.addWidget(m_frame)
m_grid = FCGridLayout(v_spacing=5, h_spacing=3)
m_grid = GLay(v_spacing=5, h_spacing=3)
m_frame.setLayout(m_grid)
# Mouse Cursor Shape
@@ -414,7 +414,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
par_frame = FCFrame()
self.layout.addWidget(par_frame)
par_grid = FCGridLayout(v_spacing=5, h_spacing=3)
par_grid = GLay(v_spacing=5, h_spacing=3)
par_frame.setLayout(par_grid)
# Delete confirmation
@@ -477,7 +477,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
par_grid.addWidget(self.activity_label, 10, 0)
par_grid.addWidget(self.activity_combo, 10, 1)
FCGridLayout.set_common_column_size(
GLay.set_common_column_size(
[grids_grid, m_grid, par_grid, wk_grid, fnt_grid, ax_grid], 0
)

18
appGUI/preferences/general/GeneralAppPrefGroupUI.py
View File

@@ -3,7 +3,7 @@ import sys
from PyQt6.QtCore import QSettings
from appGUI.GUIElements import RadioSet, FCSpinner, FCCheckBox, FCComboBox, FCButton, OptionalInputSection, \
FCDoubleSpinner, FCLabel, FCGridLayout, RadioSetDefaults, FCFrame, FCComboBox2
FCDoubleSpinner, FCLabel, GLay, RadioSetDefaults, FCFrame, FCComboBox2
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -37,7 +37,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
grid0_frame = FCFrame()
self.layout.addWidget(grid0_frame)
grid0 = FCGridLayout(v_spacing=5, h_spacing=3)
grid0 = GLay(v_spacing=5, h_spacing=3)
grid0_frame.setLayout(grid0)
# Units for FlatCAM
@@ -85,7 +85,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
grid1_frame = FCFrame()
self.layout.addWidget(grid1_frame)
grid1 = FCGridLayout(v_spacing=5, h_spacing=3)
grid1 = GLay(v_spacing=5, h_spacing=3)
grid1_frame.setLayout(grid1)
# Graphic Engine for FlatCAM
@@ -177,7 +177,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
grid2_frame = FCFrame()
self.layout.addWidget(grid2_frame)
grid2 = FCGridLayout(v_spacing=5, h_spacing=3)
grid2 = GLay(v_spacing=5, h_spacing=3)
grid2_frame.setLayout(grid2)
# Application Level for FlatCAM
@@ -196,7 +196,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
grid3_frame = FCFrame()
self.layout.addWidget(grid3_frame)
grid3 = FCGridLayout(v_spacing=5, h_spacing=3)
grid3 = GLay(v_spacing=5, h_spacing=3)
grid3_frame.setLayout(grid3)
self.language_combo = FCComboBox()
@@ -222,7 +222,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
grid4_frame = FCFrame()
self.layout.addWidget(grid4_frame)
grid4 = FCGridLayout(v_spacing=5, h_spacing=3)
grid4 = GLay(v_spacing=5, h_spacing=3)
grid4_frame.setLayout(grid4)
# Splash Screen
@@ -293,7 +293,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
grid6_frame = FCFrame()
self.layout.addWidget(grid6_frame)
grid6 = FCGridLayout(v_spacing=5, h_spacing=3)
grid6 = GLay(v_spacing=5, h_spacing=3)
grid6_frame.setLayout(grid6)
# Save compressed project CB
@@ -358,7 +358,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
grid7_frame = FCFrame()
self.layout.addWidget(grid7_frame)
grid7 = FCGridLayout(v_spacing=5, h_spacing=3)
grid7 = GLay(v_spacing=5, h_spacing=3)
grid7_frame.setLayout(grid7)
# Top Margin value
@@ -415,7 +415,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
self.layout.addStretch()
FCGridLayout.set_common_column_size([grid0, grid1, grid6, grid7], 0)
GLay.set_common_column_size([grid0, grid1, grid6, grid7], 0)
if sys.platform != 'win32':
self.portability_cb.hide()

8
appGUI/preferences/general/GeneralGUIPrefGroupUI.py
View File

@@ -2,7 +2,7 @@ from PyQt6 import QtWidgets, QtCore, QtGui
from PyQt6.QtCore import QSettings
from appGUI.GUIElements import RadioSet, FCCheckBox, FCComboBox, FCSliderWithSpinner, FCColorEntry, FCLabel, \
FCGridLayout, FCFrame, FCComboBox2
GLay, FCFrame, FCComboBox2
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -31,7 +31,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
par_frame = FCFrame()
self.layout.addWidget(par_frame)
grid0 = FCGridLayout(v_spacing=5, h_spacing=3)
grid0 = GLay(v_spacing=5, h_spacing=3)
par_frame.setLayout(grid0)
# Theme selection
@@ -152,7 +152,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
color_frame = FCFrame()
self.layout.addWidget(color_frame)
grid1 = FCGridLayout(v_spacing=5, h_spacing=3)
grid1 = GLay(v_spacing=5, h_spacing=3)
color_frame.setLayout(grid1)
# Plot Selection (left - right) Color
@@ -296,7 +296,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
grid1.addWidget(self.proj_color_dis_label, 32, 0)
grid1.addWidget(self.proj_color_dis_entry, 32, 1)
FCGridLayout.set_common_column_size([grid0, grid1], 0)
GLay.set_common_column_size([grid0, grid1], 0)
# Project autohide CB
self.project_autohide_cb = FCCheckBox(label=_('Project AutoHide'))