Add the option to expand ~ to user home directory in export and project path
This commit is contained in:
@@ -122,6 +122,15 @@ class GuiExport(QDialog):
|
|||||||
pFormat = self.tabPandoc.outputFormat.currentData()
|
pFormat = self.tabPandoc.outputFormat.currentData()
|
||||||
tFormat = GuiExportPandoc.FMT_VIA[pFormat]
|
tFormat = GuiExportPandoc.FMT_VIA[pFormat]
|
||||||
|
|
||||||
|
if saveTo.startswith("~"):
|
||||||
|
saveTo = path.expanduser(saveTo)
|
||||||
|
|
||||||
|
exportDir = path.dirname(saveTo)
|
||||||
|
if not path.isdir(exportDir):
|
||||||
|
self.theParent.makeAlert("The export folder does not exist.",nwAlert.ERROR)
|
||||||
|
self.exportStatus.setText("Export failed ...")
|
||||||
|
return False
|
||||||
|
|
||||||
nItems = len(self.theProject.treeOrder)
|
nItems = len(self.theProject.treeOrder)
|
||||||
if eFormat == GuiExportMain.FMT_PDOC:
|
if eFormat == GuiExportMain.FMT_PDOC:
|
||||||
nItems += int(0.2*nItems)
|
nItems += int(0.2*nItems)
|
||||||
@@ -288,6 +297,9 @@ class GuiExport(QDialog):
|
|||||||
hScene = self.tabMain.hideScene.isChecked()
|
hScene = self.tabMain.hideScene.isChecked()
|
||||||
hSection = self.tabMain.hideSection.isChecked()
|
hSection = self.tabMain.hideSection.isChecked()
|
||||||
|
|
||||||
|
if saveTo.startswith("~"):
|
||||||
|
saveTo = path.expanduser(saveTo)
|
||||||
|
|
||||||
self.optState.setSetting("wNovel", wNovel)
|
self.optState.setSetting("wNovel", wNovel)
|
||||||
self.optState.setSetting("wNotes", wNotes)
|
self.optState.setSetting("wNotes", wNotes)
|
||||||
self.optState.setSetting("eFormat", eFormat)
|
self.optState.setSetting("eFormat", eFormat)
|
||||||
@@ -563,6 +575,8 @@ class GuiExportMain(QWidget):
|
|||||||
|
|
||||||
def _checkFileExtension(self):
|
def _checkFileExtension(self):
|
||||||
saveTo = self.exportPath.text()
|
saveTo = self.exportPath.text()
|
||||||
|
if saveTo.startswith("~"):
|
||||||
|
saveTo = path.expanduser(saveTo)
|
||||||
fileBits = path.splitext(saveTo)
|
fileBits = path.splitext(saveTo)
|
||||||
if self.currFormat > 0 and fileBits[0].strip() != "":
|
if self.currFormat > 0 and fileBits[0].strip() != "":
|
||||||
saveTo = fileBits[0]+self.FMT_EXT[self.currFormat]
|
saveTo = fileBits[0]+self.FMT_EXT[self.currFormat]
|
||||||
|
|||||||
@@ -358,6 +358,8 @@ class NWProject():
|
|||||||
if projPath is None or projPath == "":
|
if projPath is None or projPath == "":
|
||||||
self.projPath = None
|
self.projPath = None
|
||||||
else:
|
else:
|
||||||
|
if projPath.startswith("~"):
|
||||||
|
projPath = path.expanduser(projPath)
|
||||||
self.projPath = projPath
|
self.projPath = projPath
|
||||||
self.setProjectChanged(True)
|
self.setProjectChanged(True)
|
||||||
return True
|
return True
|
||||||
|
|||||||
Reference in New Issue
Block a user