2 new commits in placeMarkers:
https://bitbucket.org/nvdaaddonteam/placemarkers/commits/24c591326acc/
Changeset: 24c591326acc
Branch: None
User: norrumar
Date: 2019-06-03 18:31:18+00:00
Summary: Version 13.0-dev
Affected #: 3 files
diff --git a/addon/globalPlugins/placeMarkers/__init__.py
b/addon/globalPlugins/placeMarkers/__init__.py
index 166857c..d8e004b 100644
--- a/addon/globalPlugins/placeMarkers/__init__.py
+++ b/addon/globalPlugins/placeMarkers/__init__.py
@@ -46,6 +46,10 @@ BOOKMARKS_FOLDER = os.path.join(PLACE_MARKERS_PATH,
"bookmarks")
CONFIG_PATH = globalVars.appArgs.configPath
ADDON_SUMMARY = addonHandler.getCodeAddon().manifest["summary"]
+### Globals
+lastFindText = ""
+lastCaseSensitivity = ""
+
def createSearchFolder():
if os.path.isdir(SEARCH_FOLDER):
return
@@ -282,6 +286,9 @@ class SpecificSearchDialog(wx.Dialog):
core.callLater(1000, doFindText, text,
caseSensitive=caseSensitive)
else:
core.callLater(1000, doFindTextUp, text,
caseSensitive=caseSensitive)
+ global lastFindText, lastCaseSensitivity
+ lastFindText = text
+ lastCaseSensitivity = caseSensitive
if self.addCheckBox.Value or self.removeCheckBox.Value:
savedStrings = self.savedTexts
if self.removeCheckBox.Value:
@@ -676,6 +683,38 @@ class GlobalPlugin(globalPluginHandler.GlobalPlugin):
return
self.popupSpecificSearchDialog()
+ @script(
+ # Translators: message presented in input mode, when a
keystroke of an addon script is pressed.
+ description=_("finds the next occurrence of the last text
searched for any specific document."),
+ )
+ def script_specificFindNext(self, gesture):
+ obj=api.getFocusObject()
+ if not controlTypes.STATE_MULTILINE in obj.states:
+ treeInterceptor=obj.treeInterceptor
+ if not (isinstance(treeInterceptor,
BrowseModeDocumentTreeInterceptor) and not treeInterceptor.passThrough):
+ gesture.send()
+ return
+ if not lastFindText:
+ self.popupSpecificSearchDialog()
+ else:
+ doFindText(lastFindText, lastCaseSensitivity)
+
+ @script(
+ # Translators: message presented in input mode, when a
keystroke of an addon script is pressed.
+ description=_("finds the previous occurrence of the last text
searched for any specific document."),
+ )
+ def script_specificFindPrevious(self, gesture):
+ obj=api.getFocusObject()
+ if not controlTypes.STATE_MULTILINE in obj.states:
+ treeInterceptor=obj.treeInterceptor
+ if not (isinstance(treeInterceptor,
BrowseModeDocumentTreeInterceptor) and not treeInterceptor.passThrough):
+ gesture.send()
+ return
+ if not lastFindText:
+ self.popupSpecificSearchDialog()
+ else:
+ doFindTextUp(lastFindText, lastCaseSensitivity)
+
def popupNotesDialog(self):
if getSavedBookmarks() == {}:
ui.message(
diff --git a/buildVars.py b/buildVars.py
index bf30e70..c6b8154 100755
--- a/buildVars.py
+++ b/buildVars.py
@@ -19,7 +19,7 @@ addon_info = {
# Translators: Long description to be shown for this add-on on add-on
information from add-ons manager
"addon_description" : _("Add-on for setting place markers on specific
virtual documents"),
# version
- "addon_version" : "12.5",
+ "addon_version" : "13.0-dev",
# Author(s)
"addon_author" : u"Noelia <nrm1977@xxxxxxxxx>, Chris
<llajta2012@xxxxxxxxx>",
# URL for the add-on documentation support
@@ -29,7 +29,7 @@ addon_info = {
# Minimum NVDA version supported (e.g. "2018.3")
"addon_minimumNVDAVersion" : "2018.3.0",
# Last NVDA version supported/tested (e.g. "2018.4", ideally more
recent than minimum version)
- "addon_lastTestedNVDAVersion" : "2019.1.0",
+ "addon_lastTestedNVDAVersion" : "2019.2.0",
# Add-on update channel (default is stable or None)
"addon_updateChannel" : None,
}
diff --git a/readme.md b/readme.md
index 54417d4..36d0c92 100644
--- a/readme.md
+++ b/readme.md
@@ -20,6 +20,8 @@ This addon is based on SpecificSearch and Bookmark&Search,
developed by the same
* alt+NVDA+k: Opens a dialog with the bookmarks saved for this document.
You can write a note for each bookmark; press Save note to save changes.
Pressing Delete you can remove the selected bookmark. Pressing OK you can move
to the selected position.
* Not assigned: Saves a position as a temporary bookmark.
* Not assigned: Moves to the temporary bookmark for the current document.
+* Not assigned: Finds the next occurrence of the last text searched for
any specific document.
+* Not assigned: Finds the previous occurrence of the last text searched
for any specific document.
## Place markers Submenu (NVDA+N) ##
@@ -33,6 +35,9 @@ Using the Place markers submenu under NVDA's Preferences
menu, you can access:
Note: The bookmark position is based on the number of characters; and
therefore in dynamic pages it is better to use the specific search, not
bookmarks.
+## Changes for 13.0 ##
+* Added not assigned commands to find the next and previous occurrences
of the last text searched for any specific document.
+
## Changes for 12.0 ##
* Fixed a critical bug which caused NVDA to crash when trying to open the
Notes dialog, if chinese characters were selected before saving bookmarks.
https://bitbucket.org/nvdaaddonteam/placemarkers/commits/994a2d8dfb56/
Changeset: 994a2d8dfb56
Branch: 2019.2
User: norrumar
Date: 2019-06-03 18:31:57+00:00
Summary: Merge branch 'stable' into 2019.2
Affected #: 2 files
diff --git a/addon/doc/de/readme.md b/addon/doc/de/readme.md
index 6a7c1b4..24bf772 100644
--- a/addon/doc/de/readme.md
+++ b/addon/doc/de/readme.md
@@ -2,8 +2,8 @@
* Autoren: Noelia, Chris.
* NVDA-Kompatibilität: 2018.3 bis 2019.1
-* [stabile version herunterladen][1]
-* [Entwicklungsversion herunterladen][2]
+* [Stabile Version herunterladen][1]
+* [Entwicklerversion herunterladen][2]
Mit dieser Erweiterung können Sie innerhalb des Lesemodus von NVDA
Suchanfragen oder Lesezeichen speichern Bzw. Suchläufe durchführen. Die
diff --git a/addon/locale/zh_CN/LC_MESSAGES/nvda.po
b/addon/locale/zh_CN/LC_MESSAGES/nvda.po
index 6489205..9be0b24 100644
--- a/addon/locale/zh_CN/LC_MESSAGES/nvda.po
+++ b/addon/locale/zh_CN/LC_MESSAGES/nvda.po
@@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: placeMarkers-10.1\n"
"Report-Msgid-Bugs-To: 'nvda-translations@xxxxxxxxxxxxx'\n"
"POT-Creation-Date: 2018-05-19 18:27+0200\n"
-"PO-Revision-Date: 2019-01-09 07:53+0800\n"
+"PO-Revision-Date: 2019-04-06 09:55+0800\n"
"Last-Translator: dingpengyu <dingpengyu06@xxxxxxxxx>\n"
"Language-Team: NVDASimplified Chinese team All volunteers <Copyright (C) "
"2010-2019>\n"
@@ -14,7 +14,7 @@ msgstr ""
"X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
"X-Poedit-Basepath: .\n"
"X-Poedit-SourceCharset: UTF-8\n"
-"X-Generator: Poedit 2.2\n"
+"X-Generator: Poedit 2.2.1\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Poedit-SearchPath-0: .\n"
"X-Poedit-SearchPath-1: .\n"
@@ -98,7 +98,7 @@ msgstr "&书签"
#. Translators: The label of an edit box in the Notes dialog.
msgid "Not&e:"
-msgstr "不&e:"
+msgstr "笔记(&E):"
#. Translators: The label for a button in the Notes dialog.
msgid "&Save note"
@@ -127,11 +127,7 @@ msgid "Copy place markers"
msgstr "复制位置标记"
#. Translators: An informational message displayed in the Copy dialog.
-#, fuzzy, python-format
-msgid ""
-"Select a folder to save a backup of your current place markers.\n"
-"\n"
-"\t\tThey will be copied from %s."
+msgid "Select a folder to save a backup of your current place markers."
msgstr "选择一个文件夹用来保存当前位置标记的备份。"
#. Translators: The label of a grouping containing controls to select the
destination directory in the Copy dialog.
@@ -147,12 +143,9 @@ msgid "Restore place markers"
msgstr "恢复位置标记"
#. Translators: An informational message displayed in the Restore dialog.
-#, fuzzy, python-format
msgid ""
-"Select a folder to restore a backup of your previous copied place markers.\n"
-"\n"
-"\t\tThey will be copied to %s."
-msgstr "选择一个文件夹来还原以前复制的位置标记的备份。"
+"Select a folder to restore a backup of your previous copied place markers."
+msgstr "选择一个文件夹用来还原以前复制的位置标记的备份。"
#. Translators: The label of a grouping containing controls to select the
destination directory in the Restore dialog.
msgid "directory containing backup:"
@@ -229,9 +222,9 @@ msgstr "在指定的文档中查找光标所在位置的文本。"
msgid "Show the Notes dialog for a specific document."
msgstr "显示特定文档的笔记对话框。"
-#. Translators: message presented when a bookmark cannot be saved.
-msgid "Bookmark cannot be saved"
-msgstr "书签未能保存"
+#. Translators: message presented in input mode, when a keystroke of an addon
script is pressed.
+msgid "Saves the current position as a bookmark."
+msgstr "保存当前位置做为书签。"
#. Translators: message presented when a position is saved as a bookmark.
#, python-format
@@ -243,12 +236,8 @@ msgid "Cannot save bookmark"
msgstr "不能保存书签"
#. Translators: message presented in input mode, when a keystroke of an addon
script is pressed.
-msgid "Saves the current position as a bookmark."
-msgstr "保存当前位置做为书签。"
-
-#. Translators: Message presented when a bookmark can't be deleted.
-msgid "Bookmark cannot be deleted"
-msgstr "书签无法删除"
+msgid "Deletes the current bookmark."
+msgstr "删除当前的书签。"
#. Translators: message presented when the current document has bookmarks, but
none is selected.
msgid "No bookmark selected"
@@ -263,17 +252,13 @@ msgid "Cannot delete bookmark"
msgstr "不能删除书签"
#. Translators: message presented in input mode, when a keystroke of an addon
script is pressed.
-msgid "Deletes the current bookmark."
-msgstr "删除当前的书签。"
+msgid "Moves to the next bookmark."
+msgstr "移动到下一个书签。"
#. Translators: message presented when trying to select a bookmark, but none
is found.
msgid "No bookmarks found"
msgstr "未找到书签"
-#. Translators: message presented when cannot find any bookmarks.
-msgid "Cannot find any bookmarks"
-msgstr "无法找到任何书签"
-
#. Translators: message presented when a bookmark is selected.
#, python-format
msgid "Position: character %d"
@@ -284,16 +269,16 @@ msgid "Next bookmark not found"
msgstr "未找到下一个书签"
#. Translators: message presented in input mode, when a keystroke of an addon
script is pressed.
-msgid "Moves to the next bookmark."
-msgstr "移动到下一个书签。"
+msgid "Moves to the previous bookmark."
+msgstr "移动到上一个书签。"
#. Translators: message presented when the previous bookmark is not found.
msgid "Previous bookmark not found"
msgstr "未找到上一个书签"
#. Translators: message presented in input mode, when a keystroke of an addon
script is pressed.
-msgid "Moves to the previous bookmark."
-msgstr "移动到上一个书签。"
+msgid "Copies the name of the current file for place markers to the clipboard."
+msgstr "复制位置标记对应文件的名称到剪贴板。"
#. Translators: message presented when cannot copy the file name corresponding
to place markers.
msgid "Cannot copy file name for place markers"
@@ -304,18 +289,14 @@ msgid "Place markers file name copied to clipboard"
msgstr "位置标记文件名以拷贝到剪贴板"
#. Translators: message presented in input mode, when a keystroke of an addon
script is pressed.
-msgid "Copies the name of the current file for place markers to the clipboard."
-msgstr "复制位置标记对应文件的名称到剪贴板。"
+msgid "Saves the current position as a temporary bookmark."
+msgstr "将当前位置保存为临时书签。"
#. Translators: Message presented when a temporary bookmark is saved.
#, python-format
msgid "Saved temporary bookmark at position %d"
msgstr "在当前位置保存临时书签%d"
-#. Translators: message presented in input mode, when a keystroke of an addon
script is pressed.
-msgid "Saves the current position as a temporary bookmark."
-msgstr "将当前位置保存为临时书签。"
-
#. Translators: Message presented in input help mode.
msgid "Moves to the temporary bookmark for the current document."
msgstr "移至当前文档的临时书签。"
@@ -329,3 +310,12 @@ msgstr "位置标记"
#. Translators: Long description to be shown for this add-on on add-on
information from add-ons manager
msgid "Add-on for setting place markers on specific virtual documents"
msgstr "一个在指定的虚拟文档中设置位置标记的插件"
+
+#~ msgid "Bookmark cannot be saved"
+#~ msgstr "书签未能保存"
+
+#~ msgid "Bookmark cannot be deleted"
+#~ msgstr "书签无法删除"
+
+#~ msgid "Cannot find any bookmarks"
+#~ msgstr "无法找到任何书签"
Repository URL: https://bitbucket.org/nvdaaddonteam/placemarkers/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.