From c0dc2577e4243ab2f88eb6e0e7117a93981528a5 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Thu, 10 Dec 2020 18:28:04 +0200 Subject: [PATCH] - added some color coded titles in some Application Tools that hold multiple functions --- CHANGELOG.md | 1 + appTools/ToolCopperThieving.py | 13 ++++++++----- appTools/ToolDblSided.py | 10 +++++----- appTools/ToolExtract.py | 13 +++++++++---- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f02668e5..45b84a94 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ CHANGELOG for FlatCAM beta - Film Tool - remade the 'Beginner/Advanced' Mode - 2Sided Tool - remade the 'Beginner/Advanced' Mode - Drilling Tool - fixed a bug where this Tool will work on a previous version of the selected Excellon object (in case that the object was altered between launch of the Drilling Tool and the GCode generation) +- added some color coded titles in some Application Tools that hold multiple functions 9.11.2020 diff --git a/appTools/ToolCopperThieving.py b/appTools/ToolCopperThieving.py index ccadb608..fe7ac1d0 100644 --- a/appTools/ToolCopperThieving.py +++ b/appTools/ToolCopperThieving.py @@ -1294,7 +1294,8 @@ class ThievingUI: grid_lay.setColumnStretch(0, 0) grid_lay.setColumnStretch(1, 1) - self.copper_fill_label = FCLabel('%s' % _('Parameters')) + self.copper_fill_label = FCLabel('%s' % + _('Thieving Parameters').upper()) self.copper_fill_label.setToolTip( _("Parameters used for this tool.") ) @@ -1582,9 +1583,10 @@ class ThievingUI: separator_line_1.setFrameShadow(QtWidgets.QFrame.Sunken) grid_lay_1.addWidget(separator_line_1, 0, 0, 1, 3) - grid_lay_1.addWidget(FCLabel('')) + # grid_lay_1.addWidget(FCLabel('')) - self.robber_bar_label = FCLabel('%s' % _('Robber Bar Parameters')) + self.robber_bar_label = FCLabel('%s' % + _('Robber Bar Parameters').upper()) self.robber_bar_label.setToolTip( _("Parameters used for the robber bar.\n" "Robber bar = copper border to help in pattern hole plating.") @@ -1639,7 +1641,8 @@ class ThievingUI: separator_line_2.setFrameShadow(QtWidgets.QFrame.Sunken) grid_lay_1.addWidget(separator_line_2, 10, 0, 1, 3) - self.patern_mask_label = FCLabel('%s' % _('Pattern Plating Mask')) + self.patern_mask_label = FCLabel('%s' % + _('Pattern Plating Mask').upper()) self.patern_mask_label.setToolTip( _("Generate a mask for pattern plating.") ) @@ -1734,7 +1737,7 @@ class ThievingUI: """) grid_lay_1.addWidget(self.ppm_button, 24, 0, 1, 3) - self.layout.addStretch() + self.layout.addStretch(1) # ## Reset Tool self.reset_button = QtWidgets.QPushButton(_("Reset Tool")) diff --git a/appTools/ToolDblSided.py b/appTools/ToolDblSided.py index b990cebf..66959853 100644 --- a/appTools/ToolDblSided.py +++ b/appTools/ToolDblSided.py @@ -703,7 +703,7 @@ class DsidedUI: self.tools_box.addLayout(grid0) # ## Title Bounds Values - self.bv_label = FCLabel("%s:" % _('Bounds Values')) + self.bv_label = FCLabel('%s' % _('Bounds Values').upper()) self.bv_label.setToolTip( _("Select on canvas the object(s)\n" "for which to calculate bounds values.") @@ -790,7 +790,7 @@ class DsidedUI: self.calculate_bb_button.setStyleSheet(""" QPushButton { - font-weight: bold; + font-weight: bold; } """) grid0.addWidget(self.calculate_bb_button, 13, 0, 1, 2) @@ -808,7 +808,7 @@ class DsidedUI: grid1.setColumnStretch(1, 1) self.tools_box.addLayout(grid1) - self.param_label = FCLabel("%s:" % _("Mirror Operation")) + self.param_label = FCLabel('%s' % _("Mirror Operation").upper()) self.param_label.setToolTip('%s.' % _("Parameters for the mirror operation")) grid1.addWidget(self.param_label, 0, 0, 1, 2) @@ -943,7 +943,7 @@ class DsidedUI: ) self.mirror_button.setStyleSheet(""" QPushButton - { + { font-weight: bold; } """) @@ -963,7 +963,7 @@ class DsidedUI: self.tools_box.addLayout(grid4) # ## Alignment holes - self.alignment_label = FCLabel("%s:" % _('PCB Alignment')) + self.alignment_label = FCLabel('%s' % _('PCB Alignment').upper()) self.alignment_label.setToolTip( _("Creates an Excellon Object containing the\n" "specified alignment holes and their mirror\n" diff --git a/appTools/ToolExtract.py b/appTools/ToolExtract.py index d477c838..342b0a75 100644 --- a/appTools/ToolExtract.py +++ b/appTools/ToolExtract.py @@ -1017,12 +1017,12 @@ class ExtractUI: # grid1.addWidget(FCLabel(""), 0, 0, 1, 2) - self.extract_drills_label = FCLabel('%s' % _("Extract Drills").upper()) + self.extract_drills_label = FCLabel('%s' % _("Extract Drills").upper()) self.extract_drills_label.setToolTip( _("Extract an Excellon object from the Gerber pads.")) grid1.addWidget(self.extract_drills_label, 1, 0, 1, 2) - self.method_label = FCLabel('%s:' % _("Method")) + self.method_label = FCLabel('%s:' % _("Method")) self.method_label.setToolTip( _("The method for processing pads. Can be:\n" "- Fixed Diameter -> all holes will have a set size\n" @@ -1205,7 +1205,7 @@ class ExtractUI: # grid3.addWidget(FCLabel(""), 16, 0, 1, 2) # EXTRACT SOLDERMASK - self.extract_sm_label = FCLabel('%s' % _("Extract Soldermask").upper()) + self.extract_sm_label = FCLabel('%s' % _("Extract Soldermask").upper()) self.extract_sm_label.setToolTip( _("Extract soldermask from a given Gerber file.")) grid3.addWidget(self.extract_sm_label, 18, 0, 1, 2) @@ -1243,8 +1243,13 @@ class ExtractUI: """) grid3.addWidget(self.e_sm_button, 24, 0, 1, 2) + separator_line = QtWidgets.QFrame() + separator_line.setFrameShape(QtWidgets.QFrame.HLine) + separator_line.setFrameShadow(QtWidgets.QFrame.Sunken) + grid3.addWidget(separator_line, 25, 0, 1, 2) + # EXTRACT CUTOUT - self.extract_cut_label = FCLabel('%s' % _("Extract Cutout").upper()) + self.extract_cut_label = FCLabel('%s' % _("Extract Cutout").upper()) self.extract_cut_label.setToolTip( _("Extract a cutout from a given Gerber file.")) grid3.addWidget(self.extract_cut_label, 26, 0, 1, 2)