Export icon and a few GUI changes

nw/graphics/export.svg

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="18"
+   id="Layer_1"
+   version="1.2"
+   viewBox="0 0 19 18"
+   width="19"
+   xml:space="preserve"
+   sodipodi:docname="export.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
+     id="metadata874"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs872" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1080"
+     id="namedview870"
+     showgrid="false"
+     inkscape:zoom="33.875"
+     inkscape:cx="12.118081"
+     inkscape:cy="12"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><path
+     d="M 18.711,6.796 C 18.67,6.755 14.656,2.7 12.729,0.65 12.309,0.236 11.73,0 11.143,0 9.961,0 9,0.896 9,2 H 1 C 0.447,2 0,2.448 0,3 v 14 c 0,0.552 0.447,1 1,1 h 14 c 0.553,0 1,-0.448 1,-1 v -6.045 c 1.434,-1.461 2.688,-2.729 2.711,-2.751 0.387,-0.39 0.387,-1.018 0,-1.408 z m -7.432,6.145 C 11.257,12.968 11.214,13 11.143,13 11.069,13 11.022,12.977 10.999,12.96 V 10 9 h -1 C 8.228,9.034 6.663,9.68 5.246,10.958 5.676,8.743 6.846,6 9.999,6 h 1 V 2.042 C 11.027,2.021 11.07,2 11.143,2 c 0.09,0 0.152,0.05 0.154,0.05 1.436,1.525 4.051,4.187 5.297,5.45 -0.253,0.257 -4.342,4.422 -5.315,5.441 z M 2,16 V 4 h 8 c 0,0.348 0,0.695 0,1 C 5.34,5 4,9.871 4,13.5 V 14 c 1.691,-2.578 3.6,-3.953 6,-4 0,1.045 0,2.838 0,3 0,0.551 0.512,1 1.143,1 0.364,0 0.676,-0.158 0.883,-0.391 0.539,-0.565 1.242,-1.291 1.976,-2.043 V 16 Z"
+     id="path867"
+     style="fill:#000000;fill-opacity:0.35408559"
+     inkscape:connector-curvature="0" /></svg>

nw/graphics/export.txt

@@ -0,0 +1,3 @@
+FROM ICON SET: Typicons
+LICENSE: Creative Commons (Attribution-Share Alike 3.0 Unported)
+https://creativecommons.org/licenses/by-sa/3.0/

nw/gui/export.py

@@ -50,7 +50,7 @@ class GuiExport(QDialog):
         self.setWindowTitle("Export Project")
         self.setLayout(self.outerBox)
 
-        self.gradPath = path.abspath(path.join(self.mainConf.appPath,"graphics","gear.svg"))
+        self.gradPath = path.abspath(path.join(self.mainConf.appPath,"graphics","export.svg"))
         self.svgGradient = QSvgWidget(self.gradPath)
         self.svgGradient.setFixedSize(QSize(64,64))
 
@@ -162,7 +162,9 @@ class GuiExport(QDialog):
         eFormat   = self.tabMain.outputFormat.currentData()
         wComments = self.tabMain.outputComments.isChecked()
         chFormat  = self.tabMain.chapterFormat.text()
+        unFormat  = self.tabMain.unnumFormat.text()
         scFormat  = self.tabMain.sceneFormat.text()
+        seFormat  = self.tabMain.sectionFormat.text()
         saveTo    = self.tabMain.exportPath.text()
 
         self.optState.setSetting("wNovel",   wNovel)
@@ -171,7 +173,9 @@ class GuiExport(QDialog):
         self.optState.setSetting("eFormat",  eFormat)
         self.optState.setSetting("wComments",wComments)
         self.optState.setSetting("chFormat", chFormat)
+        self.optState.setSetting("unFormat", unFormat)
         self.optState.setSetting("scFormat", scFormat)
+        self.optState.setSetting("seFormat", seFormat)
         self.optState.setSetting("saveTo",   saveTo)
 
         self.optState.saveSettings()
@@ -248,17 +252,24 @@ class GuiExportMain(QWidget):
         self.guiFilesForm.addWidget(self.expTOC,           2, 1)
 
         # Chapter Settings
-        self.guiChapters     = QGroupBox("Chapter Heading", self)
+        self.guiChapters     = QGroupBox("Chapter Headings", self)
         self.guiChaptersForm = QGridLayout(self)
         self.guiChapters.setLayout(self.guiChaptersForm)
 
         self.chapterFormat = QLineEdit()
         self.chapterFormat.setText(self.optState.getSetting("chFormat"))
-        self.chapterFormat.setToolTip("Available formats: %num%, %numword%, %title%, %label%")
+        self.chapterFormat.setToolTip("Available formats: %num%, %numword%, %title%")
         self.chapterFormat.setMinimumWidth(250)
 
-        self.guiChaptersForm.addWidget(QLabel("Numbered"), 0, 0)
+        self.unnumFormat = QLineEdit()
-        self.guiChaptersForm.addWidget(self.chapterFormat, 0, 1)
+        self.unnumFormat.setText(self.optState.getSetting("unFormat"))
+        self.unnumFormat.setToolTip("Available formats: %title%")
+        self.unnumFormat.setMinimumWidth(250)
+
+        self.guiChaptersForm.addWidget(QLabel("Numbered"),   0, 0)
+        self.guiChaptersForm.addWidget(self.chapterFormat,   0, 1)
+        self.guiChaptersForm.addWidget(QLabel("Unnumbered"), 1, 0)
+        self.guiChaptersForm.addWidget(self.unnumFormat,     1, 1)
 
         # Output Format
         self.guiOutput     = QGroupBox("Output", self)
@@ -293,8 +304,8 @@ class GuiExportMain(QWidget):
         self.guiOutputForm.addWidget(self.outputHelp,         1, 0, 1, 3)
         self.guiOutputForm.setColumnStretch(2, 1)
 
-        # Scene Settings
+        # Scene and Section Settings
-        self.guiScenes     = QGroupBox("Scenes", self)
+        self.guiScenes     = QGroupBox("Other Headings", self)
         self.guiScenesForm = QGridLayout(self)
         self.guiScenes.setLayout(self.guiScenesForm)
 
@@ -303,11 +314,18 @@ class GuiExportMain(QWidget):
         self.sceneFormat.setToolTip("Available formats: %title%")
         self.sceneFormat.setMinimumWidth(100)
 
-        self.guiScenesForm.addWidget(QLabel("Format"), 0, 0)
+        self.sectionFormat = QLineEdit()
-        self.guiScenesForm.addWidget(self.sceneFormat, 0, 1)
+        self.sectionFormat.setText(self.optState.getSetting("seFormat"))
+        self.sectionFormat.setToolTip("Available formats: %title%")
+        self.sectionFormat.setMinimumWidth(100)
+
+        self.guiScenesForm.addWidget(QLabel("Scenes"),   0, 0)
+        self.guiScenesForm.addWidget(self.sceneFormat,   0, 1)
+        self.guiScenesForm.addWidget(QLabel("Sections"), 1, 0)
+        self.guiScenesForm.addWidget(self.sectionFormat, 1, 1)
 
         # Output Path
-        self.exportTo     = QGroupBox("Backup", self)
+        self.exportTo     = QGroupBox("Export Folder", self)
         self.exportToForm = QGridLayout(self)
         self.exportTo.setLayout(self.exportToForm)
 
@@ -392,16 +410,19 @@ class ExportLastState():
 
     def loadSettings(self):
         stateFile = path.join(self.theProject.projMeta, nwFiles.EXPORT_OPT)
+        theState  = {}
         if path.isfile(stateFile):
             logger.debug("Loading export options file")
             try:
                 with open(stateFile,mode="r") as inFile:
                     theJson = inFile.read()
-                self.theState = json.loads(theJson)
+                theState = json.loads(theJson)
             except Exception as e:
                 logger.error("Failed to load export options file")
                 logger.error(str(e))
                 return False
+        for anOpt in theState:
+            self.theState[anOpt] = theState[anOpt]
         return True
 
     def saveSettings(self):