diff --git a/nw/gui/doceditor.py b/nw/gui/doceditor.py index b7e01d2d..85d9802d 100644 --- a/nw/gui/doceditor.py +++ b/nw/gui/doceditor.py @@ -58,7 +58,7 @@ class GuiDocEditor(QWidget): # self.guiEditor.setCurrentFont(self.docFont) # self.guiEditor.setContentsMargins(20,20,20,20) self.guiEditor.setStyleSheet( - "QTextEdit {background-color: #f0f0f0;};" + "QTextEdit {background-color: #ffffff;};" ) theDoc = self.guiEditor.document() theDoc.setDefaultFont(QFont("Source Sans Pro",13)) @@ -84,11 +84,11 @@ class GuiDocEditor(QWidget): return def setText(self, docHtml): - self.guiEditor.setHtml(docHtml) + self.guiEditor.setPlainText(docHtml) return True def getText(self): - theText = self.guiEditor.toHtml() + theText = self.guiEditor.toPlainText() return theText def _buildTabToolBar(self): diff --git a/nw/gui/winmain.py b/nw/gui/winmain.py index 13522be4..7e52e0fa 100644 --- a/nw/gui/winmain.py +++ b/nw/gui/winmain.py @@ -92,7 +92,8 @@ class GuiMain(QMainWindow): dlgOpt = QFileDialog.Options() dlgOpt |= QFileDialog.DontUseNativeDialog projPath, _ = QFileDialog.getOpenFileName( - self,"Open novelWriter Project","","novelWriter Project File (nwProject.nwx);;All Files (*)", options=dlgOpt) + self,"Open novelWriter Project","","novelWriter Project File (nwProject.nwx);;All Files (*)", options=dlgOpt + ) if projPath: self.theProject.openProject(projPath) self.treeView.buildTree() @@ -106,7 +107,8 @@ class GuiMain(QMainWindow): dlgOpt = QFileDialog.Options() dlgOpt |= QFileDialog.DontUseNativeDialog projPath, _ = QFileDialog.getSaveFileName( - self,"Save novelWriter Project","","novelWriter Project File (nwProject.nwx);;All Files (*)", options=dlgOpt) + self,"Save novelWriter Project","","novelWriter Project File (nwProject.nwx);;All Files (*)", options=dlgOpt + ) if projPath: self.theProject.setProjectPath(projPath) else: @@ -160,6 +162,7 @@ class GuiMain(QMainWindow): logger.info("Exiting %s" % nw.__package__) self.mainConf.setWinSize(self.width(), self.height()) self.mainConf.setTreeColWidths(self.treeView.getColumnSizes()) + print(self.treePane.width()) self.mainConf.saveConfig() return diff --git a/nw/project/document.py b/nw/project/document.py index 8158ce6b..fa578dd4 100644 --- a/nw/project/document.py +++ b/nw/project/document.py @@ -20,6 +20,8 @@ logger = logging.getLogger(__name__) class NWDoc(): + FILE_MN = "main.md" + def __init__(self, theProject): self.mainConf = nw.CONFIG @@ -30,7 +32,7 @@ class NWDoc(): def openDocument(self, tHandle): self.docHandle = tHandle - docDir, docFile = self._assemblePath("main.htm") + docDir, docFile = self._assemblePath(self.FILE_MN) logger.debug("Opening document %s" % path.join(docDir,docFile)) dataDir = path.join(self.theProject.projPath, docDir) docPath = path.join(dataDir, docFile) @@ -44,21 +46,22 @@ class NWDoc(): def saveDocument(self, docHtml): if self.docHandle is None: return False - docDir, docFile = self._assemblePath("main.htm") + docDir, docFile = self._assemblePath(self.FILE_MN) logger.debug("Saving document %s" % path.join(docDir,docFile)) dataDir = path.join(self.theProject.projPath, docDir) docPath = path.join(dataDir, docFile) if not path.isdir(dataDir): mkdir(dataDir) logger.debug("Created folder %s" % dataDir) - with open(docPath,mode="wb") as outFile: - docData = html.fromstring(docHtml) - outFile.write(html.tostring( - docData, - pretty_print = True, - encoding = "utf-8", - method = "html", - )) + with open(docPath,mode="w") as outFile: + outFile.write(docHtml) + # docData = html.fromstring(docHtml) + # outFile.write(html.tostring( + # docData, + # pretty_print = True, + # encoding = "utf-8", + # method = "html", + # )) return True def _assemblePath(self, docExt): diff --git a/sample/sampleNovel/data_6/36b6aa9b697b_main.htm b/sample/sampleNovel/data_6/36b6aa9b697b_main.htm deleted file mode 100644 index 93c0ecda..00000000 --- a/sample/sampleNovel/data_6/36b6aa9b697b_main.htm +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - -

File with stuff.

- - diff --git a/sample/sampleNovel/data_6/36b6aa9b697b_main.md b/sample/sampleNovel/data_6/36b6aa9b697b_main.md new file mode 100644 index 00000000..87b2fb17 --- /dev/null +++ b/sample/sampleNovel/data_6/36b6aa9b697b_main.md @@ -0,0 +1 @@ +File with stuff. \ No newline at end of file diff --git a/sample/sampleNovel/data_9/6b68994dfa3d_main.htm b/sample/sampleNovel/data_9/6b68994dfa3d_main.htm deleted file mode 100644 index b7c80d63..00000000 --- a/sample/sampleNovel/data_9/6b68994dfa3d_main.htm +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - -

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin vitae nisi augue. Sed elementum lacus risus, eu lobortis ipsum malesuada rutrum. Nam egestas elit id commodo porta. Ut eget lacinia ipsum, non interdum mi. Sed tincidunt commodo metus, at faucibus nisi finibus eget. In malesuada egestas nulla et tempor. Nulla eu sem vel mi sollicitudin cursus. Nullam ultricies ex eu dui scelerisque, ut venenatis turpis ultricies.

-

Nunc in ex molestie, efficitur diam semper, pellentesque eros. Morbi vel lacus quis turpis sagittis iaculis. Sed rhoncus tortor et finibus lobortis. Suspendisse non ultrices odio, at venenatis mi. Sed congue congue tortor, et egestas neque malesuada ac. Nulla facilisi. Maecenas finibus elementum vestibulum. Nam id rhoncus mauris, vel ullamcorper neque.

-

Quisque mattis magna purus, vel ultricies sem feugiat pellentesque. Nam mi nisl, consectetur vel facilisis nec, condimentum at libero. Sed dolor lacus, fermentum vel nisi sed, auctor pretium urna. Nulla accumsan arcu ut ligula faucibus, non facilisis mi tempor. Nam consectetur dui dapibus lectus cursus, sed laoreet nisl maximus. Maecenas eleifend sapien eu porttitor placerat. Maecenas quis massa non tortor imperdiet porta. Nunc non tristique magna. Vivamus ornare quam convallis metus vestibulum, id molestie quam pretium. Maecenas tincidunt tincidunt tortor lobortis suscipit. Vivamus tempor dolor quis auctor sollicitudin. Integer imperdiet urna dui, at vehicula dui consequat vitae. Donec aliquet feugiat tellus sed dignissim. Nulla pretium libero ut elit porta sagittis. Praesent commodo vulputate lacinia.

-

Proin cursus augue nec dignissim tincidunt. Nunc tincidunt efficitur sapien, ac dictum ligula varius eu. In pretium tristique volutpat. Aenean efficitur enim ut eros finibus, nec gravida neque vestibulum. Interdum et malesuada fames ac ante ipsum primis in faucibus. Etiam fermentum sit amet libero vel placerat. Nunc in nunc vulputate, elementum nisl vitae, dignissim leo. Nunc felis augue, dapibus sit amet orci et, fermentum posuere velit. Curabitur eros purus, pretium ac magna non, tempor gravida justo. Vivamus in ipsum magna.

-

Sed quis felis ante. Sed rhoncus turpis risus, ac malesuada velit dictum eget. Curabitur malesuada justo a augue lacinia dictum. Cras hendrerit lorem turpis, et ultrices lectus fermentum at. Quisque volutpat dignissim felis id commodo. Mauris convallis arcu id tempor tincidunt. Cras porttitor ut erat non bibendum. Cras non velit ac libero tincidunt suscipit. Aliquam at neque lacus.

- - diff --git a/sample/sampleNovel/data_9/6b68994dfa3d_main.md b/sample/sampleNovel/data_9/6b68994dfa3d_main.md new file mode 100644 index 00000000..69a1d161 --- /dev/null +++ b/sample/sampleNovel/data_9/6b68994dfa3d_main.md @@ -0,0 +1,11 @@ +# Lorem Ipsum + +**Lorem** ipsum dolor sit amet, consectetur adipiscing elit. Proin vitae nisi augue. Sed elementum lacus risus, eu lobortis ipsum malesuada rutrum. Nam egestas elit id commodo porta. Ut eget lacinia ipsum, non interdum mi. Sed tincidunt commodo metus, at faucibus nisi finibus eget. In malesuada egestas nulla et tempor. Nulla eu sem vel mi sollicitudin cursus. Nullam ultricies ex eu dui scelerisque, ut venenatis turpis ultricies. + +Nunc in ex molestie, efficitur diam semper, pellentesque eros. Morbi vel lacus quis turpis sagittis iaculis. Sed rhoncus tortor et finibus lobortis. Suspendisse non ultrices odio, at venenatis mi. Sed congue congue tortor, et egestas neque malesuada ac. Nulla facilisi. Maecenas finibus elementum vestibulum. Nam id rhoncus mauris, vel ullamcorper neque. + +Quisque mattis magna purus, vel ultricies sem feugiat pellentesque. Nam mi nisl, consectetur vel facilisis nec, condimentum at libero. Sed dolor lacus, fermentum vel nisi sed, auctor pretium urna. Nulla accumsan arcu ut ligula faucibus, non facilisis mi tempor. Nam consectetur dui dapibus lectus cursus, sed laoreet nisl maximus. Maecenas eleifend sapien eu porttitor placerat. Maecenas quis massa non tortor imperdiet porta. Nunc non tristique magna. Vivamus ornare quam convallis metus vestibulum, id molestie quam pretium. Maecenas tincidunt tincidunt tortor lobortis suscipit. Vivamus tempor dolor quis auctor sollicitudin. Integer imperdiet urna dui, at vehicula dui consequat vitae. Donec aliquet feugiat tellus sed dignissim. Nulla pretium libero ut elit porta sagittis. Praesent commodo vulputate lacinia. + +Proin cursus augue nec dignissim tincidunt. Nunc tincidunt efficitur sapien, ac dictum ligula varius eu. In pretium tristique volutpat. Aenean efficitur enim ut eros finibus, nec gravida neque vestibulum. Interdum et malesuada fames ac ante ipsum primis in faucibus. Etiam fermentum sit amet libero vel placerat. Nunc in nunc vulputate, elementum nisl vitae, dignissim leo. Nunc felis augue, dapibus sit amet orci et, fermentum posuere velit. Curabitur eros purus, pretium ac magna non, tempor gravida justo. Vivamus in ipsum magna. + +Sed quis felis ante. Sed rhoncus turpis risus, ac malesuada velit dictum eget. Curabitur malesuada justo a augue lacinia dictum. Cras hendrerit lorem turpis, et ultrices lectus fermentum at. Quisque volutpat dignissim felis id commodo. Mauris convallis arcu id tempor tincidunt. Cras porttitor ut erat non bibendum. Cras non velit ac libero tincidunt suscipit. Aliquam at neque lacus. \ No newline at end of file