From bdbe0f59f09cf72b67df363ca510da8a711454cb Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Sat, 7 Sep 2019 20:10:09 +0300 Subject: [PATCH] - modified the on_about() message --- FlatCAMApp.py | 8 ++++---- README.md | 2 +- flatcamGUI/FlatCAMGUI.py | 5 +++++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/FlatCAMApp.py b/FlatCAMApp.py index 93048a45..802cda73 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -3565,11 +3565,11 @@ class App(QtCore.QObject): "Manufacturing.
" "
" " License:
" - "Licensed under MIT license (c)2014 - 2019" + "Licensed under MIT license (2014 - 2019)" "
" + "by (c)Juan Pablo Caram
" "
" " Programmers:
" - " Juan Pablo Caram
" "Denis Hayrullin
" "Kamil Sopko
" "Marius Stanciu
" @@ -3577,9 +3577,9 @@ class App(QtCore.QObject): "and many others found " "here.
" "
" - "Development is done " + "Development is done " "here.
" - "DOWNLOAD area " + "DOWNLOAD area " "here.
" "" ).format(version=version, diff --git a/README.md b/README.md index ba0a19a4..ab04148a 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/flatcamGUI/FlatCAMGUI.py b/flatcamGUI/FlatCAMGUI.py index 7b3ad385..4a45e06a 100644 --- a/flatcamGUI/FlatCAMGUI.py +++ b/flatcamGUI/FlatCAMGUI.py @@ -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