From 9e7d81d61b504c0a9ddab5bf83344ddc24f706a6 Mon Sep 17 00:00:00 2001
From: Marius Stanciu <marius.adrian@gmail.com>
Date: Fri, 16 Aug 2019 18:52:06 +0300
Subject: [PATCH] - 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

---
 FlatCAMApp.py             |   4 ++++
 README.md                 |   1 +
 flatcamGUI/FlatCAMGUI.py  |  17 ++++++++++++++++-
 share/backup24.png        | Bin 0 -> 324 bytes
 share/backup_export24.png | Bin 0 -> 164 bytes
 share/backup_import24.png | Bin 0 -> 168 bytes
 6 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 share/backup24.png
 create mode 100644 share/backup_export24.png
 create mode 100644 share/backup_import24.png

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 0000000000000000000000000000000000000000..22a5d1a22d6753e015d6cd25944746ac5b68173a
GIT binary patch
literal 324
zcmV-K0lWT*P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0003CNkl<ZNQvE*
zy-or_6otPvbQ@~vTpQ?7d;>7ROYsmSNT{Kf!21wcL$nkM0~A{9ow#9VZ)OG(qbHf%
z%-l2Q?47@b|A;>D3VeCC6zIAbqygfltz8TZ*%#J%R{=s^`1=MGB^R;}1^j9Sk*Aim
zV$Hx872w+SOD?khaQ+@7z?kgzA0$4>cqz1};0W9auLEpLcw3+yVlWfVZBBdvw18OR
zQpP`k8_ht&I45p{F&Tv#m>2iHB>y1!mr#R)aN?4DRr34LQ}iye0Sqkpy2LlzWbKF3
z6V6cjD~i=dz#L@{x{AqEI5pst;&L{DXMRpmVl!~T;KbO#^mo8xsJMm=Fd@4q0DJ>V
WV1D%`Y9N&W0000<MNUMnLSTY1F^TB_

literal 0
HcmV?d00001

diff --git a/share/backup_export24.png b/share/backup_export24.png
new file mode 100644
index 0000000000000000000000000000000000000000..173bbd28a122fabde5cb34a8946ba47680f013a2
GIT binary patch
literal 164
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1rX+877l!}s{b%+Ad9j`@jv*GO
zlM@!me@Lr1^g*7z=FEf6l@AU5o+|v{2xj(>5I>-0?qT|%`N~Cuf_ZB9M4Y4wDyJ<8
zkjnCGR^fdinZe4;9k4~lb&XtPv$~`1*CWRQEHh6zE@0$X$iSc~zU<ug<il@)7BP6b
L`njxgN@xNA@jW*5

literal 0
HcmV?d00001

diff --git a/share/backup_import24.png b/share/backup_import24.png
new file mode 100644
index 0000000000000000000000000000000000000000..189f12156f2171da4dd423ea0ba3911abab3ce5a
GIT binary patch
literal 168
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1rX+877l!}s{b%+Ad5NAbjv*GO
zlM@!me@Lr1^g*7z=FEf6l@AU5o+|v{2xj(>5I>-0?qT|%`N~Cu80Sn;X70RTkAS}O
zp1eykGY+H*l=1TJ$UUZZu|fY>pz#H+4e6&pW_~!bxK$;<Zx!2?1XhO7wJUXktlV}2
PEo1O>^>bP0l+XkKB~&_5

literal 0
HcmV?d00001