← Back to branch summary

~tigefa/retext/retext

« back to all changes in this revision

Viewing changes to ReText/window.py

  • Committer: Dmitry Shachnev
  • Date: 2014-02-19 14:55:49 UTC
  • Revision ID: git-v1:c6d7854562eb61c9fbb6793c9a7ac301850259aa
Drop the WebKit hack in favour of setting base QUrl

Thanks Kovid Goyal.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ReText/window.py
733
733
                                html = self.getHtml(styleForWebKit=(not textedit))
734
734
                        except Exception:
735
735
                                return self.printError()
736
 
                        if not textedit and ('<script ' in html):
737
 
                                # Work-around a bug in QtWebKit
738
 
                                # by saving the html locally
739
 
                                tempFile = QTemporaryFile('retext-XXXXXX.html')
740
 
                                tempFile.setAutoRemove(False)
741
 
                                tempFile.open(QIODevice.WriteOnly)
742
 
                                stream = QTextStream(tempFile)
743
 
                                stream << html
744
 
                                tempFile.close()
745
 
                                def callback(tempFile):
746
 
                                        tempFile.remove()
747
 
                                        frame.setScrollPosition(scrollpos)
748
 
                                        frame.contentsSizeChanged.disconnect()
749
 
                                onSizeChanged = lambda size: callback(tempFile)
750
 
                                frame.contentsSizeChanged.connect(onSizeChanged)
751
 
                                pb.load(QUrl.fromLocalFile(tempFile.fileName()))
752
 
                        else:
 
736
                        if textedit:
753
737
                                pb.setHtml(html)
 
738
                        else:
 
739
                                pb.setHtml(html, QUrl.fromLocalFile(QDir.currentPath()))
754
740
                if self.font and textedit:
755
741
                        pb.document().setDefaultFont(self.font)
756
742
                if textedit: