Compare commits
	
		
			11 Commits
		
	
	
		
			feature/sc
			...
			gugutu-mas
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					def0045819 | ||
| 
						 | 
					6acf2d5bb5 | ||
| 
						 | 
					d6034c6dcf | ||
| 
						 | 
					65cc6c0b12 | ||
| 
						 | 
					8487bb86d0 | ||
| 
						 | 
					74d12576cd | ||
| 
						 | 
					deca35908a | ||
| 
						 | 
					2023cea60c | ||
| cefa65eadf | |||
| 
						 | 
					766d246f46 | ||
| 
						
						
							
						
						23f9c0cb68
	
				 | 
					
					
						
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@@ -117,6 +117,7 @@ venv/
 | 
				
			|||||||
ENV/
 | 
					ENV/
 | 
				
			||||||
env.bak/
 | 
					env.bak/
 | 
				
			||||||
venv.bak/
 | 
					venv.bak/
 | 
				
			||||||
 | 
					.idea
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Spyder project settings
 | 
					# Spyder project settings
 | 
				
			||||||
.spyderproject
 | 
					.spyderproject
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,4 +1,5 @@
 | 
				
			|||||||
import json
 | 
					import json
 | 
				
			||||||
 | 
					from typing import Set
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from anki import hooks, buildinfo
 | 
					from anki import hooks, buildinfo
 | 
				
			||||||
from aqt import editor, gui_hooks, mw
 | 
					from aqt import editor, gui_hooks, mw
 | 
				
			||||||
@@ -10,6 +11,7 @@ config = mw.addonManager.getConfig(__name__)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class EditorPreview(object):
 | 
					class EditorPreview(object):
 | 
				
			||||||
 | 
					    editors: Set[editor.Editor] = set()
 | 
				
			||||||
    js = [
 | 
					    js = [
 | 
				
			||||||
        "js/mathjax.js",
 | 
					        "js/mathjax.js",
 | 
				
			||||||
        "js/vendor/mathjax/tex-chtml.js",
 | 
					        "js/vendor/mathjax/tex-chtml.js",
 | 
				
			||||||
@@ -19,7 +21,18 @@ class EditorPreview(object):
 | 
				
			|||||||
    def __init__(self):
 | 
					    def __init__(self):
 | 
				
			||||||
        gui_hooks.editor_did_init.append(self.editor_init_hook)
 | 
					        gui_hooks.editor_did_init.append(self.editor_init_hook)
 | 
				
			||||||
        gui_hooks.editor_did_init_buttons.append(self.editor_init_button_hook)
 | 
					        gui_hooks.editor_did_init_buttons.append(self.editor_init_button_hook)
 | 
				
			||||||
        if int(buildinfo.version.split(".")[2]) < 45:  # < 2.1.45
 | 
					        gui_hooks.editor_did_load_note.append(self.editor_note_hook)
 | 
				
			||||||
 | 
					        gui_hooks.editor_did_fire_typing_timer.append(self.onedit_hook)
 | 
				
			||||||
 | 
					        buildversion = buildinfo.version.split(".")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        # Anki changed their versioning scheme in 2023 to year.month(.patch), causing things to explode here.
 | 
				
			||||||
 | 
					        if int(buildversion[0]) >= 24 or (int(buildversion[0]) == 23 and int(buildversion[1]) == 12 and 2 < len(buildversion) and int(buildversion[2])) >= 1:  # >= 23.12.1
 | 
				
			||||||
 | 
					            self.js = [
 | 
				
			||||||
 | 
					                "js/mathjax.js",
 | 
				
			||||||
 | 
					                "js/vendor/mathjax/tex-chtml-full.js",
 | 
				
			||||||
 | 
					                "js/reviewer.js",
 | 
				
			||||||
 | 
					            ]
 | 
				
			||||||
 | 
					        elif int(buildversion[0]) < 23 and int(buildversion[2]) < 45:  # < 2.1.45
 | 
				
			||||||
            self.js = [
 | 
					            self.js = [
 | 
				
			||||||
                "js/vendor/jquery.min.js",
 | 
					                "js/vendor/jquery.min.js",
 | 
				
			||||||
                "js/vendor/css_browser_selector.min.js",
 | 
					                "js/vendor/css_browser_selector.min.js",
 | 
				
			||||||
@@ -42,34 +55,29 @@ class EditorPreview(object):
 | 
				
			|||||||
            ed.editor_preview.hide()
 | 
					            ed.editor_preview.hide()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        self._inject_splitter(ed)
 | 
					        self._inject_splitter(ed)
 | 
				
			||||||
        gui_hooks.editor_did_fire_typing_timer.append(lambda o: self.onedit_hook(ed, o))
 | 
					 | 
				
			||||||
        gui_hooks.editor_did_load_note.append(
 | 
					 | 
				
			||||||
            lambda o: None if o != ed else self.editor_note_hook(o)
 | 
					 | 
				
			||||||
        )
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _get_splitter(self, editor):
 | 
					    def _get_splitter(self, editor):
 | 
				
			||||||
        layout = editor.outerLayout
 | 
					        mainR, editorR = [int(r) * 10000 for r in config["splitRatio"].split(":")]
 | 
				
			||||||
        mainR, editorR = [int(r) for r in config["splitRatio"].split(":")]
 | 
					 | 
				
			||||||
        location = config["location"]
 | 
					        location = config["location"]
 | 
				
			||||||
        split = QSplitter()
 | 
					        split = QSplitter()
 | 
				
			||||||
        if location == "above":
 | 
					        if location == "above":
 | 
				
			||||||
            split.setOrientation(Qt.Vertical)
 | 
					            split.setOrientation(Qt.Orientation.Vertical)
 | 
				
			||||||
            split.addWidget(editor.editor_preview)
 | 
					            split.addWidget(editor.editor_preview)
 | 
				
			||||||
            split.addWidget(editor.web)
 | 
					            split.addWidget(editor.wrapped_web)
 | 
				
			||||||
            sizes = [editorR, mainR]
 | 
					            sizes = [editorR, mainR]
 | 
				
			||||||
        elif location == "below":
 | 
					        elif location == "below":
 | 
				
			||||||
            split.setOrientation(Qt.Vertical)
 | 
					            split.setOrientation(Qt.Orientation.Vertical)
 | 
				
			||||||
            split.addWidget(editor.web)
 | 
					            split.addWidget(editor.wrapped_web)
 | 
				
			||||||
            split.addWidget(editor.editor_preview)
 | 
					            split.addWidget(editor.editor_preview)
 | 
				
			||||||
            sizes = [mainR, editorR]
 | 
					            sizes = [mainR, editorR]
 | 
				
			||||||
        elif location == "left":
 | 
					        elif location == "left":
 | 
				
			||||||
            split.setOrientation(Qt.Horizontal)
 | 
					            split.setOrientation(Qt.Orientation.Horizontal)
 | 
				
			||||||
            split.addWidget(editor.editor_preview)
 | 
					            split.addWidget(editor.editor_preview)
 | 
				
			||||||
            split.addWidget(editor.web)
 | 
					            split.addWidget(editor.wrapped_web)
 | 
				
			||||||
            sizes = [editorR, mainR]
 | 
					            sizes = [editorR, mainR]
 | 
				
			||||||
        elif location == "right":
 | 
					        elif location == "right":
 | 
				
			||||||
            split.setOrientation(Qt.Horizontal)
 | 
					            split.setOrientation(Qt.Orientation.Horizontal)
 | 
				
			||||||
            split.addWidget(editor.web)
 | 
					            split.addWidget(editor.wrapped_web)
 | 
				
			||||||
            split.addWidget(editor.editor_preview)
 | 
					            split.addWidget(editor.editor_preview)
 | 
				
			||||||
            sizes = [mainR, editorR]
 | 
					            sizes = [mainR, editorR]
 | 
				
			||||||
        else:
 | 
					        else:
 | 
				
			||||||
@@ -79,15 +87,31 @@ class EditorPreview(object):
 | 
				
			|||||||
        return split
 | 
					        return split
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _inject_splitter(self, editor: editor.Editor):
 | 
					    def _inject_splitter(self, editor: editor.Editor):
 | 
				
			||||||
        layout = editor.outerLayout
 | 
					        layout = editor.web.parentWidget().layout()
 | 
				
			||||||
 | 
					        if layout is None:
 | 
				
			||||||
 | 
					            layout = QVBoxLayout()
 | 
				
			||||||
 | 
					            editor.web.parentWidget().setLayout(layout)
 | 
				
			||||||
        web_index = layout.indexOf(editor.web)
 | 
					        web_index = layout.indexOf(editor.web)
 | 
				
			||||||
        layout.removeWidget(editor.web)
 | 
					        layout.removeWidget(editor.web)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        # Wrap a widget on the outer layer of the webview
 | 
				
			||||||
 | 
					        # So that other plugins can continue to modify the layout
 | 
				
			||||||
 | 
					        editor.wrapped_web = QWidget()
 | 
				
			||||||
 | 
					        wrapLayout = QHBoxLayout()
 | 
				
			||||||
 | 
					        editor.wrapped_web.setLayout(wrapLayout)
 | 
				
			||||||
 | 
					        wrapLayout.addWidget(editor.web)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        split = self._get_splitter(editor)
 | 
					        split = self._get_splitter(editor)
 | 
				
			||||||
        layout.insertWidget(web_index, split)
 | 
					        layout.insertWidget(web_index, split)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def editor_note_hook(self, editor):
 | 
					    def editor_note_hook(self, editor):
 | 
				
			||||||
        self.onedit_hook(editor, editor.note)
 | 
					        self.editors = set(filter(lambda it: it.note is not None, self.editors))
 | 
				
			||||||
 | 
					        self.editors.add(editor)
 | 
				
			||||||
 | 
					        # The initial loading of notes will also trigger an editing event
 | 
				
			||||||
 | 
					        # which will cause a second refresh
 | 
				
			||||||
 | 
					        # Caching the content of notes here will be used to determine if the content has changed
 | 
				
			||||||
 | 
					        editor.cached_fields = list(editor.note.fields)
 | 
				
			||||||
 | 
					        self.refresh(editor)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def editor_init_button_hook(self, buttons, editor):
 | 
					    def editor_init_button_hook(self, buttons, editor):
 | 
				
			||||||
        addon_path = os.path.dirname(__file__)
 | 
					        addon_path = os.path.dirname(__file__)
 | 
				
			||||||
@@ -116,9 +140,13 @@ class EditorPreview(object):
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        return f"_showAnswer({json.dumps(a)},'{bodyclass}');"
 | 
					        return f"_showAnswer({json.dumps(a)},'{bodyclass}');"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def onedit_hook(self, editor, origin):
 | 
					    def onedit_hook(self, note):
 | 
				
			||||||
        if editor.note == origin:
 | 
					        for editor in self.editors:
 | 
				
			||||||
            editor.editor_preview.eval(self._obtainCardText(editor.note))
 | 
					            if editor.note == note and editor.cached_fields != note.fields:
 | 
				
			||||||
 | 
					                editor.cached_fields = list(note.fields)
 | 
				
			||||||
 | 
					                self.refresh(editor)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    def refresh(self, editor):
 | 
				
			||||||
 | 
					        editor.editor_preview.eval(self._obtainCardText(editor.note))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
eprev = EditorPreview()
 | 
					eprev = EditorPreview()
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user