3 new commits in focusHighlight:
https://bitbucket.org/nvdaaddonteam/focushighlight/commits/af8d0af91876/
Changeset: af8d0af91876
Branch: None
User: nishimotz
Date: 2018-10-11 07:23:54+00:00
Summary: fixes nvdajp/focusHighlight#10
Affected #: 3 files
diff --git a/addon/globalPlugins/focusHighlight.py
b/addon/globalPlugins/focusHighlight.py
index b44a8c0..c9e823d 100644
--- a/addon/globalPlugins/focusHighlight.py
+++ b/addon/globalPlugins/focusHighlight.py
@@ -320,7 +320,7 @@ def doPaint(hwnd):
else:
argb, dashStyle, thickness, padding = fcARGB,
fcDashStyle, fcThickness, PADDING_THICK
if rectEquals(focusRect, navigatorRect):
- if not passThroughMode:
+ if not passThroughMode and thickness is not None:
thickness *= 2
padding = PADDING_THICK
else:
diff --git a/buildVars.py b/buildVars.py
index 708177e..7a80d44 100644
--- 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" : _("Highlight the focused location."),
# version
- "addon_version" : "5.2",
+ "addon_version" : "5.3",
# Author(s)
"addon_author" : u"Takuya Nishimoto <nishimotz@xxxxxxxxx>",
# URL for the add-on documentation support
diff --git a/readme.md b/readme.md
index 5ac2085..f750a68 100644
--- a/readme.md
+++ b/readme.md
@@ -15,6 +15,11 @@ The following colors are used by this addon:
To disable object tracking, uninstall the addon.
+## Changes for 5.3 ##
+
+* New and updated translations.
+* Addresses [the issue](https://github.com/nvdajp/focusHighlight/issues/10)
regarding Chrome browser and application sleep mode.
+
## Changes for 5.2 ##
* New and updated translations.
https://bitbucket.org/nvdaaddonteam/focushighlight/commits/525754ba02b7/
Changeset: 525754ba02b7
Branch: None
User: nishimotz
Date: 2018-10-11 07:39:05+00:00
Summary: import reordered
Affected #: 1 file
diff --git a/addon/globalPlugins/focusHighlight.py
b/addon/globalPlugins/focusHighlight.py
index c9e823d..9a71b91 100644
--- a/addon/globalPlugins/focusHighlight.py
+++ b/addon/globalPlugins/focusHighlight.py
@@ -1,59 +1,36 @@
# focus highlight
-# 2017-09-12
+# 2018-10-11
# Takuya Nishimoto
-import globalPluginHandler
-import tones
-import wx
-import gui
-from logHandler import log
+import sys
import threading
-import winUser
-import oleacc
-import controlTypes
-from NVDAObjects.IAccessible import IAccessible
-from win32con import (
- NULL,
- CS_HREDRAW,
- CS_VREDRAW,
- CW_USEDEFAULT,
- GWL_STYLE,
- GWL_EXSTYLE,
- HS_BDIAGONAL,
- HS_DIAGCROSS,
- HWND_DESKTOP,
- HWND_TOPMOST,
- IDC_ARROW,
- LWA_COLORKEY,
- LWA_ALPHA,
- SWP_NOACTIVATE,
- SW_HIDE,
- SW_SHOWNA,
- WM_PAINT,
- WM_DESTROY,
- WM_SHOWWINDOW,
- WM_TIMER,
- WM_ERASEBKGND,
- WS_CAPTION,
- WS_DISABLED,
- WS_POPUP,
- WS_VISIBLE,
- WS_EX_APPWINDOW,
- WS_EX_LAYERED,
- WS_EX_TOOLWINDOW,
- WS_EX_TRANSPARENT,
-)
+import time
+from ctypes import (WINFUNCTYPE, FormatError, GetLastError, Structure,
+ WinError, byref, c_char, c_char_p, c_float, c_int, c_long,
+ c_uint, c_uint32, c_ulong, c_void_p, pointer, windll)
+from ctypes.wintypes import BOOL, COLORREF, POINTER
-import sys
-from ctypes import WINFUNCTYPE, Structure, windll
-from ctypes import c_long, c_int, c_uint, c_char_p, c_char, byref, pointer,
c_uint32, c_void_p, c_ulong, c_float
-from ctypes import WinError, GetLastError, FormatError
-from ctypes.wintypes import COLORREF, BOOL, POINTER
import api
-import time
-import ui
+import controlTypes
+import globalPluginHandler
+import gui
+import oleacc
import speech
+import tones
+import ui
import virtualBuffers
+import winUser
+import wx
+from logHandler import log
+from NVDAObjects.IAccessible import IAccessible
+from win32con import (CS_HREDRAW, CS_VREDRAW, CW_USEDEFAULT, GWL_EXSTYLE,
+ GWL_STYLE, HS_BDIAGONAL, HS_DIAGCROSS, HWND_DESKTOP,
+ HWND_TOPMOST, IDC_ARROW, LWA_ALPHA, LWA_COLORKEY, NULL,
+ SW_HIDE, SW_SHOWNA, SWP_NOACTIVATE, WM_DESTROY,
+ WM_ERASEBKGND, WM_PAINT, WM_SHOWWINDOW, WM_TIMER,
+ WS_CAPTION, WS_DISABLED, WS_EX_APPWINDOW, WS_EX_LAYERED,
+ WS_EX_TOOLWINDOW, WS_EX_TRANSPARENT, WS_POPUP,
+ WS_VISIBLE)
from windowUtils import physicalToLogicalPoint
gdiplus = windll.gdiplus
https://bitbucket.org/nvdaaddonteam/focushighlight/commits/622857529777/
Changeset: 622857529777
Branch: stable
User: nishimotz
Date: 2018-10-11 08:39:23+00:00
Summary: merged AddonTemplate master
Affected #: 3 files
diff --git a/buildVars.py b/buildVars.py
index 7a80d44..70e6030 100644
--- a/buildVars.py
+++ b/buildVars.py
@@ -26,6 +26,10 @@ addon_info = {
"addon_url" : "https://github.com/nvdajp/focushighlight";,
# Documentation file name
"addon_docFileName" : "readme.html",
+ # Minimum NVDA version supported *e.g. "2018.3")
+ "addon_minimumNVDAVersion" : None,
+ # Add-on update channel (default is stable or None)
+ "addon_updateChannel" : None,
}
diff --git a/manifest.ini.tpl b/manifest.ini.tpl
index 7de43bf..e98c9d1 100644
--- a/manifest.ini.tpl
+++ b/manifest.ini.tpl
@@ -5,3 +5,5 @@ author = "{addon_author}"
url = {addon_url}
version = {addon_version}
docFileName = {addon_docFileName}
+minimumNVDAVersion = {addon_minimumNVDAVersion}
+updateChannel = {addon_updateChannel}
diff --git a/sconstruct b/sconstruct
index c28510b..2069cd1 100644
--- a/sconstruct
+++ b/sconstruct
@@ -11,7 +11,6 @@ import zipfile
import buildVars
-
def md2html(source, dest):
import markdown
lang = os.path.basename(os.path.dirname(source)).replace('_', '-')
@@ -51,10 +50,25 @@ def mdTool(env):
)
env['BUILDERS']['markdown']=mdBuilder
+vars = Variables()
+vars.Add("version", "The version of this build",
buildVars.addon_info["addon_version"])
+vars.Add(BoolVariable("dev", "Whether this is a daily development version",
False))
+vars.Add("channel", "Update channel for this build",
buildVars.addon_info["addon_updateChannel"])
-env = Environment(ENV=os.environ, tools=['gettexttool', mdTool])
+env = Environment(variables=vars, ENV=os.environ, tools=['gettexttool',
mdTool])
env.Append(**buildVars.addon_info)
+if env["dev"]:
+ import datetime
+ buildDate = datetime.datetime.now()
+ year, month, day = str(buildDate.year), str(buildDate.month),
str(buildDate.day)
+ env["addon_version"] = "".join([year, month.zfill(2), day.zfill(2),
"-dev"])
+ env["channel"] = "dev"
+elif env["version"] is not None:
+ env["addon_version"] = env["version"]
+if "channel" in env and env["channel"] is not None:
+ env["addon_updateChannel"] = env["channel"]
+
addonFile = env.File("${addon_name}-${addon_version}.nvda-addon")
def addonGenerator(target, source, env, for_signature):
@@ -67,7 +81,6 @@ def manifestGenerator(target, source, env, for_signature):
lambda target, source, env : "Generating manifest %s" % target[0])
return action
-
def translatedManifestGenerator(target, source, env, for_signature):
dir = os.path.abspath(os.path.join(os.path.dirname(str(source[0])),
".."))
lang = os.path.basename(dir)
@@ -90,8 +103,6 @@ def createAddonHelp(dir):
readmeTarget = env.Command(readmePath, "readme.md",
Copy("$TARGET", "$SOURCE"))
env.Depends(addon, readmeTarget)
-
-
def createAddonBundleFromPath(path, dest):
""" Creates a bundle from a directory that contains an addon manifest
file."""
basedir = os.path.abspath(path)
@@ -106,9 +117,12 @@ def createAddonBundleFromPath(path, dest):
return dest
def generateManifest(source, dest):
+ addon_info = buildVars.addon_info
+ addon_info["addon_version"] = env["addon_version"]
+ addon_info["addon_updateChannel"] = env["addon_updateChannel"]
with codecs.open(source, "r", "utf-8") as f:
manifest_template = f.read()
- manifest = manifest_template.format(**buildVars.addon_info)
+ manifest = manifest_template.format(**addon_info)
with codecs.open(dest, "w", "utf-8") as f:
f.write(manifest)
Repository URL: https://bitbucket.org/nvdaaddonteam/focushighlight/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
