[sikuli] 01/21: Merge branch 'upstream'
Gilles Filippini
pini at debian.org
Sat Nov 7 12:11:53 UTC 2015
This is an automated email from the git hooks/post-receive script.
pini pushed a commit to branch master
in repository sikuli.
commit 5a648b3e9c7b276e66db3e3fd6e8cb47cb290b29
Merge: 984c9ec 69e9446
Author: Gilles Filippini <pini at debian.org>
Date: Mon Nov 2 11:19:45 2015 +0100
Merge branch 'upstream'
.gitignore | 6 +-
API/pom.xml | 30 +-
API/scripts/testjs.sikuli/testjs.js | 1 +
API/scripts/testpy.sikuli/testpy.py | 7 +
.../java/edu/unh/iol/dlc/ConnectionController.java | 233 -
API/src/main/java/edu/unh/iol/dlc/FBConfig.java | 259 -
API/src/main/java/edu/unh/iol/dlc/Framebuffer.java | 253 -
API/src/main/java/edu/unh/iol/dlc/VNCClient.java | 545 --
API/src/main/java/edu/unh/iol/dlc/VNCRobot.java | 842 --
API/src/main/java/edu/unh/iol/dlc/VNCScreen.java | 508 --
API/src/main/java/edu/unh/iol/dlc/VNCThread.java | 315 -
API/src/main/java/org/sikuli/basics/Debug.java | 190 +-
.../java/org/sikuli/basics/ExtensionManager.java | 8 +-
.../main/java/org/sikuli/basics/FileManager.java | 2727 ++++---
.../java/org/sikuli/basics/HotkeyListener.java | 2 +-
.../main/java/org/sikuli/basics/HotkeyManager.java | 30 +-
.../java/org/sikuli/basics/LinuxHotkeyManager.java | 5 +-
.../java/org/sikuli/basics/MacHotkeyManager.java | 3 +-
.../java/org/sikuli/basics/PreferencesUser.java | 17 +
.../java/org/sikuli/basics/ResourceLoader.java | 1075 ---
API/src/main/java/org/sikuli/basics/Settings.java | 463 +-
.../java/org/sikuli/basics/SikulixForJython.java | 70 +-
.../main/java/org/sikuli/basics/SplashFrame.java | 5 +-
.../main/java/org/sikuli/basics/VDictProxy.java | 3 +-
.../org/sikuli/basics/WindowsHotkeyManager.java | 1 +
.../java/org/sikuli/guide/AnimationFactory.java | 26 +-
.../src/main/java/org/sikuli/guide/Animator.java | 14 +-
.../java/org/sikuli/guide/ClickableWindow.java | 30 +-
.../main/java/org/sikuli/guide/ComponentMover.java | 9 +-
.../sikuli/guide/GlobalMouseMotionListener.java | 0
.../org/sikuli/guide/GlobalMouseMotionTracker.java | 0
.../src/main/java/org/sikuli/guide/Guide.java | 162 +-
.../main/java/org/sikuli/guide/HTMLTextPane.java | 4 +-
.../src/main/java/org/sikuli/guide/IAnimator.java | 6 +-
API/src/main/java/org/sikuli/guide/Run.java | 49 +
.../main/java/org/sikuli/guide/ShadowRenderer.java | 4 +-
.../src/main/java/org/sikuli/guide/SxAnchor.java | 12 +-
.../src/main/java/org/sikuli/guide/SxArea.java | 16 +-
.../src/main/java/org/sikuli/guide/SxArrow.java | 11 +-
.../src/main/java/org/sikuli/guide/SxBeam.java | 12 +-
.../src/main/java/org/sikuli/guide/SxBracket.java | 9 +-
.../src/main/java/org/sikuli/guide/SxButton.java | 4 +-
.../src/main/java/org/sikuli/guide/SxCallout.java | 10 +-
.../src/main/java/org/sikuli/guide/SxCircle.java | 8 +-
.../main/java/org/sikuli/guide/SxClickable.java | 6 +-
.../src/main/java/org/sikuli/guide/SxFlag.java | 12 +-
.../src/main/java/org/sikuli/guide/SxHotspot.java | 20 +-
.../src/main/java/org/sikuli/guide/SxImage.java | 8 +-
.../src/main/java/org/sikuli/guide/SxMagnet.java | 54 +-
.../main/java/org/sikuli/guide/SxRectangle.java | 8 +-
.../main/java/org/sikuli/guide/SxSpotlight.java | 6 +-
.../src/main/java/org/sikuli/guide/SxText.java | 7 +-
.../java/org/sikuli/guide/TimeoutTransition.java | 0
.../src/main/java/org/sikuli/guide/Tracker.java | 18 +-
.../src/main/java/org/sikuli/guide/Transition.java | 0
.../java/org/sikuli/guide/TransitionDialog.java | 2 +-
.../src/main/java/org/sikuli/guide/Visual.java | 187 +-
.../java/org/sikuli/natives/DebugCategories.java | 15 -
.../main/java/org/sikuli/natives/FindInput.java | 122 -
.../main/java/org/sikuli/natives/FindResult.java | 94 -
.../main/java/org/sikuli/natives/FindResults.java | 78 -
.../main/java/org/sikuli/natives/LinuxUtil.java | 145 +-
API/src/main/java/org/sikuli/natives/MacUtil.java | 192 +-
API/src/main/java/org/sikuli/natives/Mat.java | 42 -
API/src/main/java/org/sikuli/natives/OCR.java | 46 -
API/src/main/java/org/sikuli/natives/OCRChar.java | 50 -
API/src/main/java/org/sikuli/natives/OCRChars.java | 78 -
API/src/main/java/org/sikuli/natives/OCRLine.java | 50 -
API/src/main/java/org/sikuli/natives/OCRLines.java | 78 -
.../main/java/org/sikuli/natives/OCRParagraph.java | 46 -
.../java/org/sikuli/natives/OCRParagraphs.java | 78 -
API/src/main/java/org/sikuli/natives/OCRRect.java | 78 -
API/src/main/java/org/sikuli/natives/OCRText.java | 54 -
API/src/main/java/org/sikuli/natives/OCRWord.java | 58 -
API/src/main/java/org/sikuli/natives/OCRWords.java | 78 -
API/src/main/java/org/sikuli/natives/OSUtil.java | 39 +-
.../main/java/org/sikuli/natives/RunNatives.java | 9 -
.../org/sikuli/natives/SWIGTYPE_p_cv__Rect.java | 26 -
.../main/java/org/sikuli/natives/TARGET_TYPE.java | 17 -
API/src/main/java/org/sikuli/natives/Vision.java | 90 -
.../main/java/org/sikuli/natives/VisionProxy.java | 16 -
.../java/org/sikuli/natives/VisionProxyJNI.java | 162 -
API/src/main/java/org/sikuli/natives/WinUtil.java | 280 +-
.../common/CommandLineExecutor.java | 11 +
.../remoteinterfaces/common/FileProcessor.java | 23 +
.../sikuli/remoteinterfaces/common/Sikulix.java | 21 +
.../sikuli/remoteinterfaces/entities/Command.java | 15 +
.../sikuli/remoteinterfaces/entities/Image.java | 12 +
API/src/main/java/org/sikuli/script/App.java | 969 ++-
API/src/main/java/org/sikuli/script/Commands.java | 575 ++
API/src/main/java/org/sikuli/script/Device.java | 150 +-
API/src/main/java/org/sikuli/script/Env.java | 18 +-
API/src/main/java/org/sikuli/script/Finder.java | 307 +-
API/src/main/java/org/sikuli/script/Image.java | 424 +-
.../main/java/org/sikuli/script/ImageFinder.java | 2 +
.../main/java/org/sikuli/script/ImageGroup.java | 2 +
.../main/java/org/sikuli/script/ImageLocator.java | 6 +-
API/src/main/java/org/sikuli/script/ImagePath.java | 237 +-
API/src/main/java/org/sikuli/script/Key.java | 87 +-
API/src/main/java/org/sikuli/script/Location.java | 11 +-
API/src/main/java/org/sikuli/script/Match.java | 46 +-
API/src/main/java/org/sikuli/script/Mouse.java | 131 +-
.../main/java/org/sikuli/script/ObserveEvent.java | 44 +-
API/src/main/java/org/sikuli/script/Observer.java | 39 +-
.../java/org/sikuli/script/ObserverCallBack.java | 76 +
API/src/main/java/org/sikuli/script/Pattern.java | 4 +-
API/src/main/java/org/sikuli/script/Region.java | 8193 +++++++++++---------
.../main/java/org/sikuli/script/RobotDesktop.java | 165 +-
API/src/main/java/org/sikuli/script/Run.java | 195 +
API/src/main/java/org/sikuli/script/RunServer.java | 508 ++
API/src/main/java/org/sikuli/script/RunTime.java | 2761 +++++++
API/src/main/java/org/sikuli/script/Runner.java | 1097 +++
API/src/main/java/org/sikuli/script/Screen.java | 299 +-
.../main/java/org/sikuli/script/ScreenImage.java | 92 +-
.../main/java/org/sikuli/script/ScreenUnion.java | 20 +-
API/src/main/java/org/sikuli/script/Sikulix.java | 899 ++-
.../java/org/sikuli/script/SikulixForJython.java | 73 +
.../java/org/sikuli/script/TextRecognizer.java | 52 +-
.../main/java/org/sikuli/util}/CommandArgs.java | 27 +-
.../java/org/sikuli/util}/CommandArgsEnum.java | 8 +-
.../org/sikuli/{script => util}/EventObserver.java | 2 +-
.../org/sikuli/{script => util}/EventSubject.java | 2 +-
.../main/java/org/sikuli/util/JythonHelper.java | 738 ++
.../main/java/org/sikuli/util/LinuxSupport.java | 425 +
.../{script => util}/OverlayCapturePrompt.java | 33 +-
.../{script => util}/OverlayTransparentWindow.java | 4 +-
.../sikuli/{script => util}/ScreenHighlighter.java | 20 +-
.../java/org/sikuli/{basics => util}/SysJNA.java | 4 +-
API/src/main/java/org/sikuli/util/Tests.java | 295 +
API/src/main/resources/Commands/mac/runsikulix | 52 -
.../main/resources/ImagesAPI.sikuli/ImagesAPI.py | 9 +
.../{Images => ImagesAPI.sikuli}/SikuliLogo.png | Bin
.../main/resources/ImagesAPI.sikuli/btnnightly.png | Bin 0 -> 2976 bytes
.../main/resources/ImagesAPI.sikuli/firefox.png | Bin 0 -> 39066 bytes
.../main/resources/ImagesAPI.sikuli/netbicons.png | Bin 0 -> 1337 bytes
.../main/resources/ImagesAPI.sikuli/netblogo.png | Bin 0 -> 781 bytes
.../main/resources/ImagesAPI.sikuli/nightly.png | Bin 0 -> 3677 bytes
.../main/resources/ImagesAPI.sikuli/quickstart.png | Bin 0 -> 2331 bytes
.../main/resources/ImagesAPI.sikuli/raimanlogo.png | Bin 0 -> 17777 bytes
.../main/resources/ImagesAPI.sikuli/sxpower.png | Bin 0 -> 35166 bytes
API/src/main/resources/JavaScript/commands.js | 175 +
.../src/main/resources/Lib}/guide/__init__.py | 0
.../src/main/resources/Lib}/guide/guide.py | 459 +-
API/src/main/resources/Lib/sikuli/Region.py | 42 +-
API/src/main/resources/Lib/sikuli/Screen.py | 4 +
API/src/main/resources/Lib/sikuli/Sikuli.py | 207 +-
.../main/resources/Lib/sikuli/SikuliImporter.py | 44 +-
.../{SikuliImporter.py => SikuliImporter_1.0.1.py} | 20 +-
API/src/main/resources/Support/Linux/runBuild | 56 +
.../java/edu/unh/iol/dlc/ProtocolVersionTest.java | 27 +
.../java/edu/unh/iol/dlc/VersionParserTest.java | 85 +
API/src/test/java/org/sikuli/script/APITest.java | 16 +-
Guide/README.md | 8 -
Guide/pom.xml | 31 -
IDE/pom.xml | 212 +-
IDE/src/main/java/org/sikuli/ide/AutoUpdater.java | 10 +-
.../main/java/org/sikuli/ide/ButtonCapture.java | 61 +-
.../java/org/sikuli/ide/CloseableTabbedPane.java | 4 +-
.../java/org/sikuli/ide/EditorConsolePane.java | 8 +-
IDE/src/main/java/org/sikuli/ide/EditorPane.java | 432 +-
.../java/org/sikuli/ide/EditorPatternButton.java | 34 +-
.../java/org/sikuli/ide/EditorPatternLabel.java | 34 +-
.../java/org/sikuli/ide/EditorRegionButton.java | 14 +-
.../java/org/sikuli/ide/EditorRegionLabel.java | 16 +-
.../java/org/sikuli/ide/EditorViewFactory.java | 24 +-
.../main/java/org/sikuli/ide/ExtensionItem.java | 2 +-
.../java/org/sikuli/ide/ExtensionManagerFrame.java | 3 +-
.../java/org/sikuli/ide/PatternPaneNaming.java | 369 +-
.../java/org/sikuli/ide/PatternPaneScreenshot.java | 31 +-
.../org/sikuli/ide/PatternPaneTargetOffset.java | 51 +-
.../org/sikuli/ide/PatternSimilaritySlider.java | 2 +-
.../main/java/org/sikuli/ide/PatternWindow.java | 117 +-
.../main/java/org/sikuli/ide/PreferencesWin.java | 4 +-
.../java/org/sikuli/ide/PreferencesWindowMore.form | 84 +-
.../java/org/sikuli/ide/PreferencesWindowMore.java | 95 +-
.../main/java/org/sikuli/ide/PreviewWindow.java | 2 +-
IDE/src/main/java/org/sikuli/ide/SikuliIDE.java | 630 +-
.../main/java/org/sikuli/ide/SikuliIDEI18N.java | 16 +-
.../java/org/sikuli/ide/SikuliIDEPopUpMenu.java | 27 +-
.../java/org/sikuli/ide/SikuliIDESettings.java | 14 -
.../java/org/sikuli/ide/SikuliIDEStatusBar.java | 2 +-
IDE/src/main/java/org/sikuli/ide/Sikulix.java | 23 +
.../main/java/org/sikuli/idesupport/IDESplash.java | 62 +
.../org/sikuli/scriptrunner/JRubyScriptRunner.java | 88 +-
.../sikuli/scriptrunner/JythonScriptRunner.java | 273 +-
.../{ScriptRunner.java => ScriptingSupport.java} | 1320 ++--
IDE/src/main/resources/i18n/IDE/IDE-it.po | 620 ++
IDE/src/main/resources/i18n/IDE_it.properties | 132 +
IDE/src/main/resources/i18n/IDE_ru.properties | 1 +
.../src/main/resources/scripts/sikuli2html.py | 0
JRubyAddOns/pom.xml | 103 -
JRubyGem/README.md | 11 +-
JRubyGem/lib/sikulix/sikulix.rb | 144 +-
JRubyGem/pom.xml | 4 +-
JRubyGem/sikulix.gemspec | 4 +-
Jygments4SikuliX/pom.xml | 7 +-
Libslux/README.md | 8 +
{Libsvision => Libslux}/pom.xml | 8 +-
.../src/main/java/org/sikuli/libslux/Sikulix.java | 28 +
.../main/resources/srcnativelibs}/Vision/cvgui.cpp | 0
.../main/resources/srcnativelibs}/Vision/cvgui.h | 0
.../resources/srcnativelibs}/Vision/find-result.h | 0
.../resources/srcnativelibs}/Vision/finder.cpp | 0
.../main/resources/srcnativelibs}/Vision/finder.h | 0
.../resources/srcnativelibs}/Vision/opencv.hpp | 0
.../Vision/pyramid-template-matcher.cpp | 0
.../Vision/pyramid-template-matcher.h | 0
.../srcnativelibs}/Vision/sikuli-debug.cpp | 0
.../resources/srcnativelibs}/Vision/sikuli-debug.h | 0
.../resources/srcnativelibs}/Vision/tessocr.cpp | 0
.../main/resources/srcnativelibs}/Vision/tessocr.h | 0
.../resources/srcnativelibs}/Vision/vision.cpp | 0
.../main/resources/srcnativelibs}/Vision/vision.h | 0
.../resources/srcnativelibs}/Vision/vision.swig | 0
Libsvision/README.md | 5 -
.../main/java/native/Vision/visionJAVA_wrap.cxx | 2681 -------
.../main/java/org/sikuli/libsvision/Sikulix.java | 25 -
README.md | 94 +-
Remote/README.md | 29 -
Remote/pom.xml | 39 -
Remote/src/main/java/org/sikuli/remote/Server.java | 419 -
Setup/pom.xml | 96 +-
Setup/src/main/java/org/sikuli/setup/RunSetup.java | 2950 +++----
.../main/java/org/sikuli/setup/SetUpSelect.form | 119 +-
.../main/java/org/sikuli/setup/SetUpSelect.java | 126 +-
.../src/main/resources/Commands/linux/runsikulix | 0
Setup/src/main/resources/Commands/mac/runsikulix | 21 +
.../main/resources/Commands/windows/runsikulix.cmd | 35 +-
.../src/main/resources/Images/SikuliLogo.png | Bin
.../SikuliX-1.1.0-Beta-Supplemental-Linux.zip | Bin 54018 -> 0 bytes
Setup/src/main/resources/collectJars | 75 -
Setup/src/main/resources/collectJars.bat | 57 -
Setup/src/main/resources/complete.xml | 26 -
.../main/resources/{ => content}/createJavadocs | 2 +
.../src/main/resources/content/deployapi.xml | 37 +-
.../src/main/resources/content/deploylux.xml | 58 +-
.../src/main/resources/content/deploymac.xml | 60 +-
Setup/src/main/resources/content/deploysetup.xml | 158 +
.../src/main/resources/content/deploysetupapi.xml | 108 +-
.../src/main/resources/content/deploysetupide.xml | 157 +
.../src/main/resources/content/deploywin.xml | 60 +-
Setup/src/main/resources/{ => content}/ide-fat.xml | 3 +-
.../main/resources/content/nightlybuildindex.html | 130 +
.../resources/content/nightlybuildindextail.html | 339 +
Setup/src/main/resources/{ => content}/plain.xml | 5 +-
Setup/src/main/resources/deployglobal.xml | 28 -
Setup/src/main/resources/idejruby-fat.xml | 21 -
Setup/src/main/resources/jenkinsBuild.xml | 157 -
.../src/main/resources/macapp/Contents/Info.plist | 56 +
.../macapp/Contents/MacOS/JavaAppLauncher | 288 +
Setup/src/main/resources/macapp/Contents/PkgInfo | 1 +
.../macapp/Contents/Resources/sikulix.icns | Bin 0 -> 220867 bytes
.../macapp/Contents/Resources/sikulixsrc.icns | Bin 0 -> 105949 bytes
Setup/src/main/resources/macapp/run | 21 +
Setup/src/main/resources/nightlybuildindex.html | 73 -
.../src/main/resources/nightlybuildindextail.html | 75 -
{APIFat => SetupAPI}/README.md | 0
{APIFat => SetupAPI}/pom.xml | 38 +-
.../sikulix/sikulixsetupAPI/SikulixsetupAPI.java | 9 +
{IDEFat => SetupIDE}/README.md | 0
{IDEFat => SetupIDE}/pom.xml | 11 +-
.../sikulix/sikulixsetupIDE/SikulixsetupIDE.java | 9 +
Tesseract4SikuliX/README.md | 8 -
Tesseract4SikuliX/pom.xml | 41 -
.../src/main/java/org/sikuli/tesseract/Run.java | 111 -
.../main/java/org/sikuli/tesseract/TessAPI.java | 703 --
.../org/sikuli/tesseract/TesseractException.java | 36 -
TestRunMaven/pom.xml | 11 +-
.../src/main/java/com/sikulix/testrun/TestRun.java | 102 +-
.../main/resources/ImagesAPI.sikuli/ImagesAPI.py | 27 +
.../resources/ImagesAPI.sikuli}/SikuliLogo.png | Bin
.../main/resources/ImagesAPI.sikuli/ZEITmacapp.png | Bin 0 -> 1719 bytes
.../main/resources/ImagesAPI.sikuli/btnnightly.png | Bin 0 -> 2976 bytes
.../main/resources/ImagesAPI.sikuli/netblogo.png | Bin 0 -> 781 bytes
.../main/resources/ImagesAPI.sikuli/nightly.png | Bin 0 -> 3677 bytes
.../main/resources/ImagesAPI.sikuli/raimanlogo.png | Bin 0 -> 17777 bytes
.../main/resources/ImagesAPI.sikuli/testfolder.png | Bin 0 -> 1464 bytes
.../images/images.sikuli/1407483427918.png | Bin 574 -> 0 bytes
.../main/resources/images/images.sikuli/image.png | Bin 2272 -> 0 bytes
.../main/resources/images/images.sikuli/images.py | 7 -
.../main/resources/images/richi.sikuli/richi.py | 28 -
.../src/main/resources/images/test.sikuli/test.py | 2 -
.../main/resources/images/test1.sikuli/test1.py | 1 -
TestScripts/csvread.sikuli/csvdata.txt | 7 +
TestScripts/csvread.sikuli/csvread.py | 33 +
TestScripts/dragDrop.sikuli/dragDrop.py | 24 +
TestScripts/dragDrop.sikuli/logo.png | Bin 0 -> 5690 bytes
TestScripts/dragDropWin.sikuli/dragDropWin.py | 20 +
TestScripts/guide/guide.py | 44 +
TestScripts/guide/logo.png | Bin 0 -> 16024 bytes
TestScripts/longrun/longrun.js | 49 +
TestScripts/longrun/longrun.sikuli/close.png | Bin 0 -> 1195 bytes
TestScripts/longrun/longrun.sikuli/form.png | Bin 0 -> 1302 bytes
TestScripts/longrun/longrun.sikuli/knowhow.png | Bin 0 -> 3826 bytes
TestScripts/longrun/longrun.sikuli/longrun.py | 13 +
TestScripts/longrun/longrun.sikuli/quickstart.png | Bin 0 -> 2331 bytes
TestScripts/longrun/longrun.sikuli/reply.png | Bin 0 -> 853 bytes
TestScripts/longrun/longrun.sikuli/stories.png | Bin 0 -> 2257 bytes
TestScripts/longrun/longrun.sikuli/sxpower.png | Bin 0 -> 35166 bytes
TestScripts/longrun/longrun.sikuli/topic.png | Bin 0 -> 4805 bytes
TestScripts/mouseAbort/mouseAbort.js | 16 +
TestScripts/mouseAbort/mouseAbort.sikuli/logo.png | Bin 0 -> 17843 bytes
.../mouseAbort/mouseAbort.sikuli/mouseAbort.py | 15 +
TestScripts/multi/captureAll.sikuli/captureAll.py | 7 +
TestScripts/selenium/selenium.py | 59 +
TestScripts/showcase/quickstart.png | Bin 0 -> 2331 bytes
TestScripts/showcase/showcase.js | 20 +
TestScripts/showcase/sxpower.png | Bin 0 -> 35166 bytes
TestScripts/showcaseAppAnnie/appAnnie.png | Bin 0 -> 2967 bytes
TestScripts/showcaseAppAnnie/imgFree.png | Bin 0 -> 4314 bytes
TestScripts/showcaseAppAnnie/imgIOS.png | Bin 0 -> 3353 bytes
TestScripts/showcaseAppAnnie/imgITUNES.png | Bin 0 -> 1122 bytes
TestScripts/showcaseAppAnnie/imgPop1.png | Bin 0 -> 5109 bytes
TestScripts/showcaseAppAnnie/imgPreview.png | Bin 0 -> 7844 bytes
TestScripts/showcaseAppAnnie/imgTitle.png | Bin 0 -> 6640 bytes
TestScripts/showcaseAppAnnie/imgView.png | Bin 0 -> 1802 bytes
TestScripts/showcaseAppAnnie/showcaseAppAnnie.py | 118 +
TestScripts/showcasePY.sikuli/quickstart.png | Bin 0 -> 2331 bytes
TestScripts/showcasePY.sikuli/showcasePY.py | 22 +
TestScripts/showcasePY.sikuli/sxpower.png | Bin 0 -> 35166 bytes
TestScripts/showcaseRB/quickstart.png | Bin 0 -> 2331 bytes
TestScripts/showcaseRB/showcaseRB.rb | 21 +
TestScripts/showcaseRB/sxpower.png | Bin 0 -> 35166 bytes
WindowsExe/run.cmd | 6 +
WindowsExe/sikulix.xml | 26 +
pom.xml | 272 +-
runSetup | 1 +
327 files changed, 24736 insertions(+), 21639 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git
More information about the pkg-java-commits
mailing list