Add option to split side-by-side view. Also fixes split ratio handling

Signed-off-by: Tobias Manske <tobias.manske@mailbox.org>
This commit is contained in:
Tobias Manske 2023-03-24 17:05:23 +01:00
parent 58cd3cec42
commit 8e2815bc87
Signed by: tobias
GPG Key ID: E83C743C1FC2F79A
3 changed files with 50 additions and 17 deletions

View File

@ -29,9 +29,9 @@ class EditorPreview(object):
def editor_init_hook(self, ed: editor.Editor): def editor_init_hook(self, ed: editor.Editor):
ed.webview = AnkiWebView(title="editor_preview") ed.editor_preview = AnkiWebView(title="editor_preview")
# This is taken out of clayout.py # This is taken out of clayout.py
ed.webview.stdHtml( ed.editor_preview.stdHtml(
ed.mw.reviewer.revHtml(), ed.mw.reviewer.revHtml(),
css=["css/reviewer.css"], css=["css/reviewer.css"],
js=self.js, js=self.js,
@ -39,24 +39,50 @@ class EditorPreview(object):
) )
if not config['showPreviewAutomatically']: if not config['showPreviewAutomatically']:
ed.webview.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_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)) gui_hooks.editor_did_load_note.append(lambda o: None if o != ed else self.editor_note_hook(o))
def _get_splitter(self, editor):
layout = editor.outerLayout
mainR, editorR = [int(r) for r in config['splitRatio'].split(":")]
location = config['location']
split = QSplitter()
if location == 'above':
split.setOrientation(Qt.Vertical)
split.addWidget(editor.editor_preview)
split.addWidget(editor.web)
sizes = [editorR, mainR]
elif location == 'below':
split.setOrientation(Qt.Vertical)
split.addWidget(editor.web)
split.addWidget(editor.editor_preview)
sizes = [mainR, editorR]
elif location == 'left':
split.setOrientation(Qt.Horizontal)
split.addWidget(editor.editor_preview)
split.addWidget(editor.web)
sizes = [editorR, mainR]
elif location == 'right':
split.setOrientation(Qt.Horizontal)
split.addWidget(editor.web)
split.addWidget(editor.editor_preview)
sizes = [mainR, editorR]
else:
raise ValueError("Invalid value for config key location")
split.setSizes(sizes)
return split
def _inject_splitter(self, editor: editor.Editor): def _inject_splitter(self, editor: editor.Editor):
layout = editor.outerLayout layout = editor.outerLayout
split = QSplitter()
split.setOrientation(Qt.Vertical)
web_index = layout.indexOf(editor.web) web_index = layout.indexOf(editor.web)
layout.removeWidget(editor.web) layout.removeWidget(editor.web)
split.addWidget(editor.web)
split.addWidget(editor.webview) split = self._get_splitter(editor)
splitRatio = config['splitRatio']
upperR, lowerR = [int(r) for r in splitRatio.split(":")]
split.setStretchFactor(0, upperR)
split.setStretchFactor(1, lowerR)
layout.insertWidget(web_index, split) layout.insertWidget(web_index, split)
@ -72,10 +98,10 @@ class EditorPreview(object):
buttons.append(b) buttons.append(b)
def onEditorPreviewButton(self, origin: editor.Editor): def onEditorPreviewButton(self, origin: editor.Editor):
if origin.webview.isHidden(): if origin.editor_preview.isHidden():
origin.webview.show() origin.editor_preview.show()
else: else:
origin.webview.hide() origin.editor_preview.hide()
def _obtainCardText(self, note): def _obtainCardText(self, note):
@ -92,6 +118,6 @@ class EditorPreview(object):
def onedit_hook(self, editor, origin): def onedit_hook(self, editor, origin):
if editor.note == origin: if editor.note == origin:
editor.webview.eval(self._obtainCardText(editor.note)) editor.editor_preview.eval(self._obtainCardText(editor.note))
eprev = EditorPreview() eprev = EditorPreview()

View File

@ -1 +1,5 @@
{"showPreviewAutomatically": true, "splitRatio": "4:1"} {
"showPreviewAutomatically": true,
"splitRatio": "1:1",
"location": "below"
}

View File

@ -2,5 +2,8 @@
\- `showPreviewAutomatically` [boolean (true | false)]:<br/> \- `showPreviewAutomatically` [boolean (true | false)]:<br/>
&nbsp;&nbsp;&nbsp;Defines if the preview window should show up automatically as you enter the Editor (default: true)<br/><br/> &nbsp;&nbsp;&nbsp;Defines if the preview window should show up automatically as you enter the Editor (default: true)<br/><br/>
\- `splitRatio` [int:int]:<br/> \- `splitRatio` [int:int]:<br/>
&nbsp;&nbsp;&nbsp;Defines the default split ratio of the main view and preview view (default: 4:1) &nbsp;&nbsp;&nbsp;Defines the default split ratio of the main view and preview view (default: 1:1)<br/>
<br/>
\- `location` [string (above | below | left | right)]:<br/>
&nbsp;&nbsp;&nbsp;Defines where to render the preview (default: below)
<br/> <br/>