giuliof
/
flatcam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- modified the on_about() message

This commit is contained in:
Marius Stanciu 2019-09-07 20:10:09 +03:00 committed by Marius
parent 65ac58ae83
commit bdbe0f59f0
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
FlatCAMApp.py
View File

@ -3565,11 +3565,11 @@ class App(QtCore.QObject):
"Manufacturing.<BR>"
"<BR>"
"<B> License: </B><BR>"
"Licensed under MIT license (c)2014 - 2019"
"Licensed under MIT license (2014 - 2019)"
"<BR>"
"by (c)Juan Pablo Caram <BR>"
"<BR>"
"<B> Programmers:</B><BR>"
"<B> Juan Pablo Caram </B><BR>"
"Denis Hayrullin<BR>"
"Kamil Sopko<BR>"
"Marius Stanciu<BR>"
@ -3577,9 +3577,9 @@ class App(QtCore.QObject):
"and many others found "
"<a href = \"https://bitbucket.org/jpcgt/flatcam/pull-requests/?state=MERGED\">here.</a><BR>"
"<BR>"
"Development is done "
"<B>Development</B> is done "
"<a href = \"https://bitbucket.org/jpcgt/flatcam/src/Beta/\">here.</a><BR>"
"DOWNLOAD area "
"<b>DOWNLOAD</B> area "
"<a href = \"https://bitbucket.org/jpcgt/flatcam/downloads/\">here.</a><BR>"
""
).format(version=version,

2
README.md
View File

@ -18,7 +18,7 @@ CAD program, and create G-Code for Isolation routing.
- added new feature in the Gerber object isolation allowing for the isolation to avoid an area defined by another object (Gerber or Geometry)
- all transformation functions show now the progress (rotate, mirror, scale, offset, skew)
- made threaded the Offset and Scale operations found in the Selected tab of the object
- corrected some issues and made Move Tool to show correctly when it is moving and when it is offsetting the objects position
- corrected some issues and made Move Tool to show correctly when it is plotting and when it is offsetting the objects position
- made Set Origin feature, threaded
6.09.2019

5
flatcamGUI/FlatCAMGUI.py
View File

@ -1816,6 +1816,10 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
self.activity_view = FlatCAMActivityView()
self.infobar.addWidget(self.activity_view)
# ###########################################################################
# ####### Set the APP ICON and the WINDOW TITLE and GEOMETRY ################
# ###########################################################################
self.app_icon = QtGui.QIcon()
self.app_icon.addFile('share/flatcam_icon16.png', QtCore.QSize(16, 16))
self.app_icon.addFile('share/flatcam_icon24.png', QtCore.QSize(24, 24))
@ -1950,6 +1954,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
self.lock_action.triggered[bool].connect(self.lock_toolbar)
def eventFilter(self, obj, event):
# filter the ToolTips display based on a Preferences setting
if self.general_defaults_form.general_app_group.toggle_tooltips_cb.get_value() is False:
if event.type() == QtCore.QEvent.ToolTip:
return True