Compare commits
	
		
			2 Commits
		
	
	
		
			gugutu-mas
			...
			feature/sc
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						
						
							
						
						360c8b8668
	
				 | 
					
					
						|||
| 
						
						
							
						
						c3f536017a
	
				 | 
					
					
						
@@ -13,7 +13,7 @@ steps:
 | 
				
			|||||||
    image: debian:bookworm
 | 
					    image: debian:bookworm
 | 
				
			||||||
    pull: always
 | 
					    pull: always
 | 
				
			||||||
    commands:
 | 
					    commands:
 | 
				
			||||||
      - apt-get update && apt-get install -y zip
 | 
					      - apt-get update && apt-get install -y zip slugify
 | 
				
			||||||
      - ./build.sh
 | 
					      - ./build.sh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  - name: Upload Artifact to Gitea
 | 
					  - name: Upload Artifact to Gitea
 | 
				
			||||||
@@ -25,7 +25,8 @@ steps:
 | 
				
			|||||||
        from_secret: gitea_api_token
 | 
					        from_secret: gitea_api_token
 | 
				
			||||||
      checksum: sha256
 | 
					      checksum: sha256
 | 
				
			||||||
      base_url: https://git.tobiasmanske.de
 | 
					      base_url: https://git.tobiasmanske.de
 | 
				
			||||||
      files: editor-preview.ankiaddon
 | 
					      files:
 | 
				
			||||||
 | 
					        - "*.ankiaddon"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
image_pull_secrets:
 | 
					image_pull_secrets:
 | 
				
			||||||
  - registry
 | 
					  - registry
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@@ -169,3 +169,4 @@ tags
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
# Stores actual addon config if the src directory is symlinked into an anki installation during development
 | 
					# Stores actual addon config if the src directory is symlinked into an anki installation during development
 | 
				
			||||||
src/meta.json
 | 
					src/meta.json
 | 
				
			||||||
 | 
					src/manifest.json
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										20
									
								
								build.sh
									
									
									
									
									
								
							
							
						
						
									
										20
									
								
								build.sh
									
									
									
									
									
								
							@@ -1,11 +1,27 @@
 | 
				
			|||||||
#!/bin/bash
 | 
					#!/bin/bash
 | 
				
			||||||
set -e
 | 
					set -e
 | 
				
			||||||
 | 
					set -o nounset
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					SLUG=$(slugify "${DRONE_COMMIT_REF}")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if [ -d src/__pycache__ ]; then
 | 
					if [ -d src/__pycache__ ]; then
 | 
				
			||||||
    rm -r src/__pycache__
 | 
					    rm -r src/__pycache__
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
cd src
 | 
					cd src
 | 
				
			||||||
zip -r ../editor-preview.ankiaddon --exclude meta.json -- *
 | 
					
 | 
				
			||||||
 | 
					# Create Manifest
 | 
				
			||||||
 | 
					cat - > manifest.json <<EOF
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					  "name": "Editor Live Preview - ${SLUG}",
 | 
				
			||||||
 | 
					  "package": "editor-live-preview-${SLUG}"
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					EOF
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					zip -r ../editor-preview-external.ankiaddon --exclude meta.json -- *
 | 
				
			||||||
 | 
					zip -r ../editor-preview-ankiweb.ankiaddon --exclude meta.json --exclude manifest.json -- *
 | 
				
			||||||
cd ..
 | 
					cd ..
 | 
				
			||||||
unzip -l  editor-preview.ankiaddon
 | 
					echo "Ankiweb Contents"
 | 
				
			||||||
 | 
					unzip -l editor-preview-ankiweb.ankiaddon
 | 
				
			||||||
 | 
					echo "External Contents"
 | 
				
			||||||
 | 
					unzip -l editor-preview-external.ankiaddon
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -19,6 +19,7 @@ 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)
 | 
				
			||||||
 | 
					        self.scrollLock = config["enableScrollLockByDefault"]
 | 
				
			||||||
        if int(buildinfo.version.split(".")[2]) < 45:  # < 2.1.45
 | 
					        if int(buildinfo.version.split(".")[2]) < 45:  # < 2.1.45
 | 
				
			||||||
            self.js = [
 | 
					            self.js = [
 | 
				
			||||||
                "js/vendor/jquery.min.js",
 | 
					                "js/vendor/jquery.min.js",
 | 
				
			||||||
@@ -86,20 +87,38 @@ class EditorPreview(object):
 | 
				
			|||||||
        split = self._get_splitter(editor)
 | 
					        split = self._get_splitter(editor)
 | 
				
			||||||
        layout.insertWidget(web_index, split)
 | 
					        layout.insertWidget(web_index, split)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    def isScrollLocked(self):
 | 
				
			||||||
 | 
					        return self.scrollLock
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    def toggleScrollLock(self):
 | 
				
			||||||
 | 
					        self.scrollLock = not self.scrollLock
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def editor_note_hook(self, editor):
 | 
					    def editor_note_hook(self, editor):
 | 
				
			||||||
        self.onedit_hook(editor, editor.note)
 | 
					        # Dont lock the editor in place when loading a new note
 | 
				
			||||||
 | 
					        # i.e. when using the cards browser
 | 
				
			||||||
 | 
					        self.onedit_hook(editor, editor.note, keep_scrollbar_value=False)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    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__)
 | 
				
			||||||
        icons_dir = os.path.join(addon_path, "icons")
 | 
					        icons_dir = os.path.join(addon_path, "icons")
 | 
				
			||||||
        b = editor.addButton(
 | 
					        previewButton = editor.addButton(
 | 
				
			||||||
            icon=os.path.join(icons_dir, "file.svg"),
 | 
					            icon=os.path.join(icons_dir, "file.svg"),
 | 
				
			||||||
            cmd="_editor_toggle_preview",
 | 
					            cmd="_editor_toggle_preview",
 | 
				
			||||||
            tip="Toggle Live Preview",
 | 
					            tip="Toggle Live Preview",
 | 
				
			||||||
            func=lambda o=editor: self.onEditorPreviewButton(o),
 | 
					            func=lambda o=editor: self.onEditorPreviewButton(o),
 | 
				
			||||||
            disables=False,
 | 
					            disables=False,
 | 
				
			||||||
        )
 | 
					        )
 | 
				
			||||||
        buttons.append(b)
 | 
					        scrollLockButton = editor.addButton(
 | 
				
			||||||
 | 
					            # icon=os.path.join(icons_dir, "file.svg"),
 | 
				
			||||||
 | 
					            icon=None,
 | 
				
			||||||
 | 
					            label="🔒",
 | 
				
			||||||
 | 
					            cmd="_editor_toggle_scroll_lock",
 | 
				
			||||||
 | 
					            tip="Toggle Scroll Locking",
 | 
				
			||||||
 | 
					            func=lambda o=editor: self.onEditorScrollLockButton(o),
 | 
				
			||||||
 | 
					            disables=True,
 | 
				
			||||||
 | 
					        )
 | 
				
			||||||
 | 
					        buttons.append(previewButton)
 | 
				
			||||||
 | 
					        buttons.append(scrollLockButton)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def onEditorPreviewButton(self, origin: editor.Editor):
 | 
					    def onEditorPreviewButton(self, origin: editor.Editor):
 | 
				
			||||||
        if origin.editor_preview.isHidden():
 | 
					        if origin.editor_preview.isHidden():
 | 
				
			||||||
@@ -107,18 +126,29 @@ class EditorPreview(object):
 | 
				
			|||||||
        else:
 | 
					        else:
 | 
				
			||||||
            origin.editor_preview.hide()
 | 
					            origin.editor_preview.hide()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    def onEditorScrollLockButton(self, origin: editor.Editor):
 | 
				
			||||||
 | 
					        self.toggleScrollLock()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _obtainCardText(self, note):
 | 
					    def _obtainCardText(self, note):
 | 
				
			||||||
        c = note.ephemeral_card()
 | 
					        c = note.ephemeral_card()
 | 
				
			||||||
        a = mw.prepare_card_text_for_display(c.answer())
 | 
					        a = mw.prepare_card_text_for_display(c.answer())
 | 
				
			||||||
        a = gui_hooks.card_will_show(a, c, "clayoutAnswer")
 | 
					        a = gui_hooks.card_will_show(a, c, "clayoutAnswer")
 | 
				
			||||||
        bodyclass = theme_manager.body_classes_for_card_ord(c.ord, theme_manager.night_mode)
 | 
					        bodyclass = theme_manager.body_classes_for_card_ord(
 | 
				
			||||||
 | 
					            c.ord, theme_manager.night_mode
 | 
				
			||||||
 | 
					        )
 | 
				
			||||||
        bodyclass += " editor-preview"
 | 
					        bodyclass += " editor-preview"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        return f"_showAnswer({json.dumps(a)},'{bodyclass}');"
 | 
					        return f"_showAnswer({json.dumps(a)},'{bodyclass}');"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def onedit_hook(self, editor, origin):
 | 
					    def onedit_hook(self, editor, origin, keep_scrollbar_value=True):
 | 
				
			||||||
        if editor.note == origin:
 | 
					        if editor.note == origin:
 | 
				
			||||||
 | 
					            page: QWebEnginePage = editor.editor_preview.page()
 | 
				
			||||||
 | 
					            scrollbar_value = page.scrollPosition()
 | 
				
			||||||
            editor.editor_preview.eval(self._obtainCardText(editor.note))
 | 
					            editor.editor_preview.eval(self._obtainCardText(editor.note))
 | 
				
			||||||
 | 
					            if keep_scrollbar_value and self.isScrollLocked():
 | 
				
			||||||
 | 
					                page.runJavaScript(
 | 
				
			||||||
 | 
					                    f"window.scrollTo({scrollbar_value.x()}, {scrollbar_value.y()});"
 | 
				
			||||||
 | 
					                )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
eprev = EditorPreview()
 | 
					eprev = EditorPreview()
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,5 +1,6 @@
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
  "showPreviewAutomatically": true,
 | 
					  "showPreviewAutomatically": true,
 | 
				
			||||||
  "splitRatio": "1:1",
 | 
					  "splitRatio": "1:1",
 | 
				
			||||||
  "location": "below"
 | 
					  "location": "below",
 | 
				
			||||||
 | 
					  "enableScrollLockByDefault": true
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,3 +7,6 @@
 | 
				
			|||||||
\- `location` [string (above | below | left | right)]:<br/>
 | 
					\- `location` [string (above | below | left | right)]:<br/>
 | 
				
			||||||
   Defines where to render the preview (default: below)
 | 
					   Defines where to render the preview (default: below)
 | 
				
			||||||
<br/>
 | 
					<br/>
 | 
				
			||||||
 | 
					\- `showPreviewAutomatically` [boolean (true | false)]:<br/>
 | 
				
			||||||
 | 
					   Whether to keep the scrollbar at the same location when text changed or not (default: true)<br/>
 | 
				
			||||||
 | 
					<br/>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user