Added config options to file

nw/config.py

@@ -91,9 +91,10 @@ class Config:
 
         # Backup
         self.backupPath      = None
-        self.backupOnClose   = True
+        self.autoBackup      = False
+        self.backupOnClose   = False
+        self.askBeforeBackup = False
         self.minBackupTime   = 0
-        self.askBeforeBackup = True
 
         # Path
         self.recentList = [""]*10
@@ -193,6 +194,10 @@ class Config:
         ## Backup
         cnfSec = "Backup"
         self.backupPath      = self._parseLine(cnfParse, cnfSec, "backuppath",      self.CNF_STR,  self.backupPath)
+        self.autoBackup      = self._parseLine(cnfParse, cnfSec, "autobackup",      self.CNF_BOOL, self.autoBackup)
+        self.backupOnClose   = self._parseLine(cnfParse, cnfSec, "backuponclose",   self.CNF_BOOL, self.backupOnClose)
+        self.askBeforeBackup = self._parseLine(cnfParse, cnfSec, "askbeforebackup", self.CNF_BOOL, self.askBeforeBackup)
+        self.minBackupTime   = self._parseLine(cnfParse, cnfSec, "minbackuptime",   self.CNF_INT,  self.minBackupTime)
 
         ## Path
         cnfSec = "Path"
@@ -254,6 +259,10 @@ class Config:
         cnfSec = "Backup"
         cnfParse.add_section(cnfSec)
         cnfParse.set(cnfSec,"backuppath",     str(self.backupPath))
+        cnfParse.set(cnfSec,"autobackup",     str(self.autoBackup))
+        cnfParse.set(cnfSec,"backuponclose",  str(self.backupOnClose))
+        cnfParse.set(cnfSec,"askbeforebackup",str(self.askBeforeBackup))
+        cnfParse.set(cnfSec,"minbackuptime",  str(self.minBackupTime))
 
         ## Path
         cnfSec = "Path"

nw/gui/winmain.py

@@ -113,7 +113,7 @@ class GuiMain(QMainWindow):
         # Set Main Window Elements
         self.setMenuBar(self.mainMenu)
         self.setStatusBar(self.statusBar)
-        self.statusBar.showMessage("Ready")
+        self.statusBar.setStatus("Ready")
 
         # Set Up Autosaving Project Timer
         self.asProjTimer = QTimer()
@@ -210,7 +210,7 @@ class GuiMain(QMainWindow):
         self.closeDocument()
         if self.theProject.projChanged:
             saveOK = self.saveProject()
-            theBackup = NWBackup(self.theProject)
+            theBackup = NWBackup(self, self.theProject)
             theBackup.zipIt()
         else:
             saveOK = True

nw/project/backup.py

@@ -42,6 +42,7 @@ class NWBackup():
             return False
 
         logger.info("Backing up project")
+        self.theParent.statusBar.setStatus("Backing up project ...")
 
         archName = ""
         for c in self.theProject.projName:
@@ -52,15 +53,13 @@ class NWBackup():
         baseName = path.join(self.mainConf.backupPath, archName)
 
         try:
-            make_archive(
+            make_archive(baseName, "zip", self.theProject.projPath, ".")
-                baseName, "zip", 
-                root_dir = self.theProject.projPath,
-                base_dir = "."
-            )
         except Exception as e:
             self.theParent.makeAlert(["Could not write backup archive.",str(e)],nwAlert.ERROR)
             return False
 
+        self.theParent.statusBar.setStatus("Project backup complete")
+
         return True
 
 # END Class NWBackup