|
@@ -11,6 +11,11 @@ from PyQt5.QtWebKit import QWebSettings
|
|
from PyQt5.QtWebKitWidgets import QWebView, QWebInspector
|
|
from PyQt5.QtWebKitWidgets import QWebView, QWebInspector
|
|
from PyQt5.QtPrintSupport import QPrintPreviewDialog, QPrinter
|
|
from PyQt5.QtPrintSupport import QPrintPreviewDialog, QPrinter
|
|
|
|
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+from classes import highlighter
|
|
|
|
+
|
|
|
|
|
|
class WebkitView(QWebView):
|
|
class WebkitView(QWebView):
|
|
def __init__(self, parent, core):
|
|
def __init__(self, parent, core):
|
|
@@ -170,12 +175,14 @@ class WebViewToolBar(QWidget):
|
|
|
|
|
|
|
|
|
|
class CodeEditor(QPlainTextEdit):
|
|
class CodeEditor(QPlainTextEdit):
|
|
- def __init__(self, core, tabs, file=None):
|
|
+ def __init__(self, core, tabs, file, mode):
|
|
super(CodeEditor, self).__init__()
|
|
super(CodeEditor, self).__init__()
|
|
self.core = core
|
|
self.core = core
|
|
self.tabs = tabs
|
|
self.tabs = tabs
|
|
self.file = file
|
|
self.file = file
|
|
self.setText()
|
|
self.setText()
|
|
|
|
+ self.setTabStopWidth(15)
|
|
|
|
+ self.hl= highlighter.Highlighter(self.document(),mode)
|
|
|
|
|
|
self.shortcut = QShortcut(QKeySequence("Ctrl+s"), self)
|
|
self.shortcut = QShortcut(QKeySequence("Ctrl+s"), self)
|
|
self.shortcut.activated.connect(self.save)
|
|
self.shortcut.activated.connect(self.save)
|
|
@@ -233,8 +240,8 @@ class Editor(QWidget):
|
|
|
|
|
|
self.tabs = QTabWidget()
|
|
self.tabs = QTabWidget()
|
|
|
|
|
|
- self.scsstab = CodeEditor(core, self.tabs, 'assets/css/styles.scss')
|
|
+ self.scsstab = CodeEditor(core, self.tabs, 'assets/css/styles.scss', "scss")
|
|
- self.jstab = CodeEditor(core, self.tabs, 'assets/js/script.js')
|
|
+ self.jstab = CodeEditor(core, self.tabs, 'assets/js/script.js', 'js')
|
|
|
|
|
|
|
|
|
|
self.tabs.addTab(self.scsstab,"scss")
|
|
self.tabs.addTab(self.scsstab,"scss")
|