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

Menu icons location changes restored and will be addressed in future update with better mechanism. FCLabel calls updated where possible based on new method parameters

Browse Source
This commit is contained in:
Ali Khalil
2022-04-18 11:32:33 +03:00
parent 84cdc87030
commit ce4b43bd36
45 changed files with 323 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
appGUI/preferences/excellon/ExcellonOptPrefGroupUI.py
View File

@@ -38,7 +38,7 @@ class ExcellonOptPrefGroupUI(OptionsGroupUI):
param_frame.setLayout(param_grid)
# ### Milling Holes ## ##
self.mill_hole_label = FCLabel('<b>%s</b>' % _('Mill Holes'))
self.mill_hole_label = FCLabel('%s' % _('Mill Holes'), bold=True)
self.mill_hole_label.setToolTip(
_("Create Geometry for milling holes.")
)

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

@@ -408,7 +408,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
# #############################################################################################################
# Parameters Frame
# #############################################################################################################
self.par_label = FCLabel('<b><font color="%s">%s</font></b>' % (self.app.theme_safe_color('blue'), _('Parameters')))
self.par_label = FCLabel('%s' % _("Parameters"), color='blue', bold=True)
self.layout.addWidget(self.par_label)
par_frame = FCFrame()

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

@@ -89,7 +89,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
grid1_frame.setLayout(grid1)
# Graphic Engine for FlatCAM
self.ge_label = FCLabel('<b>%s:</b>' % _('Graphic Engine'))
self.ge_label = FCLabel('%s:' % _('Graphic Engine'), bold=True)
self.ge_label.setToolTip(_("Choose what graphic engine to use in FlatCAM.\n"
"Legacy(2D) -> reduced functionality, slow performance but enhanced compatibility.\n"
"OpenGL(3D) -> full functionality, high performance\n"

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

@@ -35,7 +35,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
par_frame.setLayout(grid0)
# Theme selection
self.appearance_label = FCLabel('<b>%s</b>' % _('Theme'))
self.appearance_label = FCLabel('%s' % _('Theme'), bold=True)
self.appearance_label.setToolTip(
_("Select a theme for the application.\n"
"It will theme the plot area.")
@@ -161,7 +161,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
color_frame.setLayout(grid1)
# Plot Selection (left - right) Color
self.sel_lr_label = FCLabel('<b>%s</b>' % _('Left-Right Selection Color'))
self.sel_lr_label = FCLabel('%s' % _('Left-Right Selection Color'), bold=True)
grid1.addWidget(self.sel_lr_label, 0, 0, 1, 2)
self.sl_color_label = FCLabel('%s:' % _('Outline'))
@@ -201,7 +201,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
grid1.addWidget(separator_line, 8, 0, 1, 2)
# Plot Selection (left - right) Color
self.sel_rl_label = FCLabel('<b>%s</b>' % _('Right-Left Selection Color'))
self.sel_rl_label = FCLabel('%s' % _('Right-Left Selection Color'), bold=True)
grid1.addWidget(self.sel_rl_label, 10, 0, 1, 2)
# Plot Selection (right - left) Line Color
@@ -246,7 +246,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
# ----------------------- Editor Color -----------------------------
# ------------------------------------------------------------------
self.editor_color_label = FCLabel('<b>%s</b>' % _('Editor Color'))
self.editor_color_label = FCLabel('%s' % _('Editor Color'), bold=True)
grid1.addWidget(self.editor_color_label, 20, 0, 1, 2)
# Editor Draw Color
@@ -278,7 +278,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
# ----------------------- Project Settings -----------------------------
# ------------------------------------------------------------------
# Light Theme
self.proj_settings_l_label = FCLabel('<b>%s</b> - %s' % (_('Project Items Color'), _("Light")))
self.proj_settings_l_label = FCLabel('%s' % _("Light"), bold=True)
grid1.addWidget(self.proj_settings_l_label, 28, 0, 1, 2)
# Project Tab items color
@@ -310,7 +310,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
grid1.addWidget(separator_line, 33, 0, 1, 2)
# Dark Theme
self.proj_settings_d_label = FCLabel('<b>%s</b> - %s' % (_('Project Items Color'), _("Dark")))
self.proj_settings_d_label = FCLabel('%s' % _("Dark"), bold=True)
grid1.addWidget(self.proj_settings_d_label, 34, 0, 1, 2)
# Project Tab items color

6
appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py
View File

@@ -142,7 +142,7 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):
# #############################################################################################################
# DOTS Grid Parameters Frame
# #############################################################################################################
self.dots_label = FCLabel('<b>%s</b>:' % _("Dots Grid Parameters"))
self.dots_label = FCLabel('%s' % _("Dots Grid Parameters"), bold=True)
self.layout.addWidget(self.dots_label)
dots_frame = FCFrame()
@@ -181,7 +181,7 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):
# #############################################################################################################
# Squares Grid Parameters Frame
# #############################################################################################################
self.squares_label = FCLabel('<b>%s</b>:' % _("Squares Grid Parameters"))
self.squares_label = FCLabel('%s' % _("Squares Grid Parameters"), bold=True)
self.layout.addWidget(self.squares_label)
square_frame = FCFrame()
@@ -220,7 +220,7 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):
# #############################################################################################################
# Lines Grid Parameters Frame
# #############################################################################################################
self.lines_label = FCLabel('<b>%s</b>:' % _("Lines Grid Parameters"))
self.lines_label = FCLabel('%s' % _("Lines Grid Parameters"), bold=True)
self.layout.addWidget(self.lines_label)
line_frame = FCFrame()

2
appGUI/preferences/tools/ToolsISOPrefGroupUI.py
View File

@@ -39,7 +39,7 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
par_frame.setLayout(par_grid)
# Tool Dias
isotdlabel = FCLabel('<b><font color="green">%s:</font></b>' % _('Tools Dia'))
isotdlabel = FCLabel('%s:' % _('Tools Dia'), color='green', bold=True)
isotdlabel.setToolTip(
_("Diameters of the tools, separated by comma.\n"
"The value of the diameter has to use the dot decimals separator.\n"

2
appGUI/preferences/tools/ToolsMillPrefGroupUI.py
View File

@@ -38,7 +38,7 @@ class ToolsMillPrefGroupUI(OptionsGroupUI):
param_frame.setLayout(param_grid)
# Tooldia
tdlabel = FCLabel('<b><font color="green">%s:</font></b>' % _('Tools Dia'))
tdlabel = FCLabel('%s:' % _('Tools Dia'), color='green', bold=True)
tdlabel.setToolTip(
_("Diameters of the tools, separated by comma.\n"
"The value of the diameter has to use the dot decimals separator.\n"

2
appGUI/preferences/tools/ToolsNCCPrefGroupUI.py
View File

@@ -40,7 +40,7 @@ class ToolsNCCPrefGroupUI(OptionsGroupUI):
par_frame.setLayout(par_grid)
# Tools Diameters
ncctdlabel = FCLabel('<b><font color="green">%s:</font></b>' % _('Tools Dia'))
ncctdlabel = FCLabel('%s:' % _('Tools Dia'), color='green', bold=True)
ncctdlabel.setToolTip(
_("Diameters of the tools, separated by comma.\n"
"The value of the diameter has to use the dot decimals separator.\n"

2
appGUI/preferences/tools/ToolsPaintPrefGroupUI.py
View File

@@ -42,7 +42,7 @@ class ToolsPaintPrefGroupUI(OptionsGroupUI):
par_frame.setLayout(param_grid)
# Tool dia
ptdlabel = FCLabel('<b><font color="green">%s:</font></b>' % _('Tools Dia'))
ptdlabel = FCLabel('%s:' % _('Tools Dia'), color='green', bold=True)
ptdlabel.setToolTip(
_("Diameters of the tools, separated by comma.\n"
"The value of the diameter has to use the dot decimals separator.\n"

4
appGUI/preferences/tools/ToolsSolderpastePrefGroupUI.py
View File

@@ -39,7 +39,7 @@ class ToolsSolderpastePrefGroupUI(OptionsGroupUI):
param_frame.setLayout(param_grid)
# Nozzle Tool Diameters
nozzletdlabel = FCLabel('<b><font color="green">%s:</font></b>' % _('Tools Dia'))
nozzletdlabel = FCLabel('%s:' % _('Tools Dia'), color='green', bold=True)
nozzletdlabel.setToolTip(
_("Diameters of the tools, separated by comma.\n"
"The value of the diameter has to use the dot decimals separator.\n"
@@ -51,7 +51,7 @@ class ToolsSolderpastePrefGroupUI(OptionsGroupUI):
param_grid.addWidget(self.nozzle_tool_dia_entry, 0, 1)
# New Nozzle Tool Dia
self.addtool_entry_lbl = FCLabel('<b>%s:</b>' % _('New Nozzle Dia'))
self.addtool_entry_lbl = FCLabel('%s:' % _('New Nozzle Dia'), bold=True)
self.addtool_entry_lbl.setToolTip(
_("Diameter for the new tool to add in the Tool Table")
)

2
appGUI/preferences/utilities/AutoCompletePrefGroupUI.py
View File

@@ -33,7 +33,7 @@ class AutoCompletePrefGroupUI(OptionsGroupUI):
hlay0.addWidget(self.del_all_btn)
# ## Gerber associations
self.grb_list_label = FCLabel("<b>%s:</b>" % _("Keywords list"))
self.grb_list_label = FCLabel('%s:' % _("Keywords list"), bold=True)
self.grb_list_label.setToolTip(
_("List of keywords used by\n"
"the autocompleter in FlatCAM.\n"

2
appGUI/preferences/utilities/FAExcPrefGroupUI.py
View File

@@ -43,7 +43,7 @@ class FAExcPrefGroupUI(OptionsGroupUI):
self.vertical_lay.addLayout(hlay0)
# # ## Excellon associations
list_label = FCLabel("<b>%s:</b>" % _("Extensions list"))
list_label = FCLabel('%s:' % _("Extensions list"), bold=True)
list_label.setToolTip(
_("List of file extensions to be\n"
"associated with FlatCAM.")

2
appGUI/preferences/utilities/FAGcoPrefGroupUI.py
View File

@@ -34,7 +34,7 @@ class FAGcoPrefGroupUI(OptionsGroupUI):
hlay0.addWidget(self.del_all_btn)
# ## G-Code associations
self.gco_list_label = FCLabel("<b>%s:</b>" % _("Extensions list"))
self.gco_list_label = FCLabel('%s:' % _("Extensions list"), bold=True)
self.gco_list_label.setToolTip(
_("List of file extensions to be\n"
"associated with FlatCAM.")

2
appGUI/preferences/utilities/FAGrbPrefGroupUI.py
View File

@@ -33,7 +33,7 @@ class FAGrbPrefGroupUI(OptionsGroupUI):
hlay0.addWidget(self.del_all_btn)
# ## Gerber associations
self.grb_list_label = FCLabel("<b>%s:</b>" % _("Extensions list"))
self.grb_list_label = FCLabel('%s:' % _("Extensions list"), bold=True)
self.grb_list_label.setToolTip(
_("List of file extensions to be\n"
"associated with FlatCAM.")