Preview can display images in html relative to project path (temporary solution for #22)

This commit is contained in:
Olivier Keshavjee 2017-05-08 09:10:33 +02:00
parent 80fdb38be8
commit 9a646cb403
3 changed files with 14 additions and 4 deletions

View file

@ -8,6 +8,7 @@ from PyQt5.QtCore import QSettings
from PyQt5.QtWidgets import QWidget
from manuskript.models.outlineModel import outlineItem
from manuskript.functions import mainWindow
class basicExporter:
@ -128,4 +129,8 @@ class basicFormat:
@classmethod
def isValid(cls):
return True
@classmethod
def projectPath(cls):
return os.path.dirname(os.path.abspath(mainWindow().currentProject))

View file

@ -1,11 +1,12 @@
#!/usr/bin/env python
# --!-- coding: utf8 --!--
from PyQt5.QtCore import Qt
from PyQt5.QtCore import Qt, QUrl
from PyQt5.QtWebKitWidgets import QWebView
from PyQt5.QtWidgets import QPlainTextEdit, qApp, QTabWidget, QFrame
from manuskript.exporter.manuskript.markdown import markdown, markdownSettings
from manuskript.ui.exporters.manuskript.plainTextSettings import exporterSettings
import os
try:
import markdown as MD
@ -69,13 +70,14 @@ class HTML(markdown):
md = markdown.output(self, settingsWidget)
html = MD.markdown(md)
path = os.path.join(self.projectPath(), "dummy.html")
self.preparesTextEditView(previewWidget.widget(0), settings["Preview"]["PreviewFont"])
self.preparesTextEditViewMarkdown(previewWidget.widget(0), settings)
previewWidget.widget(0).setPlainText(md)
self.preparesTextEditView(previewWidget.widget(1), settings["Preview"]["PreviewFont"])
previewWidget.widget(1).setPlainText(html)
previewWidget.widget(2).setHtml(html)
previewWidget.widget(2).setHtml(html, QUrl.fromLocalFile(path))

View file

@ -1,9 +1,11 @@
#!/usr/bin/env python
# --!-- coding: utf8 --!--
from PyQt5.QtWidgets import qApp
from PyQt5.QtCore import QUrl
from manuskript.exporter.manuskript import HTML as MskHTML
from manuskript.exporter.pandoc.abstractPlainText import abstractPlainText
import os
class HTML(abstractPlainText):
@ -31,10 +33,11 @@ class HTML(abstractPlainText):
src = self.src(settingsWidget)
html = self.output(settingsWidget)
path = os.path.join(self.projectPath(), "dummy.html")
self.preparesTextEditView(previewWidget.widget(0), settings["Preview"]["PreviewFont"])
self.preparesTextEditViewMarkdown(previewWidget.widget(0), settings)
previewWidget.widget(0).setPlainText(src)
self.preparesTextEditView(previewWidget.widget(1), settings["Preview"]["PreviewFont"])
previewWidget.widget(1).setPlainText(html)
previewWidget.widget(2).setHtml(html)
previewWidget.widget(2).setHtml(html, QUrl.fromLocalFile(path))