Преглед изворни кода

- fixed the issue with GUI entries content being deselected on right click in the box in order to copy the value

Marius Stanciu пре 6 година
родитељ
комит
e35cf7f02c
4 измењених фајлова са 29 додато и 30 уклоњено
  1. 2 1
      README.md
  2. 11 10
      flatcamGUI/FlatCAMGUI.py
  3. 5 4
      flatcamTools/ToolNonCopperClear.py
  4. 11 15
      flatcamTools/ToolPaint.py

+ 2 - 1
README.md

@@ -17,9 +17,10 @@ CAD program, and create G-Code for Isolation routing.
 - fixed a bug in Excellon Editor that made that the selection of drills is always cumulative
 - fixed a bug in Excellon Editor that made that the selection of drills is always cumulative
 - in Paint Tool added ability to add multiple zones to paint when Area option is checked and the modifier key is pressed (either CTRL or SHIFT as set in Preferences). Right click of the mouse is an additional way to finish the job.
 - in Paint Tool added ability to add multiple zones to paint when Area option is checked and the modifier key is pressed (either CTRL or SHIFT as set in Preferences). Right click of the mouse is an additional way to finish the job.
 - in Paint Tool and NCC Tool, for the Area option, now mouse panning is allowed while adding areas to process
 - in Paint Tool and NCC Tool, for the Area option, now mouse panning is allowed while adding areas to process
-- for all the tools launched rom toolbar the behavior is modified: first click it will launch the tool; second click: if the Tool tab has focus it will close the tool but if another tab is selected, the tool will have focus
+- for all the FlatCAM tools launched from toolbar the behavior is modified: first click it will launch the tool; second click: if the Tool tab has focus it will close the tool but if another tab is selected, the tool will have focus
 - modified the NCC Tool and Paint Tool to work multiple times after first launch
 - modified the NCC Tool and Paint Tool to work multiple times after first launch
 - fixed the issue with GUI entries content being deselected on right click in the box in order to copy the value
 - fixed the issue with GUI entries content being deselected on right click in the box in order to copy the value
+- some changes in GUI tooltips
 
 
 22.08.2019
 22.08.2019
 
 

+ 11 - 10
flatcamGUI/FlatCAMGUI.py

@@ -6489,11 +6489,12 @@ class ToolsNCCPrefGroupUI(OptionsGroupUI):
                                          {'label': _('Ref'), 'value': 'box'}])
                                          {'label': _('Ref'), 'value': 'box'}])
         reference_label = QtWidgets.QLabel('%s:' % _("Reference"))
         reference_label = QtWidgets.QLabel('%s:' % _("Reference"))
         reference_label.setToolTip(
         reference_label.setToolTip(
-            _("When choosing the 'Itself' option the non copper clearing extent\n"
+            _("- 'Itself' -  the non copper clearing extent\n"
               "is based on the object that is copper cleared.\n "
               "is based on the object that is copper cleared.\n "
-              "Area Selection - left mouse click to start selection of the area to be painted.\n"
-              "Choosing the 'Ref' option will do non copper clearing within the box\n"
-              "specified by another object different than the one that is copper cleared.")
+              "- 'Area Selection' - left mouse click to start selection of the area to be painted.\n"
+              "Keeping a modifier key pressed (CTRL or SHIFT) will allow to add multiple areas.\n"
+              "- 'Reference Object' -  will do non copper clearing within the area\n"
+              "specified by another object.")
         )
         )
         grid0.addWidget(reference_label, 10, 0)
         grid0.addWidget(reference_label, 10, 0)
         grid0.addWidget(self.reference_radio, 10, 1)
         grid0.addWidget(self.reference_radio, 10, 1)
@@ -6777,12 +6778,12 @@ class ToolsPaintPrefGroupUI(OptionsGroupUI):
         # Polygon selection
         # Polygon selection
         selectlabel = QtWidgets.QLabel('%s:' % _('Selection'))
         selectlabel = QtWidgets.QLabel('%s:' % _('Selection'))
         selectlabel.setToolTip(
         selectlabel.setToolTip(
-            _("How to select the polygons to paint.<BR>"
-              "Options:<BR>"
-              "- <B>Single</B>: left mouse click on the polygon to be painted.<BR>"
-              "- <B>Area</B>: left mouse click to start selection of the area to be painted.<BR>"
-              "- <B>All</B>: paint all polygons.<BR>"
-              "- <B>Ref</B>: paint an area described by an external reference object.")
+            _("How to select Polygons to be painted.\n\n"
+              "- 'Area Selection' - left mouse click to start selection of the area to be painted.\n"
+              "Keeping a modifier key pressed (CTRL or SHIFT) will allow to add multiple areas.\n"
+              "- 'All Polygons' - the Paint will start after click.\n"
+              "- 'Reference Object' -  will do non copper clearing within the area\n"
+              "specified by another object.")
         )
         )
         grid0.addWidget(selectlabel, 7, 0)
         grid0.addWidget(selectlabel, 7, 0)
         self.selectmethod_combo = RadioSet([
         self.selectmethod_combo = RadioSet([

+ 5 - 4
flatcamTools/ToolNonCopperClear.py

@@ -316,11 +316,12 @@ class NonCopperClear(FlatCAMTool, Gerber):
         ], orientation='vertical', stretch=False)
         ], orientation='vertical', stretch=False)
         self.reference_label = QtWidgets.QLabel(_("Reference:"))
         self.reference_label = QtWidgets.QLabel(_("Reference:"))
         self.reference_label.setToolTip(
         self.reference_label.setToolTip(
-            _("When choosing the 'Itself' option the non copper clearing extent\n"
+            _("- 'Itself' -  the non copper clearing extent\n"
               "is based on the object that is copper cleared.\n "
               "is based on the object that is copper cleared.\n "
-              "Area Selection - left mouse click to start selection of the area to be painted.\n"
-              "Choosing the 'Reference Object' option will do non copper clearing within the box\n"
-              "specified by another object different than the one that is copper cleared.")
+              "- 'Area Selection' - left mouse click to start selection of the area to be painted.\n"
+              "Keeping a modifier key pressed (CTRL or SHIFT) will allow to add multiple areas.\n"
+              "- 'Reference Object' -  will do non copper clearing within the area\n"
+              "specified by another object.")
         )
         )
         grid3.addWidget(self.reference_label, 9, 0)
         grid3.addWidget(self.reference_label, 9, 0)
         grid3.addWidget(self.reference_radio, 9, 1)
         grid3.addWidget(self.reference_radio, 9, 1)

+ 11 - 15
flatcamTools/ToolPaint.py

@@ -297,12 +297,12 @@ class ToolPaint(FlatCAMTool, Gerber):
             {"label": _("Reference Object"), "value": "ref"}
             {"label": _("Reference Object"), "value": "ref"}
         ], orientation='vertical', stretch=False)
         ], orientation='vertical', stretch=False)
         self.selectmethod_combo.setToolTip(
         self.selectmethod_combo.setToolTip(
-            _("How to select the polygons to paint.<BR>"
-              "Options:<BR>"
-              "- <B>Single Polygons</B>: left mouse click on the polygon to be painted.<BR>"
-              "- <B>Area Selection</B>: left mouse click to start selection of the area to be painted.<BR>"
-              "- <B>All Polygons</B>: paint all polygons.<BR>"
-              "- <B>Reference Object</B>: paint an area described by an external reference object.")
+            _("How to select Polygons to be painted.\n\n"
+              "- 'Area Selection' - left mouse click to start selection of the area to be painted.\n"
+              "Keeping a modifier key pressed (CTRL or SHIFT) will allow to add multiple areas.\n"
+              "- 'All Polygons' - the Paint will start after click.\n"
+              "- 'Reference Object' -  will do non copper clearing within the area\n"
+              "specified by another object.")
         )
         )
         grid3.addWidget(self.selectmethod_combo, 7, 1)
         grid3.addWidget(self.selectmethod_combo, 7, 1)
 
 
@@ -320,7 +320,6 @@ class ToolPaint(FlatCAMTool, Gerber):
         self.box_combo_type.addItem(_("Geometry Reference Box Object"))
         self.box_combo_type.addItem(_("Geometry Reference Box Object"))
         form1.addRow(self.box_combo_type_label, self.box_combo_type)
         form1.addRow(self.box_combo_type_label, self.box_combo_type)
 
 
-
         self.box_combo_label = QtWidgets.QLabel('%s:' % _("Ref. Object"))
         self.box_combo_label = QtWidgets.QLabel('%s:' % _("Ref. Object"))
         self.box_combo_label.setToolTip(
         self.box_combo_label.setToolTip(
             _("The FlatCAM object to be used as non copper clearing reference.")
             _("The FlatCAM object to be used as non copper clearing reference.")
@@ -339,14 +338,11 @@ class ToolPaint(FlatCAMTool, Gerber):
         # GO Button
         # GO Button
         self.generate_paint_button = QtWidgets.QPushButton(_('Create Paint Geometry'))
         self.generate_paint_button = QtWidgets.QPushButton(_('Create Paint Geometry'))
         self.generate_paint_button.setToolTip(
         self.generate_paint_button.setToolTip(
-            _("After clicking here, click inside<BR>"
-              "the polygon you wish to be painted if <B>Single</B> is selected.<BR>"
-              "If <B>Area</B> is selected, then the selection of the area to be painted<BR>"
-              "will be initiated by a first click and finished by the second mouse click.<BR>"
-              "If <B>All</B>  is selected then the Paint will start after click.<BR>"
-              "If <B>Ref</B>  is selected then the Paint will start after click,<BR>"
-              "and the painted area will be described by a selected object.<BR>"
-              "A new Geometry object with the tool paths will be created.")
+            _("- 'Area Selection' - left mouse click to start selection of the area to be painted.\n"
+              "Keeping a modifier key pressed (CTRL or SHIFT) will allow to add multiple areas.\n"
+              "- 'All Polygons' - the Paint will start after click.\n"
+              "- 'Reference Object' -  will do non copper clearing within the area\n"
+              "specified by another object.")
         )
         )
         self.tools_box.addWidget(self.generate_paint_button)
         self.tools_box.addWidget(self.generate_paint_button)