From 06f1aeb0524a134eddd1ab34f001412c7552cf7c Mon Sep 17 00:00:00 2001 From: johan456789 <14802181+johan456789@users.noreply.github.com> Date: Sat, 10 Oct 2020 00:38:07 +0800 Subject: [PATCH] fix help url paths --- qt/aqt/addcards.py | 2 +- qt/aqt/browser.py | 6 +++--- qt/aqt/clayout.py | 2 +- qt/aqt/deckconf.py | 2 +- qt/aqt/dyndeckconf.py | 2 +- qt/aqt/editor.py | 2 +- qt/aqt/fields.py | 2 +- qt/aqt/models.py | 6 +++--- qt/aqt/preferences.py | 2 +- qt/aqt/profiles.py | 2 +- qt/aqt/studydeck.py | 2 +- qt/aqt/utils.py | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qt/aqt/addcards.py b/qt/aqt/addcards.py index fc8007fe1..5de6bbff1 100644 --- a/qt/aqt/addcards.py +++ b/qt/aqt/addcards.py @@ -61,7 +61,7 @@ class AddCards(QDialog): self.deckChooser = aqt.deckchooser.DeckChooser(self.mw, self.form.deckArea) def helpRequested(self): - openHelp("addingnotes") + openHelp("editing?id=adding-cards-and-notes") def setupButtons(self) -> None: bb = self.form.buttonBox diff --git a/qt/aqt/browser.py b/qt/aqt/browser.py index feb41db0f..4a78a54ba 100644 --- a/qt/aqt/browser.py +++ b/qt/aqt/browser.py @@ -1494,7 +1494,7 @@ where id in %s""" return sf def onHelp(self): - openHelp("browser") + openHelp("browsing") # Misc menu options ###################################################################### @@ -1934,7 +1934,7 @@ where id in %s""" self.mw.taskman.run_in_background(do_search, on_done) def onFindReplaceHelp(self): - openHelp("findreplace") + openHelp("browsing?id=find-and-replace") # Edit: finding dupes ###################################################################### @@ -2277,7 +2277,7 @@ Are you sure you want to continue?""" QDialog.accept(self) def onHelp(self): - openHelp("browsermisc") + openHelp("browsing?id=other-menu-items") # Card Info Dialog diff --git a/qt/aqt/clayout.py b/qt/aqt/clayout.py index a89f9d365..00e86ab0f 100644 --- a/qt/aqt/clayout.py +++ b/qt/aqt/clayout.py @@ -828,4 +828,4 @@ Enter deck to place new %s cards in, or leave blank:""" self.mw = None def onHelp(self): - openHelp("templates") + openHelp("templates/intro") diff --git a/qt/aqt/deckconf.py b/qt/aqt/deckconf.py index cd62042af..d01e3ea18 100644 --- a/qt/aqt/deckconf.py +++ b/qt/aqt/deckconf.py @@ -38,7 +38,7 @@ class DeckConf(QDialog): self.setupCombos() self.setupConfs() self.setWindowModality(Qt.WindowModal) - qconnect(self.form.buttonBox.helpRequested, lambda: openHelp("deckoptions")) + qconnect(self.form.buttonBox.helpRequested, lambda: openHelp("deck-options")) qconnect(self.form.confOpts.clicked, self.confOpts) qconnect( self.form.buttonBox.button(QDialogButtonBox.RestoreDefaults).clicked, diff --git a/qt/aqt/dyndeckconf.py b/qt/aqt/dyndeckconf.py index b1c018193..94f040bc6 100644 --- a/qt/aqt/dyndeckconf.py +++ b/qt/aqt/dyndeckconf.py @@ -24,7 +24,7 @@ class DeckConf(QDialog): self.ok = self.form.buttonBox.addButton(label, QDialogButtonBox.AcceptRole) self.mw.checkpoint(_("Options")) self.setWindowModality(Qt.WindowModal) - qconnect(self.form.buttonBox.helpRequested, lambda: openHelp("filtered")) + qconnect(self.form.buttonBox.helpRequested, lambda: openHelp("filtered-decks")) self.setWindowTitle(_("Options for %s") % self.deck["name"]) restoreGeom(self, "dyndeckconf") self.initialSetup() diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py index b81103b1e..ca6030eec 100644 --- a/qt/aqt/editor.py +++ b/qt/aqt/editor.py @@ -538,7 +538,7 @@ class Editor: form = aqt.forms.edithtml.Ui_Dialog() form.setupUi(d) restoreGeom(d, "htmlEditor") - qconnect(form.buttonBox.helpRequested, lambda: openHelp("editor")) + qconnect(form.buttonBox.helpRequested, lambda: openHelp("editing?id=features")) form.textEdit.setPlainText(self.note.fields[field]) d.show() form.textEdit.moveCursor(QTextCursor.End) diff --git a/qt/aqt/fields.py b/qt/aqt/fields.py index ba658f865..04a3935c1 100644 --- a/qt/aqt/fields.py +++ b/qt/aqt/fields.py @@ -221,4 +221,4 @@ class FieldDialog(QDialog): self.mw.taskman.with_progress(save, on_done, self) def onHelp(self): - openHelp("fields") + openHelp("editing?id=customizing-fields") diff --git a/qt/aqt/models.py b/qt/aqt/models.py index 538442e25..16b728d2c 100644 --- a/qt/aqt/models.py +++ b/qt/aqt/models.py @@ -36,7 +36,7 @@ class Models(QDialog): self.mw.checkpoint(_("Note Types")) self.form = aqt.forms.models.Ui_Dialog() self.form.setupUi(self) - qconnect(self.form.buttonBox.helpRequested, lambda: openHelp("notetypes")) + qconnect(self.form.buttonBox.helpRequested, lambda: openHelp("editing?id=adding-a-note-type")) self.models: List[pb.NoteTypeNameIDUseCount] = [] self.setupModels() restoreGeom(self, "models") @@ -155,7 +155,7 @@ class Models(QDialog): frm.latexHeader.setText(nt["latexPre"]) frm.latexFooter.setText(nt["latexPost"]) d.setWindowTitle(_("Options for %s") % nt["name"]) - qconnect(frm.buttonBox.helpRequested, lambda: openHelp("latex")) + qconnect(frm.buttonBox.helpRequested, lambda: openHelp("math?id=latex")) restoreGeom(d, "modelopts") gui_hooks.models_advanced_will_show(d) d.exec_() @@ -239,4 +239,4 @@ class AddModel(QDialog): QDialog.accept(self) def onHelp(self) -> None: - openHelp("notetypes") + openHelp("editing?id=adding-a-note-type") diff --git a/qt/aqt/preferences.py b/qt/aqt/preferences.py index 1d58510fc..f1d796539 100644 --- a/qt/aqt/preferences.py +++ b/qt/aqt/preferences.py @@ -19,7 +19,7 @@ class Preferences(QDialog): self.form.setupUi(self) self.form.buttonBox.button(QDialogButtonBox.Help).setAutoDefault(False) self.form.buttonBox.button(QDialogButtonBox.Close).setAutoDefault(False) - qconnect(self.form.buttonBox.helpRequested, lambda: openHelp("profileprefs")) + qconnect(self.form.buttonBox.helpRequested, lambda: openHelp("preferences")) self.silentlyClose = True self.prefs = self.mw.col.backend.get_preferences() self.setupLang() diff --git a/qt/aqt/profiles.py b/qt/aqt/profiles.py index 1e5f88609..dd8d7eabc 100644 --- a/qt/aqt/profiles.py +++ b/qt/aqt/profiles.py @@ -481,7 +481,7 @@ create table if not exists profiles with open(p, "w", encoding="utf8") as file: file.write( without_unicode_isolation( - tr(TR.PROFILES_FOLDER_README, link=appHelpSite + "#startupopts") + tr(TR.PROFILES_FOLDER_README, link=appHelpSite + "files?id=startup-options") ) ) diff --git a/qt/aqt/studydeck.py b/qt/aqt/studydeck.py index 32b41448b..78482ab48 100644 --- a/qt/aqt/studydeck.py +++ b/qt/aqt/studydeck.py @@ -16,7 +16,7 @@ class StudyDeck(QDialog): names=None, accept=None, title=None, - help="studydeck", + help="studying?id=keyboard-shortcuts", current=None, cancel=True, parent=None, diff --git a/qt/aqt/utils.py b/qt/aqt/utils.py index b9a2983b1..98e8d6148 100644 --- a/qt/aqt/utils.py +++ b/qt/aqt/utils.py @@ -43,7 +43,7 @@ def tr(key: TRValue, **kwargs: Union[str, int, float]) -> str: def openHelp(section): link = aqt.appHelpSite if section: - link += "#%s" % section + link += section openLink(link)