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

- added tooltips in Edit->Convert menu

Marius Stanciu пре 7 година
родитељ
комит
7e002dfc9f
3 измењених фајлова са 26 додато и 5 уклоњено
  1. 2 2
      FlatCAMApp.py
  2. 20 3
      FlatCAMGUI.py
  3. 4 0
      README.md

+ 2 - 2
FlatCAMApp.py

@@ -87,8 +87,8 @@ class App(QtCore.QObject):
     log.addHandler(handler)
 
     # Version
-    version = 9.0
-    version_date = "2019/01/06"
+    version = 8.901
+    version_date = "2019/01/07"
     beta = True
 
     # URL for update checks and statistics

+ 20 - 3
FlatCAMGUI.py

@@ -159,15 +159,31 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
         # Separator
         self.menuedit.addSeparator()
         self.menuedit_convert = self.menuedit.addMenu(QtGui.QIcon('share/convert24.png'), 'Conversion')
-        self.menuedit_convertjoin = self.menuedit_convert.addAction(QtGui.QIcon('share/join16.png'), '&Join Geo/Gerber')
-        self.menuedit_convertjoinexc = self.menuedit_convert.addAction(QtGui.QIcon('share/join16.png'), 'Join Excellon')
+        self.menuedit_convertjoin = self.menuedit_convert.addAction(
+            QtGui.QIcon('share/join16.png'), '&Join Geo/Gerber/Exc -> Geo')
+        self.menuedit_convertjoin.setToolTip(
+            "Merge a selection of objects, which can be of type:\n"
+            "- Gerber\n"
+            "- Excellon\n"
+            "- Geometry\n"
+            "into a new combo Geometry object.")
+        self.menuedit_convertjoinexc = self.menuedit_convert.addAction(
+            QtGui.QIcon('share/join16.png'), 'Join Excellon(s) -> Excellon')
+        self.menuedit_convertjoinexc.setToolTip(
+            "Merge a selection of Excellon objects into a new combo Excellon object.")
         # Separator
         self.menuedit_convert.addSeparator()
         self.menuedit_convert_sg2mg = self.menuedit_convert.addAction(
             QtGui.QIcon('share/convert24.png'), 'Convert Single to MultiGeo')
+        self.menuedit_convert_sg2mg.setToolTip(
+            "Will convert a Geometry object from single_geometry type\n"
+            "to a multi_geometry type.")
         self.menuedit_convert_mg2sg = self.menuedit_convert.addAction(
             QtGui.QIcon('share/convert24.png'), 'Convert Multi to SingleGeo')
-
+        self.menuedit_convert_mg2sg.setToolTip(
+            "Will convert a Geometry object from multi_geometry type\n"
+            "to a single_geometry type.")
+        self.menuedit_convert.setToolTipsVisible(True)
         # Separator
         self.menuedit.addSeparator()
         self.menueditdelete = self.menuedit.addAction(QtGui.QIcon('share/trash16.png'), '&Delete')
@@ -1499,6 +1515,7 @@ class ExcellonPrefGroupUI(OptionsGroupUI):
             "\n"
             "PROTEUS 3:3 MM LZ\n"
             "DipTrace 5:2 MM TZ\n"
+            "DipTrace 4:3 MM LZ\n"
             "\n"
             "EAGLE 3:3 MM TZ\n"
             "EAGLE 4:3 MM TZ\n"

+ 4 - 0
README.md

@@ -9,6 +9,10 @@ CAD program, and create G-Code for Isolation routing.
 
 =================================================
 
+7.01.2019
+
+- added tooltips in Edit->Convert menu
+
 6.01.2019
 
 - fixed the Marlin postprocessor detection in GCode header