diff --git a/FlatCAMApp.py b/FlatCAMApp.py index 10284e71..58aa8f99 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -1463,6 +1463,10 @@ class App(QtCore.QObject): self.ui.menufilesaveprojectas.triggered.connect(self.on_file_saveprojectas) 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) + self.ui.menufileimportpref.triggered.connect(self.on_import_preferences) + self.ui.menufile_exit.triggered.connect(self.final_save) self.ui.menueditedit.triggered.connect(lambda: self.object2editor()) diff --git a/README.md b/README.md index e8f66b5c..0762689d 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ CAD program, and create G-Code for Isolation routing. - remade the enable/disable plots functions to work only where it needs to (no sense in disabling a plot already disabled) - made sure that if multi depth is choosed when creating GCode then if the multidepth is more than the depth of cut only one cut is made (to the depth of cut) - each CNCJob object has now it's own text_collection for the annotations which allow the individual enabling and disabling of the annotations +- added new menu category in File -> Backup with two menu entries that duplicate the functions of the export/import preferences buttons from the bottom of the Preferences window 15.08.2019 diff --git a/flatcamGUI/FlatCAMGUI.py b/flatcamGUI/FlatCAMGUI.py index c29ac911..4fd87d13 100644 --- a/flatcamGUI/FlatCAMGUI.py +++ b/flatcamGUI/FlatCAMGUI.py @@ -194,12 +194,27 @@ class FlatCAMGUI(QtWidgets.QMainWindow): self.menufile.addSeparator() # Save Defaults - self.menufilesavedefaults = QtWidgets.QAction(QtGui.QIcon('share/defaults.png'), _('Save &Defaults'), self) + self.menufilesavedefaults = QtWidgets.QAction(QtGui.QIcon('share/defaults.png'), _('Save Preferences'), self) self.menufile.addAction(self.menufilesavedefaults) # Separator self.menufile.addSeparator() + self.menufile_backup = self.menufile.addMenu(QtGui.QIcon('share/backup24.png'), _('Backup')) + + # Import Preferences + self.menufileimportpref = QtWidgets.QAction(QtGui.QIcon('share/backup_import24.png'), + _('Import Preferences from file ...'), self) + self.menufile_backup.addAction(self.menufileimportpref) + + # Export Preferences + self.menufileexportpref = QtWidgets.QAction(QtGui.QIcon('share/backup_export24.png'), + _('Export Preferences to file ...'), self) + self.menufile_backup.addAction(self.menufileexportpref) + + # Separator + self.menufile.addSeparator() + self.menufile_save = self.menufile.addMenu(QtGui.QIcon('share/save_as.png'), _('Save')) # Save Project diff --git a/share/backup24.png b/share/backup24.png new file mode 100644 index 00000000..22a5d1a2 Binary files /dev/null and b/share/backup24.png differ diff --git a/share/backup_export24.png b/share/backup_export24.png new file mode 100644 index 00000000..173bbd28 Binary files /dev/null and b/share/backup_export24.png differ diff --git a/share/backup_import24.png b/share/backup_import24.png new file mode 100644 index 00000000..189f1215 Binary files /dev/null and b/share/backup_import24.png differ