Backup options and settings complete

2019-06-26 18:13:02 +02:00
parent fba7987104
commit f11cc452d8
7 changed files with 100 additions and 43 deletions
@@ -202,20 +202,20 @@ class GuiConfigEditGeneral(QWidget):
        else:
            self.projBackupClose.setCheckState(Qt.Unchecked)

-        self.projBackupTime = QSpinBox(self)
-        self.projBackupTime.setMinimum(0)
-        self.projBackupTime.setMaximum(1440)
-        self.projBackupTime.setSingleStep(10)
-        self.projBackupTime.setValue(self.mainConf.minBackupTime)
+        self.projBackupAsk = QCheckBox(self)
+        self.projBackupAsk.setToolTip("Ask before backup.")
+        if self.mainConf.askBeforeBackup:
+            self.projBackupAsk.setCheckState(Qt.Checked)
+        else:
+            self.projBackupAsk.setCheckState(Qt.Unchecked)

-        self.projBackupForm.addWidget(QLabel("Backup Folder"),0, 0)
-        self.projBackupForm.addWidget(self.projBackupPath,    0, 1, 1, 4)
-        self.projBackupForm.addWidget(self.projBackupGetPath, 0, 5)
-        self.projBackupForm.addWidget(QLabel("Run on Close"), 1, 0)
-        self.projBackupForm.addWidget(self.projBackupClose,   1, 1)
-        self.projBackupForm.addWidget(QLabel("At Most Every"),1, 2)
-        self.projBackupForm.addWidget(self.projBackupTime,    1, 3)
-        self.projBackupForm.addWidget(QLabel("minutes"),      1, 4, 1, 2)
+        self.projBackupForm.addWidget(QLabel("Backup Folder"),     0, 0)
+        self.projBackupForm.addWidget(self.projBackupPath,         0, 1, 1, 3)
+        self.projBackupForm.addWidget(self.projBackupGetPath,      0, 4)
+        self.projBackupForm.addWidget(QLabel("Run on Close"),      1, 0)
+        self.projBackupForm.addWidget(self.projBackupClose,        1, 1)
+        self.projBackupForm.addWidget(QLabel("Ask Before Backuo"), 1, 2)
+        self.projBackupForm.addWidget(self.projBackupAsk,          1, 3)

        # Assemble
        self.outerBox.addWidget(self.guiLook,    0, 0)
@@ -233,26 +233,26 @@ class GuiConfigEditGeneral(QWidget):
        validEntries = True
        needsRestart = False

-        guiTheme      = self.guiLookTheme.currentData()
-        guiSyntax     = self.guiLookSyntax.currentData()
-        spellLanguage = self.spellLangList.currentData()
-        autoSaveDoc   = self.autoSaveDoc.value()
-        autoSaveProj  = self.autoSaveProj.value()
-        backupPath    = self.projBackupPath.text()
-        backupOnClose = self.projBackupClose.isChecked()
-        minBackupTime = self.projBackupTime.value()
+        guiTheme        = self.guiLookTheme.currentData()
+        guiSyntax       = self.guiLookSyntax.currentData()
+        spellLanguage   = self.spellLangList.currentData()
+        autoSaveDoc     = self.autoSaveDoc.value()
+        autoSaveProj    = self.autoSaveProj.value()
+        backupPath      = self.projBackupPath.text()
+        backupOnClose   = self.projBackupClose.isChecked()
+        askBeforeBackup = self.projBackupAsk.isChecked()

        # Check if restart is needed
        needsRestart |= self.mainConf.guiTheme != guiTheme

-        self.mainConf.guiTheme      = guiTheme
-        self.mainConf.guiSyntax     = guiSyntax
-        self.mainConf.spellLanguage = spellLanguage
-        self.mainConf.autoSaveDoc   = autoSaveDoc
-        self.mainConf.autoSaveProj  = autoSaveProj
-        self.mainConf.backupPath    = backupPath
-        self.mainConf.backupOnClose = backupOnClose
-        self.mainConf.minBackupTime = minBackupTime
+        self.mainConf.guiTheme        = guiTheme
+        self.mainConf.guiSyntax       = guiSyntax
+        self.mainConf.spellLanguage   = spellLanguage
+        self.mainConf.autoSaveDoc     = autoSaveDoc
+        self.mainConf.autoSaveProj    = autoSaveProj
+        self.mainConf.backupPath      = backupPath
+        self.mainConf.backupOnClose   = backupOnClose
+        self.mainConf.askBeforeBackup = askBeforeBackup

        self.mainConf.confChanged   = True

@@ -507,6 +507,12 @@ class GuiMainMenu(QMenuBar):
        menuItem.triggered.connect(self.theParent.rebuildIndex)
        self.toolsMenu.addAction(menuItem)

+        # Tools > Backup
+        menuItem = QAction(QIcon.fromTheme("drive-harddisk"), "Backup Project", self)
+        menuItem.setStatusTip("Backup Project")
+        menuItem.triggered.connect(self.theParent.backupProject)
+        self.toolsMenu.addAction(menuItem)
+
        # Tools > Settings
        menuItem = QAction(QIcon.fromTheme("preferences-system"), "Preferences", self)
        menuItem.setStatusTip("Preferences")
@@ -21,7 +21,7 @@ from PyQt5.QtSvg     import QSvgWidget
 from PyQt5.QtWidgets import (
    QDialog, QHBoxLayout, QVBoxLayout, QFormLayout, QLineEdit, QPlainTextEdit, QLabel,
    QWidget, QTabWidget, QDialogButtonBox, QListWidget, QListWidgetItem, QPushButton,
-    QColorDialog, QAbstractItemView, QTreeWidget, QTreeWidgetItem
+    QColorDialog, QAbstractItemView, QTreeWidget, QTreeWidgetItem, QCheckBox
 )
 from nw.enum import nwAlert

@@ -81,9 +81,11 @@ class GuiProjectEditor(QDialog):
        projName    = self.tabMain.editName.text()
        bookTitle   = self.tabMain.editTitle.text()
        bookAuthors = self.tabMain.editAuthors.toPlainText()
+        doBackup    = self.tabMain.doBackup.isChecked()
        self.theProject.setProjectName(projName)
        self.theProject.setBookTitle(bookTitle)
        self.theProject.setBookAuthors(bookAuthors)
+        self.theProject.setProjBackup(doBackup)

        if self.tabStatus.colChanged:
            statusCol = self.tabStatus.getNewList()
@@ -116,13 +118,19 @@ class GuiProjectEditMain(QWidget):
        self.theParent   = theParent
        self.theProject  = theProject
        self.mainForm    = QFormLayout()
+        self.backupBox   = QHBoxLayout()
        self.editName    = QLineEdit()
        self.editTitle   = QLineEdit()
        self.editAuthors = QPlainTextEdit()
+        self.doBackup    = QCheckBox(self)

-        self.mainForm.addRow("Working Title", self.editName)
-        self.mainForm.addRow("Book Title",    self.editTitle)
-        self.mainForm.addRow("Book Authors",  self.editAuthors)
+        self.mainForm.addRow("Working Title",  self.editName)
+        self.mainForm.addRow("Book Title",     self.editTitle)
+        self.mainForm.addRow("Book Authors",   self.editAuthors)
+        self.mainForm.addRow(self.backupBox)
+        self.backupBox.addStretch(1)
+        self.backupBox.addWidget(QLabel("Backup on Close"))
+        self.backupBox.addWidget(self.doBackup)

        self.editName.setText(self.theProject.projName)
        self.editTitle.setText(self.theProject.bookTitle)
@@ -130,8 +138,13 @@ class GuiProjectEditMain(QWidget):
        for bookAuthor in self.theProject.bookAuthors:
            bookAuthors += bookAuthor+"\n"
        self.editAuthors.setPlainText(bookAuthors)
+        if self.theProject.doBackup:
+            self.doBackup.setCheckState(Qt.Checked)
+        else:
+            self.doBackup.setCheckState(Qt.Unchecked)

        self.setLayout(self.mainForm)
+        self.editAuthors.setMaximumHeight(120)

        return

@@ -207,15 +207,28 @@ class GuiMain(QMainWindow):
            if msgRes != QMessageBox.Yes:
                return False

-        self.closeDocument()
+        if self.docEditor.docChanged:
+            self.saveDocument()
+
        if self.theProject.projChanged:
-            saveOK = self.saveProject()
-            theBackup = NWBackup(self, self.theProject)
-            theBackup.zipIt()
+            saveOK   = self.saveProject()
+            doBackup = False
+            if self.theProject.doBackup and self.mainConf.backupOnClose:
+                doBackup = True
+                if self.mainConf.showGUI and self.mainConf.askBeforeBackup:
+                    msgBox = QMessageBox()
+                    msgRes = msgBox.question(
+                        self, "Backup Project", "Backup current project?"
+                    )
+                    if msgRes != QMessageBox.Yes:
+                        doBackup = False
+            if doBackup:
+                self.backupProject()
        else:
            saveOK = True

        if saveOK:
+            self.closeDocument()
            self.theProject.closeProject()
            self.theIndex.clearIndex()
            self.clearGUI()
@@ -282,6 +295,11 @@ class GuiMain(QMainWindow):

        return True

+    def backupProject(self):
+        theBackup = NWBackup(self, self.theProject)
+        theBackup.zipIt()
+        return True
+
    ##
    #  Document Actions
    ##