commit/StationPlaylist: 2 new changesets
- From: commits-noreply@xxxxxxxxxxxxx
- To: nvda-addons-commits@xxxxxxxxxxxxx
- Date: Sat, 28 Mar 2015 17:13:50 -0000
2 new commits in StationPlaylist:
https://bitbucket.org/nvdaaddonteam/stationplaylist/commits/e6e96c170c71/
Changeset: e6e96c170c71
Branch: None
User: josephsl
Date: 2015-03-18 19:37:07+00:00
Summary: Touchscreen support (5.0-dev): First stage for supporting
touchscreen commands.
Added a new SPL mode for performing Studio-specific touch commands. So far,
alarm dialogs are assigned to touch commands.
Affected #: 1 file
diff --git a/addon/appModules/splstudio/__init__.py
b/addon/appModules/splstudio/__init__.py
index d1b55be..74a89c6 100755
--- a/addon/appModules/splstudio/__init__.py
+++ b/addon/appModules/splstudio/__init__.py
@@ -11,7 +11,6 @@
# Minimum version: SPL 5.00, NvDA 2014.3.
import ctypes
-from ctypes import wintypes
from functools import wraps
import os
import time
@@ -27,6 +26,7 @@ import ui
import nvwave
import speech
import braille
+import touchHandler
import gui
import wx
from winUser import user32, sendMessage
@@ -405,6 +405,25 @@ class AppModule(appModuleHandler.AppModule):
self.monitorLibraryScan()
nextHandler()
+ # Add or remove SPL-specific touch commands.
+ # Code comes from Enhanced Touch Gestures add-on from the same author.
+ # This may change if NVDA core decides to abandon touch mode concept.
+
+ def event_appModule_gainFocus(self):
+ tones.beep(512, 200)
+ if "SPL" not in touchHandler.availableTouchModes:
+ touchHandler.availableTouchModes.append("SPL")
+
+ def event_appModule_loseFocus(self):
+ tones.beep(1024, 200)
+ # Switch to object mode.
+ touchHandler.handler._curTouchMode =
touchHandler.availableTouchModes[1]
+ if "SPL" in touchHandler.availableTouchModes:
+ # If we have too many touch modes, pop all except the
original entries.
+ for mode in touchHandler.availableTouchModes:
+ if mode == "SPL":
touchHandler.availableTouchModes.pop()
+
+
# Save configuration when terminating.
def terminate(self):
super(AppModule, self).terminate()
@@ -1211,7 +1230,9 @@ class AppModule(appModuleHandler.AppModule):
"kb:shift+nvda+f12":"sayBroadcasterTime",
"kb:control+nvda+1":"toggleBeepAnnounce",
"kb:control+nvda+2":"setEndOfTrackTime",
+ "ts(SPL):2finger_flickRight":"setEndOfTrackTime",
"kb:alt+nvda+2":"setSongRampTime",
+ "ts(SPL):2finger_flickLeft":"setSongRampTime",
"kb:control+nvda+4":"setMicAlarm",
"kb:control+nvda+f":"findTrack",
"kb:nvda+f3":"findTrackNext",
https://bitbucket.org/nvdaaddonteam/stationplaylist/commits/190ff27c1658/
Changeset: 190ff27c1658
Branch: master
User: josephsl
Date: 2015-03-28 17:05:25+00:00
Summary: Merged wacom branch, officially supports touchscreen input
Affected #: 1 file
diff --git a/addon/appModules/splstudio/__init__.py
b/addon/appModules/splstudio/__init__.py
index 8978c6a..0849d41 100755
--- a/addon/appModules/splstudio/__init__.py
+++ b/addon/appModules/splstudio/__init__.py
@@ -11,7 +11,6 @@
# Minimum version: SPL 5.00, NvDA 2014.3.
import ctypes
-from ctypes import wintypes
from functools import wraps
import os
import time
@@ -27,6 +26,7 @@ import ui
import nvwave
import speech
import braille
+import touchHandler
import gui
import wx
from winUser import user32, sendMessage
@@ -408,6 +408,25 @@ class AppModule(appModuleHandler.AppModule):
self.monitorLibraryScan()
nextHandler()
+ # Add or remove SPL-specific touch commands.
+ # Code comes from Enhanced Touch Gestures add-on from the same author.
+ # This may change if NVDA core decides to abandon touch mode concept.
+
+ def event_appModule_gainFocus(self):
+ tones.beep(512, 200)
+ if "SPL" not in touchHandler.availableTouchModes:
+ touchHandler.availableTouchModes.append("SPL")
+
+ def event_appModule_loseFocus(self):
+ tones.beep(1024, 200)
+ # Switch to object mode.
+ touchHandler.handler._curTouchMode =
touchHandler.availableTouchModes[1]
+ if "SPL" in touchHandler.availableTouchModes:
+ # If we have too many touch modes, pop all except the
original entries.
+ for mode in touchHandler.availableTouchModes:
+ if mode == "SPL":
touchHandler.availableTouchModes.pop()
+
+
# Save configuration when terminating.
def terminate(self):
super(AppModule, self).terminate()
@@ -1215,7 +1234,9 @@ class AppModule(appModuleHandler.AppModule):
"kb:shift+nvda+f12":"sayBroadcasterTime",
"kb:control+nvda+1":"toggleBeepAnnounce",
"kb:control+nvda+2":"setEndOfTrackTime",
+ "ts(SPL):2finger_flickRight":"setEndOfTrackTime",
"kb:alt+nvda+2":"setSongRampTime",
+ "ts(SPL):2finger_flickLeft":"setSongRampTime",
"kb:control+nvda+4":"setMicAlarm",
"kb:control+nvda+f":"findTrack",
"kb:nvda+f3":"findTrackNext",
Repository URL: https://bitbucket.org/nvdaaddonteam/stationplaylist/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
Other related posts:
