From c7d191b5e61cd72f8b838ea49b00e208a7a51754 Mon Sep 17 00:00:00 2001 From: bruno Date: Sun, 29 Mar 2015 12:15:02 -0300 Subject: [PATCH] Correção no bdrag e no inno setup --- Clipboard/Clipboard.py | 2 +- autohotkey/BKing.ahk | 72 ------------------------------------------------------------------------ autohotkey/Bdrag.ahk | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ install/inno setup/user_install.bat | 11 ++++++----- install/inno setup/user_install.iss | 20 ++++++++------------ plugin/Plugin-x86/CorePlugin.dll | Bin 65024 -> 0 bytes plugin/Plugin-x86/CorePlugin.lib | Bin 2148 -> 0 bytes src/pyTradutor.cpp | 4 ++-- 8 files changed, 72 insertions(+), 92 deletions(-) delete mode 100644 autohotkey/BKing.ahk create mode 100644 autohotkey/Bdrag.ahk diff --git a/Clipboard/Clipboard.py b/Clipboard/Clipboard.py index ab3005e..84decbb 100644 --- a/Clipboard/Clipboard.py +++ b/Clipboard/Clipboard.py @@ -19,7 +19,7 @@ def clip(): if isinstance(text, unicode): return text.encode("utf-8") else: - return "SELECIONE UM TEXTO" + return "ESCOLHER TEXTO CERTO" def bdragOn(): global process diff --git a/autohotkey/BKing.ahk b/autohotkey/BKing.ahk deleted file mode 100644 index 4bf3eba..0000000 --- a/autohotkey/BKing.ahk +++ /dev/null @@ -1,72 +0,0 @@ - - -#SingleInstance,Reload ; Mantem apenas uma versão executando -SetBatchLines,-1 ; Não permite o script entrar em modo sleep -CoordMode,Mouse - -SysGet,x,68 -SysGet,y,69 - -~^a:: - Gosub,COPIAR -return - -~+LButton Up:: - Gosub,COPIAR -Return - -~LButton:: - MouseGetPos,coordx_old,coordy_old,winid_old -Return - -~LButton Up:: - MouseGetPos,coordx,coordy,winid - VarSetCapacity(rect, 16) - - DllCall("GetClientRect", "uint", winid_old, "uint", &rect) - rect_left :=NumGet(rect,0, "int") - rect_top :=NumGet(rect,4, "int") - rect_right :=NumGet(rect,8, "int") - rect_bottom:=NumGet(rect,12,"int") - If (winid=winid_old And (coordxcoordx_old+x Or coordycoordy_old+y)) - If (coordx_old>=rect_left And coordx_old<=rect_right And coordy_old>=rect_top And coordy_old<=rect_bottom) - Gosub,COPIAR - - ticks = %A_TickCount% - difticks = %ticks% - EnvSub,difticks,%oldticks% - - If difticks<400 - If (coordx_old>=rect_left And coordx_old<=rect_right And coordy_old>=rect_top And coordy_old<=rect_bottom) - Gosub,COPIAR - oldticks=%ticks% -Return - -COPIAR: - Sleep,400 - clip=%Clipboardall% - Clipboard= - Send,^c - ClipWait,1 - If Clipboard= - Clipboard=%clip% -Return - -EXIT: -ExitApp - - - - - - - - - - - - - - - - diff --git a/autohotkey/Bdrag.ahk b/autohotkey/Bdrag.ahk new file mode 100644 index 0000000..2a7a94e --- /dev/null +++ b/autohotkey/Bdrag.ahk @@ -0,0 +1,55 @@ +;######################## CÓPIA AUTOMÁTICA ########################## +;# Bruno Santos # +;# brunosantos@lavid.ufpb.br # +;##################################################################### + +#SingleInstance,Reload ;Mantem apenas uma versão executando +SetBatchLines,-1 ;Não permite o script entrar em modo sleep +CoordMode,Mouse + +~^a:: + Gosub,COPIAR +return + +~+LButton Up:: + Gosub,COPIAR +Return + +~LButton:: + MouseGetPos,coordx_old,coordy_old,winid_old +Return + +~LButton Up:: + MouseGetPos,coordx,coordy,winid + + if ((coordx < coordx_old ) or (coordx > coordx_old ) or (coordy < coordy_old) or (coordy > coordy_old )) + { + Gosub,COPIAR + } + + ticks = %A_TickCount% + difticks = %ticks% + EnvSub,difticks,%oldticks% + + if (difticks < 400) + { + Gosub,COPIAR + } + oldticks=%ticks% + +Return + +COPIAR: + clip=%Clipboardall% + Clipboard= + Send,^c + + if Clipboard= + Clipboard=%clip% + +Return + +EXIT: +ExitApp + + diff --git a/install/inno setup/user_install.bat b/install/inno setup/user_install.bat index 4cea320..c233a65 100644 --- a/install/inno setup/user_install.bat +++ b/install/inno setup/user_install.bat @@ -15,11 +15,10 @@ CLS @ECHO off ECHO ############### Instalando VLibras ############### -::################# Variáveis de Ambiente ################# +::################# Variáveis de Ambiente ################# ECHO Exportando Variaveis de Ambiente: -::Váriaveis Permanentes (Sistema) ECHO AELIUS_DATA SETX AELIUS_DATA %HOMEDRIVE%\vlibras-libs\aelius_data /M @@ -41,9 +40,7 @@ If NOT "%path_value%"=="%path_value:vlibras=%" ( SETX "PATH" "%PATH%";%HOMEDRIVE%\vlibras-libs\bin;%HOMEDRIVE%\Python27;%HOMEDRIVE%\Python27\Scripts;%HOMEDRIVE%\Python27\Lib\site-packages /M ) -::Código executa a partir desse ponto caso o usuário não precise configurar as variáveis de ambiente ::################# Instalação do Python ################# - msiexec /i python-2.7.9.msi /passive ECHO OK @@ -75,8 +72,12 @@ ECHO OK c:\Python27\Scripts\pip install nltk-3.0.2-py2.py3-none-any.whl ECHO OK -::################# HUNPOS.PY ############################# +c:\Python27\Scripts\pip install future-0.14.3-py2-none-any.whl +ECHO OK + +::################# HUNPOS.PY & DATA.PY ############################# COPY %HOMEDRIVE%\vlibras-libs\nltk_data\hunpos.py %homedrive%\Python27\Lib\site-packages\nltk\tag\ /y COPY %HOMEDRIVE%\vlibras-libs\nltk_data\data.py %homedrive%\Python27\Lib\site-packages\nltk /y +COPY %HOMEDRIVE%\vlibras-libs\nltk_data\nltk_tgrep.py %homedrive%\Python27\Lib\site-packages /y ECHO VLibras Tradutor instalado com sucesso! diff --git a/install/inno setup/user_install.iss b/install/inno setup/user_install.iss index dc094a6..175f291 100644 --- a/install/inno setup/user_install.iss +++ b/install/inno setup/user_install.iss @@ -4,9 +4,9 @@ ;##################################################################### #define MyAppName "VLibras" -#define MyAppVersion "1.0" +#define MyAppVersion "beta" #define MyAppPublisher "LAViD" -#define MyAppURL "http://www.lavid.ufpb.br" +#define MyAppURL "http://www.vlibrasplayer.lavid.ufpb.br" #define MyAppExeName "Playerx86.exe" [Setup] @@ -23,14 +23,11 @@ DefaultGroupName={#MyAppName} DisableProgramGroupPage=yes OutputDir=saida OutputBaseFilename=VLibras Installer -SetupIconFile="C:\Users\bruno\Desktop\user_install\icon\deaf.ico" +SetupIconFile="C:\Users\bruno\Desktop\user_install\icons\deaf.ico" Compression=lzma SolidCompression=yes - - - -WizardImageFile = "C:\Users\bruno\Pictures\avatar.bmp" -WizardSmallImageFile = "C:\Users\bruno\Pictures\icon.bmp" +WizardImageFile = "C:\Users\bruno\Desktop\user_install\icons\avatar.bmp" +WizardSmallImageFile = "C:\Users\bruno\Desktop\user_install\icons\icon.bmp" [Languages] Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl" @@ -43,12 +40,11 @@ Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescrip Source: "C:\Users\bruno\Desktop\user_install\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs [Icons] -Name: "{group}\{#MyAppName}"; Filename: "{app}\Player\{#MyAppExeName}"; IconFilename: "{app}\icon\deaf.ico" +Name: "{group}\{#MyAppName}"; Filename: "{app}\Player\{#MyAppExeName}"; IconFilename: "{app}\icons\deaf.ico" Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}" Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}" -Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\Player\{#MyAppExeName}"; Tasks: desktopicon; IconFilename: "{app}\icon\deaf.ico" -Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Filename: "{app}\Player\{#MyAppExeName}"; Tasks: quicklaunchicon; IconFilename: "{app}\icon\deaf.ico" - +Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\Player\{#MyAppExeName}"; Tasks: desktopicon; IconFilename: "{app}\icons\deaf.ico" +Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Filename: "{app}\Player\{#MyAppExeName}"; Tasks: quicklaunchicon; IconFilename: "{app}\icons\deaf.ico" [Run] Filename: {sd}\vlibras-libs\required\user_install.bat; Flags: runhidden diff --git a/plugin/Plugin-x86/CorePlugin.dll b/plugin/Plugin-x86/CorePlugin.dll index f88934d..50450c1 100644 Binary files a/plugin/Plugin-x86/CorePlugin.dll and b/plugin/Plugin-x86/CorePlugin.dll differ diff --git a/plugin/Plugin-x86/CorePlugin.lib b/plugin/Plugin-x86/CorePlugin.lib index ea4d792..4741554 100644 Binary files a/plugin/Plugin-x86/CorePlugin.lib and b/plugin/Plugin-x86/CorePlugin.lib differ diff --git a/src/pyTradutor.cpp b/src/pyTradutor.cpp index 598502f..2d1db63 100644 --- a/src/pyTradutor.cpp +++ b/src/pyTradutor.cpp @@ -23,7 +23,7 @@ namespace Tradutor Py_Initialize(); // Type conversion between C++ string to Py string - pName = PyString_FromString("ModuleTranslate"); + pName = PyString_FromString("PortGlosa"); assert(pName!=NULL); // Loads the script name saved in 'pName' pModule = PyImport_Import(pName); @@ -34,7 +34,7 @@ namespace Tradutor //PyErr_Print(); assert(pDict!=NULL); // Return the object from dictionary pDict which has a key 'iniciar' - pFunc = PyDict_GetItemString(pDict, "iniciar"); + pFunc = PyDict_GetItemString(pDict, "traduzir"); //PyErr_Print(); assert(pFunc!=NULL); } -- libgit2 0.21.2