lp://staging/~vgod/sikuli/sandbox

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/sikuli/obsolete at revision 773

Tsung-Hsiang Chang: Pending requested 2011-08-21

Diff: 2405 lines (+1256/-770)

30 files modified

sikuli-ide/CMakeLists.txt (+4/-12)
sikuli-ide/src/main/java/org/sikuli/ide/NativeLayer.java (+7/-10)
sikuli-ide/src/main/java/org/sikuli/ide/NativeLayerForLinux.java (+11/-88)
sikuli-ide/src/main/java/org/sikuli/ide/NativeLayerForMac.java (+72/-213)
sikuli-ide/src/main/java/org/sikuli/ide/NativeLayerForWindows.java (+12/-68)
sikuli-ide/src/main/java/org/sikuli/ide/PreferencesWin.java (+1/-1)
sikuli-ide/src/main/java/org/sikuli/ide/SikuliIDE.java (+17/-4)
sikuli-ide/src/main/native/CMakeLists.txt (+0/-65)
sikuli-ide/src/main/native/NativeLayerForMac.cc (+0/-114)
sikuli-ide/src/main/native/org_sikuli_ide_NativeLayerForMac.h (+0/-29)
sikuli-script/CMakeLists.txt (+69/-0)
sikuli-script/hudson-test.xml (+1/-0)
sikuli-script/src/main/java/CMakeLists.txt (+13/-3)
sikuli-script/src/main/java/org/sikuli/script/DesktopRobot.java (+1/-153)
sikuli-script/src/main/java/org/sikuli/script/Env.java (+13/-0)
sikuli-script/src/main/java/org/sikuli/script/HotkeyEvent.java (+22/-0)
sikuli-script/src/main/java/org/sikuli/script/HotkeyListener.java (+11/-0)
sikuli-script/src/main/java/org/sikuli/script/Key.java (+162/-0)
sikuli-script/src/main/java/org/sikuli/script/internal/hotkey/HotkeyManager.java (+99/-0)
sikuli-script/src/main/java/org/sikuli/script/internal/hotkey/LinuxHotkeyManager.java (+106/-0)
sikuli-script/src/main/java/org/sikuli/script/internal/hotkey/MacHotkeyManager.java (+171/-0)
sikuli-script/src/main/java/org/sikuli/script/internal/hotkey/WindowsHotkeyManager.java (+88/-0)
sikuli-script/src/main/native/CMakeLists.txt (+14/-5)
sikuli-script/src/main/native/MacHotkeyManager.cc (+170/-0)
sikuli-script/src/main/native/org_sikuli_script_internal_hotkey_MacHotkeyManager.h (+45/-0)
sikuli-script/src/main/native/sikuli-debug.cpp (+4/-4)
sikuli-script/src/main/python/sikuli/Env.py (+15/-0)
sikuli-script/src/main/python/sikuli/Sikuli.py (+1/-1)
sikuli-script/src/test/java/org/sikuli/script/HotkeyTest.java (+81/-0)
sikuli-script/src/test/python/test_hotkey.py (+46/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

794. By Tsung-Hsiang Chang <email address hidden> on 2011-08-21

merged

793. By Tsung-Hsiang Chang <email address hidden> on 2011-08-21

refactoring: hotkey managers accept Sikuli's Key class instead of Java key code

792. By Tsung-Hsiang Chang <email address hidden> on 2011-08-21

add Key.toJavaKeyCode.
clear DesktopRobot

791. By Tsung-Hsiang Chang <email address hidden> on 2011-08-21

fixed LinuxHotkeyManager.cleanUp
hotkey tested on Linux

790. By Tsung-Hsiang Chang <email address hidden> on 2011-08-21

merged

789. By Tsung-Hsiang Chang <email address hidden> on 2011-08-21

fixed makefile

788. By Tsung-Hsiang Chang <email address hidden> on 2011-08-21

add Python API: Env.addHotkey, Env.removeHotkey

787. By Tsung-Hsiang Chang <email address hidden> on 2011-08-20

clean debug messages for hotkey managers

786. By Tsung-Hsiang Chang <email address hidden> on 2011-08-20

clear makefile

785. By Tsung-Hsiang Chang <email address hidden> on 2011-08-20

add LinuxHotkeyManager