langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
e13fee5aa3
anki/qt/aqt/editcurrent.py

83 lines
2.6 KiB
Python
Raw Normal View History

update copyright and clarify licenses
2019-02-05 04:59:03 +01:00
# Copyright: Ankitects Pty Ltd and contributors
merged libanki and ankiqt into single distro
2012-12-21 08:51:59 +01:00
# -*- coding: utf-8 -*-
# License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
import aqt.editor
explicitly import _ and ngettext
2019-03-04 02:58:34 +01:00
from anki.lang import _
migrate addHook/remHook calls
2020-01-15 04:49:26 +01:00
from aqt import gui_hooks
use isort to tidy up imports
2019-12-20 10:19:03 +01:00
from aqt.qt import *
from aqt.utils import restoreGeom, saveGeom, tooltip
The note in curentEdit is not changed until the window is closed. https://anki.tenderapp.com/discussions/ankidesktop/31105-reopening-an-edit-window I added a «reopen» method, which I believe may be useful in other cases too. I check whether the method exists before calling it, so there should be no compatibility problem.
2018-11-28 10:16:23 +01:00
merged libanki and ankiqt into single distro
2012-12-21 08:51:59 +01:00
class EditCurrent(QDialog):
add qconnect helper and some type hints The type hints allow mypy to check the gui_hook calls, revealing a bunch of places that are broken as they expect no arguments like the legacy hooks. To make mypy happy about PyQt's signal.connect(func), a qconnect() helper has been added.
2020-01-15 22:41:23 +01:00
def __init__(self, mw) -> None:
use a full window on non-Mac platforms as well
2017-08-11 13:06:15 +02:00
QDialog.__init__(self, None, Qt.Window)
use callback when closing windows remove the old forceClose hack in favour of a callback when closing, so all windows have a chance to save properly before the collection is unloaded also: - fix a warning shown when opening about screen - require a call to editor.cleanup() when closing a window, to make sure any pending js callbacks don't try to fire on a deleted object - make sure we gc webview when closing editcurrent - main.py still needs refactoring to make use of the change
2017-08-16 04:45:33 +02:00
mw.setupDialogGC(self)
merged libanki and ankiqt into single distro
2012-12-21 08:51:59 +01:00
self.mw = mw
self.form = aqt.forms.editcurrent.Ui_Dialog()
self.form.setupUi(self)
self.setWindowTitle(_("Edit Current"))
self.setMinimumHeight(400)
reduce editcurrent width constraint https://anki.tenderapp.com/discussions/ankidesktop/35724-bug-edit-window-not-resizable
2019-09-02 01:52:04 +02:00
self.setMinimumWidth(250)
accept Ctrl-Enter to close the edit current dialog Esc already works, but since the Add dialog accepts it it's nice to have as well.
2014-08-31 21:41:08 +02:00
self.form.buttonBox.button(QDialogButtonBox.Close).setShortcut(
apply black to all files
2019-12-23 01:34:10 +01:00
QKeySequence("Ctrl+Return")
)
merged libanki and ankiqt into single distro
2012-12-21 08:51:59 +01:00
self.editor = aqt.editor.Editor(self.mw, self.form.fieldsArea, self)
select current card in card layout from edit current
2018-07-23 04:54:26 +02:00
self.editor.card = self.mw.reviewer.card
refactor editor focus handling this fixes a bug where navigating to the next/previous card using shortcut keys resulted in the first field being clobbered - get rid of the stealFocus option in favour of explicitly passing focusTo to setNote() - setFields() is no longer responsible for setting focus - add focusTo var to the browser so that the row changed hook can restore focus when navigating to next/previous card - fix the row changed hook being called twice - the blur event now includes the field number instead of relying on the editor to have the correct currentField - the current field is set to null on blur - use deferred js and a callback rather than keeping track of when we were loaded - add shift+tab shortcut to go to previous field
2017-08-05 07:15:19 +02:00
self.editor.setNote(self.mw.reviewer.card.note(), focusTo=0)
merged libanki and ankiqt into single distro
2012-12-21 08:51:59 +01:00
restoreGeom(self, "editcurrent")
remove _hook/_filter suffix
2020-01-15 07:53:24 +01:00
gui_hooks.state_did_reset.append(self.onReset)
merged libanki and ankiqt into single distro
2012-12-21 08:51:59 +01:00
self.mw.requireReset()
self.show()
fix editcurrent not freeing webview on close
2019-02-18 23:01:11 +01:00
# reset focus after open, taking care not to retain webview
fix some warnings
2019-03-04 07:01:10 +01:00
# pylint: disable=unnecessary-lambda
fix editcurrent not freeing webview on close
2019-02-18 23:01:11 +01:00
self.mw.progress.timer(100, lambda: self.editor.web.setFocus(), False)
merged libanki and ankiqt into single distro
2012-12-21 08:51:59 +01:00
add qconnect helper and some type hints The type hints allow mypy to check the gui_hook calls, revealing a bunch of places that are broken as they expect no arguments like the legacy hooks. To make mypy happy about PyQt's signal.connect(func), a qconnect() helper has been added.
2020-01-15 22:41:23 +01:00
def onReset(self) -> None:
merged libanki and ankiqt into single distro
2012-12-21 08:51:59 +01:00
# lazy approach for now: throw away edits
try:
The note in curentEdit is not changed until the window is closed. https://anki.tenderapp.com/discussions/ankidesktop/31105-reopening-an-edit-window I added a «reopen» method, which I believe may be useful in other cases too. I check whether the method exists before calling it, so there should be no compatibility problem.
2018-11-28 10:16:23 +01:00
n = self.editor.note
apply black to all files
2019-12-23 01:34:10 +01:00
n.load() # reload in case the model changed
merged libanki and ankiqt into single distro
2012-12-21 08:51:59 +01:00
except:
# card's been deleted
remove _hook/_filter suffix
2020-01-15 07:53:24 +01:00
gui_hooks.state_did_reset.remove(self.onReset)
merged libanki and ankiqt into single distro
2012-12-21 08:51:59 +01:00
self.editor.setNote(None)
self.mw.reset()
use callback when closing windows remove the old forceClose hack in favour of a callback when closing, so all windows have a chance to save properly before the collection is unloaded also: - fix a warning shown when opening about screen - require a call to editor.cleanup() when closing a window, to make sure any pending js callbacks don't try to fire on a deleted object - make sure we gc webview when closing editcurrent - main.py still needs refactoring to make use of the change
2017-08-16 04:45:33 +02:00
aqt.dialogs.markClosed("EditCurrent")
merged libanki and ankiqt into single distro
2012-12-21 08:51:59 +01:00
self.close()
return
self.editor.setNote(n)
apply black to all files
2019-12-23 01:34:10 +01:00
def reopen(self, mw):
The note in curentEdit is not changed until the window is closed. https://anki.tenderapp.com/discussions/ankidesktop/31105-reopening-an-edit-window I added a «reopen» method, which I believe may be useful in other cases too. I check whether the method exists before calling it, so there should be no compatibility problem.
2018-11-28 10:16:23 +01:00
tooltip("Please finish editing the existing card first.")
self.onReset()
apply black to all files
2019-12-23 01:34:10 +01:00
use callback when closing windows remove the old forceClose hack in favour of a callback when closing, so all windows have a chance to save properly before the collection is unloaded also: - fix a warning shown when opening about screen - require a call to editor.cleanup() when closing a window, to make sure any pending js callbacks don't try to fire on a deleted object - make sure we gc webview when closing editcurrent - main.py still needs refactoring to make use of the change
2017-08-16 04:45:33 +02:00
def reject(self):
self.saveAndClose()
saveNow() now requires a callback the current code was freezing when clicking on 'cards' in the browser - it looks like like the javascript callback was never being called despite calling processEvents(). so we need to refactor the code to call saveNow() with a callback that does the subsequent processing. a lot of the browser code was implicitly calling saveNow() via beginReset(), so we've had to change all that code to save immediately before it begins any processing. found a probable bug in the process - it doesn't look like onRowChange() was saving before overwriting the note, so theoretically edits could be lost if the user switched to another card very quickly after typing something. onSearch() has been split into a GUI-activated onSearchActivated() that takes care of saving, and a lower level search() that refreshes the current search. it keeps track of the last search via an instance variable so that it refreshes properly if a user accidentally adds some characters to their search without activating the search, then does something like reverse the sort order.
2016-07-14 12:23:44 +02:00
use callback when closing windows remove the old forceClose hack in favour of a callback when closing, so all windows have a chance to save properly before the collection is unloaded also: - fix a warning shown when opening about screen - require a call to editor.cleanup() when closing a window, to make sure any pending js callbacks don't try to fire on a deleted object - make sure we gc webview when closing editcurrent - main.py still needs refactoring to make use of the change
2017-08-16 04:45:33 +02:00
def saveAndClose(self):
self.editor.saveNow(self._saveAndClose)
add qconnect helper and some type hints The type hints allow mypy to check the gui_hook calls, revealing a bunch of places that are broken as they expect no arguments like the legacy hooks. To make mypy happy about PyQt's signal.connect(func), a qconnect() helper has been added.
2020-01-15 22:41:23 +01:00
def _saveAndClose(self) -> None:
remove _hook/_filter suffix
2020-01-15 07:53:24 +01:00
gui_hooks.state_did_reset.remove(self.onReset)
merged libanki and ankiqt into single distro
2012-12-21 08:51:59 +01:00
r = self.mw.reviewer
try:
r.card.load()
except:
# card was removed by clayout
pass
else:
self.mw.reviewer.cardQueue.append(self.mw.reviewer.card)
use callback when closing windows remove the old forceClose hack in favour of a callback when closing, so all windows have a chance to save properly before the collection is unloaded also: - fix a warning shown when opening about screen - require a call to editor.cleanup() when closing a window, to make sure any pending js callbacks don't try to fire on a deleted object - make sure we gc webview when closing editcurrent - main.py still needs refactoring to make use of the change
2017-08-16 04:45:33 +02:00
self.editor.cleanup()
merged libanki and ankiqt into single distro
2012-12-21 08:51:59 +01:00
self.mw.moveToState("review")
saveGeom(self, "editcurrent")
use callback when closing windows remove the old forceClose hack in favour of a callback when closing, so all windows have a chance to save properly before the collection is unloaded also: - fix a warning shown when opening about screen - require a call to editor.cleanup() when closing a window, to make sure any pending js callbacks don't try to fire on a deleted object - make sure we gc webview when closing editcurrent - main.py still needs refactoring to make use of the change
2017-08-16 04:45:33 +02:00
aqt.dialogs.markClosed("EditCurrent")
QDialog.reject(self)
cancel sync if user elects to keep unsaved card content (#705)
2013-04-11 12:23:32 +02:00
use callback when closing windows remove the old forceClose hack in favour of a callback when closing, so all windows have a chance to save properly before the collection is unloaded also: - fix a warning shown when opening about screen - require a call to editor.cleanup() when closing a window, to make sure any pending js callbacks don't try to fire on a deleted object - make sure we gc webview when closing editcurrent - main.py still needs refactoring to make use of the change
2017-08-16 04:45:33 +02:00
def closeWithCallback(self, onsuccess):
def callback():
self._saveAndClose()
onsuccess()
apply black to all files
2019-12-23 01:34:10 +01:00
use callback when closing windows remove the old forceClose hack in favour of a callback when closing, so all windows have a chance to save properly before the collection is unloaded also: - fix a warning shown when opening about screen - require a call to editor.cleanup() when closing a window, to make sure any pending js callbacks don't try to fire on a deleted object - make sure we gc webview when closing editcurrent - main.py still needs refactoring to make use of the change
2017-08-16 04:45:33 +02:00
self.editor.saveNow(callback)
Reference in New Issue Copy Permalink