From cd803266a6cead691da2a2f12189fbbca8635854 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Sat, 3 Aug 2019 03:48:20 +0300 Subject: [PATCH] =?UTF-8?q?-=20fulfilled=20request:=20When=20saving=20a=20?= =?UTF-8?q?CNC=20file,=20if=20the=20file=20name=20is=20changed=20in=20the?= =?UTF-8?q?=20OS=20window,=20the=20new=20name=20does=20appear=20in=20the?= =?UTF-8?q?=20=E2=80=9CSelected=E2=80=9D=20(in=20name)=20and=20=E2=80=9CPr?= =?UTF-8?q?oject=E2=80=9D=20tabs=20(in=20cnc=5Fjob)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FlatCAMObj.py | 9 +++++++-- README.md | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/FlatCAMObj.py b/FlatCAMObj.py index b5944183..9a437ac5 100644 --- a/FlatCAMObj.py +++ b/FlatCAMObj.py @@ -188,7 +188,7 @@ class FlatCAMObj(QtCore.QObject): self.muted_ui = False - def on_name_activate(self): + def on_name_activate(self, silent=None): old_name = copy(self.options["name"]) new_name = self.ui.name_entry.get_value() @@ -205,7 +205,8 @@ class FlatCAMObj(QtCore.QObject): self.options["name"] = self.ui.name_entry.get_value() self.default_data["name"] = self.ui.name_entry.get_value() self.app.collection.update_view() - self.app.inform.emit(_("[success] Name changed from {old} to {new}").format(old=old_name, new=new_name)) + if silent: + self.app.inform.emit(_("[success] Name changed from {old} to {new}").format(old=old_name, new=new_name)) def on_offset_button_click(self): self.app.report_usage("obj_on_offset_button") @@ -5638,6 +5639,10 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob): "[WARNING_NOTCL] Export Machine Code cancelled ...")) return + new_name = os.path.split(str(filename))[1].rpartition('.')[0] + self.ui.name_entry.set_value(new_name) + self.on_name_activate(silent=True) + preamble = str(self.ui.prepend_text.get_value()) postamble = str(self.ui.append_text.get_value()) diff --git a/README.md b/README.md index 71526954..c37d1c93 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ CAD program, and create G-Code for Isolation routing. 3.08.2019 - added project name to the window title +- fulfilled request: When saving a CNC file, if the file name is changed in the OS window, the new name does appear in the “Selected” (in name) and “Project” tabs (in cnc_job) 31.07.2019