diff --git a/FlatCAMApp.py b/FlatCAMApp.py index 6f6d0919..ef6c9357 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -2016,7 +2016,7 @@ class App(QtCore.QObject): self.ui.menufilesaveproject.triggered.connect(self.on_file_saveproject) self.ui.menufilesaveprojectas.triggered.connect(self.on_file_saveprojectas) - self.ui.menufilesaveprojectcopy.triggered.connect(lambda: self.on_file_saveprojectas(make_copy=True)) + # self.ui.menufilesaveprojectcopy.triggered.connect(lambda: self.on_file_saveprojectas(make_copy=True)) self.ui.menufilesavedefaults.triggered.connect(self.on_file_savedefaults) self.ui.menufileexportpref.triggered.connect(self.on_export_preferences) diff --git a/README.md b/README.md index a85ea37d..6bcade76 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ CAD program, and create G-Code for Isolation routing. - made sure that the timeout parameter used by some Tcl Commands is seen as an integer in all cases - minor changes in Paint Tool +- minor changes in GUI (Save locations in Menu -> File) and the key shortcuts 9.04.2020 diff --git a/flatcamGUI/FlatCAMGUI.py b/flatcamGUI/FlatCAMGUI.py index 09bdb939..0401b164 100644 --- a/flatcamGUI/FlatCAMGUI.py +++ b/flatcamGUI/FlatCAMGUI.py @@ -51,7 +51,8 @@ class FlatCAMGUI(QtWidgets.QMainWindow): # ######### ## self.menu = self.menuBar() - self.menu_toggle_nb = QtWidgets.QAction(QtGui.QIcon(self.app.resource_location + '/notebook32.png'), _("Toggle Panel")) + self.menu_toggle_nb = QtWidgets.QAction( + QtGui.QIcon(self.app.resource_location + '/notebook32.png'), _("Toggle Panel")) self.menu_toggle_nb.setToolTip( _("Toggle Panel") ) @@ -139,6 +140,26 @@ class FlatCAMGUI(QtWidgets.QMainWindow): self.recent = self.menufile.addMenu( QtGui.QIcon(self.app.resource_location + '/recent_files.png'), _("Recent files")) + # SAVE category + self.menufile_save = self.menufile.addMenu(QtGui.QIcon(self.app.resource_location + '/save_as.png'), _('Save')) + + # Save Project + self.menufilesaveproject = QtWidgets.QAction( + QtGui.QIcon(self.app.resource_location + '/floppy16.png'), _('&Save Project ...\tCtrl+S'), self) + self.menufile_save.addAction(self.menufilesaveproject) + + # Save Project As ... + self.menufilesaveprojectas = QtWidgets.QAction( + QtGui.QIcon(self.app.resource_location + '/floppy16.png'), _('Save Project &As ...\tCtrl+Shift+S'), self) + self.menufile_save.addAction(self.menufilesaveprojectas) + + # Save Project Copy ... + # self.menufilesaveprojectcopy = QtWidgets.QAction( + # QtGui.QIcon(self.app.resource_location + '/floppy16.png'), _('Save Project C&opy ...'), self) + # self.menufile_save.addAction(self.menufilesaveprojectcopy) + + self.menufile_save.addSeparator() + # Separator self.menufile.addSeparator() @@ -265,25 +286,6 @@ class FlatCAMGUI(QtWidgets.QMainWindow): QtGui.QIcon(self.app.resource_location + '/printer32.png'), '%s\tCtrl+P' % _('Print (PDF)')) self.menufile.addAction(self.menufile_print) - self.menufile_save = self.menufile.addMenu(QtGui.QIcon(self.app.resource_location + '/save_as.png'), _('Save')) - - # Save Project - self.menufilesaveproject = QtWidgets.QAction( - QtGui.QIcon(self.app.resource_location + '/floppy16.png'), _('&Save Project ...'), self) - self.menufile_save.addAction(self.menufilesaveproject) - - # Save Project As ... - self.menufilesaveprojectas = QtWidgets.QAction( - QtGui.QIcon(self.app.resource_location + '/save_as.png'), _('Save Project &As ...\tCtrl+S'), self) - self.menufile_save.addAction(self.menufilesaveprojectas) - - # Save Project Copy ... - self.menufilesaveprojectcopy = QtWidgets.QAction( - QtGui.QIcon(self.app.resource_location + '/floppy16.png'), _('Save Project C&opy ...'), self) - self.menufile_save.addAction(self.menufilesaveprojectcopy) - - self.menufile_save.addSeparator() - # Separator self.menufile.addSeparator() @@ -541,7 +543,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow): QtGui.QIcon(self.app.resource_location + '/text32.png'), _('Add Text\tT')) self.geo_editor_menu.addSeparator() self.geo_union_menuitem = self.geo_editor_menu.addAction( - QtGui.QIcon(self.app.resource_location + '/union16.png'),_('Polygon Union\tU')) + QtGui.QIcon(self.app.resource_location + '/union16.png'), _('Polygon Union\tU')) self.geo_intersection_menuitem = self.geo_editor_menu.addAction( QtGui.QIcon(self.app.resource_location + '/intersection16.png'), _('Polygon Intersection\tE')) self.geo_subtract_menuitem = self.geo_editor_menu.addAction( @@ -550,7 +552,8 @@ class FlatCAMGUI(QtWidgets.QMainWindow): self.geo_editor_menu.addSeparator() self.geo_cutpath_menuitem = self.geo_editor_menu.addAction( QtGui.QIcon(self.app.resource_location + '/cutpath16.png'), _('Cut Path\tX')) - # self.move_menuitem = self.menu.addAction(QtGui.QIcon(self.app.resource_location + '/move16.png'), "Move Objects 'm'") + # self.move_menuitem = self.menu.addAction( + # QtGui.QIcon(self.app.resource_location + '/move16.png'), "Move Objects 'm'") self.geo_copy_menuitem = self.geo_editor_menu.addAction( QtGui.QIcon(self.app.resource_location + '/copy16.png'), _("Copy Geom\tC")) self.geo_delete_menuitem = self.geo_editor_menu.addAction( @@ -1640,6 +1643,14 @@ class FlatCAMGUI(QtWidgets.QMainWindow):