- added project name to the window title
This commit is contained in:
parent
8cadcb3837
commit
c6d917dec4
|
@ -96,8 +96,8 @@ class App(QtCore.QObject):
|
||||||
# ####################################
|
# ####################################
|
||||||
# Version and VERSION DATE ###########
|
# Version and VERSION DATE ###########
|
||||||
# ####################################
|
# ####################################
|
||||||
version = 8.920
|
version = 8.93
|
||||||
version_date = "2019/07/31"
|
version_date = "2019/08/31"
|
||||||
beta = True
|
beta = True
|
||||||
|
|
||||||
# current date now
|
# current date now
|
||||||
|
@ -295,6 +295,7 @@ class App(QtCore.QObject):
|
||||||
|
|
||||||
QtCore.QObject.__init__(self)
|
QtCore.QObject.__init__(self)
|
||||||
self.ui = FlatCAMGUI(self.version, self.beta, self)
|
self.ui = FlatCAMGUI(self.version, self.beta, self)
|
||||||
|
self.set_ui_title(name="New Project")
|
||||||
|
|
||||||
self.ui.geom_update[int, int, int, int, int].connect(self.save_geometry)
|
self.ui.geom_update[int, int, int, int, int].connect(self.save_geometry)
|
||||||
self.ui.final_save.connect(self.final_save)
|
self.ui.final_save.connect(self.final_save)
|
||||||
|
@ -2075,6 +2076,14 @@ class App(QtCore.QObject):
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
log.debug("Could not open FlatCAM Script file as App parameter due: %s" % str(e))
|
log.debug("Could not open FlatCAM Script file as App parameter due: %s" % str(e))
|
||||||
|
|
||||||
|
def set_ui_title(self, name):
|
||||||
|
self.ui.setWindowTitle('FlatCAM %s %s - %s %s' %
|
||||||
|
(self.version,
|
||||||
|
('BETA' if self.beta else ''),
|
||||||
|
platform.architecture()[0],
|
||||||
|
name)
|
||||||
|
)
|
||||||
|
|
||||||
def defaults_read_form(self):
|
def defaults_read_form(self):
|
||||||
for option in self.defaults_form_fields:
|
for option in self.defaults_form_fields:
|
||||||
try:
|
try:
|
||||||
|
@ -6256,6 +6265,9 @@ class App(QtCore.QObject):
|
||||||
# take the focus of the Notebook on Project Tab.
|
# take the focus of the Notebook on Project Tab.
|
||||||
self.ui.notebook.setCurrentWidget(self.ui.project_tab)
|
self.ui.notebook.setCurrentWidget(self.ui.project_tab)
|
||||||
|
|
||||||
|
self.set_ui_title(name="New Project")
|
||||||
|
|
||||||
|
|
||||||
def obj_properties(self):
|
def obj_properties(self):
|
||||||
self.report_usage("obj_properties()")
|
self.report_usage("obj_properties()")
|
||||||
|
|
||||||
|
@ -6445,7 +6457,9 @@ class App(QtCore.QObject):
|
||||||
return
|
return
|
||||||
|
|
||||||
# Check for more compatible types and add as required
|
# Check for more compatible types and add as required
|
||||||
if (not isinstance(obj, FlatCAMGeometry) and not isinstance(obj, FlatCAMGerber) and not isinstance(obj, FlatCAMCNCjob)
|
if (not isinstance(obj, FlatCAMGeometry)
|
||||||
|
and not isinstance(obj, FlatCAMGerber)
|
||||||
|
and not isinstance(obj, FlatCAMCNCjob)
|
||||||
and not isinstance(obj, FlatCAMExcellon)):
|
and not isinstance(obj, FlatCAMExcellon)):
|
||||||
msg = _("[ERROR_NOTCL] Only Geometry, Gerber and CNCJob objects can be used.")
|
msg = _("[ERROR_NOTCL] Only Geometry, Gerber and CNCJob objects can be used.")
|
||||||
msgbox = QtWidgets.QMessageBox()
|
msgbox = QtWidgets.QMessageBox()
|
||||||
|
@ -6455,7 +6469,7 @@ class App(QtCore.QObject):
|
||||||
msgbox.exec_()
|
msgbox.exec_()
|
||||||
return
|
return
|
||||||
|
|
||||||
name = self.collection.get_active().options["name"]
|
name = obj.options["name"]
|
||||||
|
|
||||||
filter = "SVG File (*.svg);;All Files (*.*)"
|
filter = "SVG File (*.svg);;All Files (*.*)"
|
||||||
try:
|
try:
|
||||||
|
@ -6988,6 +7002,8 @@ class App(QtCore.QObject):
|
||||||
self.file_opened.emit("project", self.project_filename)
|
self.file_opened.emit("project", self.project_filename)
|
||||||
self.file_saved.emit("project", self.project_filename)
|
self.file_saved.emit("project", self.project_filename)
|
||||||
|
|
||||||
|
self.set_ui_title(name=self.project_filename)
|
||||||
|
|
||||||
self.should_we_save = False
|
self.should_we_save = False
|
||||||
|
|
||||||
def on_file_saveprojectas(self, make_copy=False, thread=True, quit=False):
|
def on_file_saveprojectas(self, make_copy=False, thread=True, quit=False):
|
||||||
|
@ -7039,6 +7055,7 @@ class App(QtCore.QObject):
|
||||||
if not make_copy:
|
if not make_copy:
|
||||||
self.project_filename = filename
|
self.project_filename = filename
|
||||||
|
|
||||||
|
self.set_ui_title(name=self.project_filename)
|
||||||
self.should_we_save = False
|
self.should_we_save = False
|
||||||
|
|
||||||
def export_svg(self, obj_name, filename, scale_factor=0.00):
|
def export_svg(self, obj_name, filename, scale_factor=0.00):
|
||||||
|
@ -8089,6 +8106,7 @@ class App(QtCore.QObject):
|
||||||
|
|
||||||
self.should_we_save = False
|
self.should_we_save = False
|
||||||
self.file_opened.emit("project", filename)
|
self.file_opened.emit("project", filename)
|
||||||
|
self.set_ui_title(name=self.project_filename)
|
||||||
|
|
||||||
App.log.debug("Project loaded")
|
App.log.debug("Project loaded")
|
||||||
|
|
||||||
|
|
|
@ -9,6 +9,10 @@ CAD program, and create G-Code for Isolation routing.
|
||||||
|
|
||||||
=================================================
|
=================================================
|
||||||
|
|
||||||
|
3.08.2019
|
||||||
|
|
||||||
|
- added project name to the window title
|
||||||
|
|
||||||
31.07.2019
|
31.07.2019
|
||||||
|
|
||||||
- changed the order of the menu entries in the FIle -> Open ...
|
- changed the order of the menu entries in the FIle -> Open ...
|
||||||
|
|
|
@ -1737,7 +1737,11 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
|
||||||
self.setWindowIcon(self.app_icon)
|
self.setWindowIcon(self.app_icon)
|
||||||
|
|
||||||
self.setGeometry(100, 100, 1024, 650)
|
self.setGeometry(100, 100, 1024, 650)
|
||||||
self.setWindowTitle('FlatCAM %s %s - %s' % (version, ('BETA' if beta else ''), platform.architecture()[0]))
|
self.setWindowTitle('FlatCAM %s %s - %s' %
|
||||||
|
(version,
|
||||||
|
('BETA' if beta else ''),
|
||||||
|
platform.architecture()[0])
|
||||||
|
)
|
||||||
self.show()
|
self.show()
|
||||||
|
|
||||||
self.filename = ""
|
self.filename = ""
|
||||||
|
|
Loading…
Reference in New Issue