Commit c7d191b5e61cd72f8b838ea49b00e208a7a51754

Authored by bruno
1 parent 10a60603
Exists in master

Correção no bdrag e no inno setup

Clipboard/Clipboard.py
@@ -19,7 +19,7 @@ def clip(): @@ -19,7 +19,7 @@ def clip():
19 if isinstance(text, unicode): 19 if isinstance(text, unicode):
20 return text.encode("utf-8") 20 return text.encode("utf-8")
21 else: 21 else:
22 - return "SELECIONE UM TEXTO" 22 + return "ESCOLHER TEXTO CERTO"
23 23
24 def bdragOn(): 24 def bdragOn():
25 global process 25 global process
autohotkey/BKing.ahk
@@ -1,72 +0,0 @@ @@ -1,72 +0,0 @@
1 -  
2 -  
3 -#SingleInstance,Reload ; Mantem apenas uma versão executando  
4 -SetBatchLines,-1 ; Não permite o script entrar em modo sleep  
5 -CoordMode,Mouse  
6 -  
7 -SysGet,x,68  
8 -SysGet,y,69  
9 -  
10 -~^a::  
11 - Gosub,COPIAR  
12 -return  
13 -  
14 -~+LButton Up::  
15 - Gosub,COPIAR  
16 -Return  
17 -  
18 -~LButton::  
19 - MouseGetPos,coordx_old,coordy_old,winid_old  
20 -Return  
21 -  
22 -~LButton Up::  
23 - MouseGetPos,coordx,coordy,winid  
24 - VarSetCapacity(rect, 16)  
25 -  
26 - DllCall("GetClientRect", "uint", winid_old, "uint", &rect)  
27 - rect_left :=NumGet(rect,0, "int")  
28 - rect_top :=NumGet(rect,4, "int")  
29 - rect_right :=NumGet(rect,8, "int")  
30 - rect_bottom:=NumGet(rect,12,"int")  
31 - If (winid=winid_old And (coordx<coordx_old-x Or coordx>coordx_old+x Or coordy<coordy_old-y Or coordy>coordy_old+y))  
32 - If (coordx_old>=rect_left And coordx_old<=rect_right And coordy_old>=rect_top And coordy_old<=rect_bottom)  
33 - Gosub,COPIAR  
34 -  
35 - ticks = %A_TickCount%  
36 - difticks = %ticks%  
37 - EnvSub,difticks,%oldticks%  
38 -  
39 - If difticks<400  
40 - If (coordx_old>=rect_left And coordx_old<=rect_right And coordy_old>=rect_top And coordy_old<=rect_bottom)  
41 - Gosub,COPIAR  
42 - oldticks=%ticks%  
43 -Return  
44 -  
45 -COPIAR:  
46 - Sleep,400  
47 - clip=%Clipboardall%  
48 - Clipboard=  
49 - Send,^c  
50 - ClipWait,1  
51 - If Clipboard=  
52 - Clipboard=%clip%  
53 -Return  
54 -  
55 -EXIT:  
56 -ExitApp  
57 -  
58 -  
59 -  
60 -  
61 -  
62 -  
63 -  
64 -  
65 -  
66 -  
67 -  
68 -  
69 -  
70 -  
71 -  
72 -  
autohotkey/Bdrag.ahk 0 → 100644
@@ -0,0 +1,55 @@ @@ -0,0 +1,55 @@
  1 +;######################## CÓPIA AUTOMÁTICA ##########################
  2 +;# Bruno Santos #
  3 +;# brunosantos@lavid.ufpb.br #
  4 +;#####################################################################
  5 +
  6 +#SingleInstance,Reload ;Mantem apenas uma versão executando
  7 +SetBatchLines,-1 ;Não permite o script entrar em modo sleep
  8 +CoordMode,Mouse
  9 +
  10 +~^a::
  11 + Gosub,COPIAR
  12 +return
  13 +
  14 +~+LButton Up::
  15 + Gosub,COPIAR
  16 +Return
  17 +
  18 +~LButton::
  19 + MouseGetPos,coordx_old,coordy_old,winid_old
  20 +Return
  21 +
  22 +~LButton Up::
  23 + MouseGetPos,coordx,coordy,winid
  24 +
  25 + if ((coordx < coordx_old ) or (coordx > coordx_old ) or (coordy < coordy_old) or (coordy > coordy_old ))
  26 + {
  27 + Gosub,COPIAR
  28 + }
  29 +
  30 + ticks = %A_TickCount%
  31 + difticks = %ticks%
  32 + EnvSub,difticks,%oldticks%
  33 +
  34 + if (difticks < 400)
  35 + {
  36 + Gosub,COPIAR
  37 + }
  38 + oldticks=%ticks%
  39 +
  40 +Return
  41 +
  42 +COPIAR:
  43 + clip=%Clipboardall%
  44 + Clipboard=
  45 + Send,^c
  46 +
  47 + if Clipboard=
  48 + Clipboard=%clip%
  49 +
  50 +Return
  51 +
  52 +EXIT:
  53 +ExitApp
  54 +
  55 +
install/inno setup/user_install.bat
@@ -15,11 +15,10 @@ CLS @@ -15,11 +15,10 @@ CLS
15 @ECHO off 15 @ECHO off
16 16
17 ECHO ############### Instalando VLibras ############### 17 ECHO ############### Instalando VLibras ###############
18 -::################# Variáveis de Ambiente #################  
19 18
  19 +::################# Variáveis de Ambiente #################
20 ECHO Exportando Variaveis de Ambiente: 20 ECHO Exportando Variaveis de Ambiente:
21 21
22 -::Váriaveis Permanentes (Sistema)  
23 ECHO AELIUS_DATA 22 ECHO AELIUS_DATA
24 SETX AELIUS_DATA %HOMEDRIVE%\vlibras-libs\aelius_data /M 23 SETX AELIUS_DATA %HOMEDRIVE%\vlibras-libs\aelius_data /M
25 24
@@ -41,9 +40,7 @@ If NOT &quot;%path_value%&quot;==&quot;%path_value:vlibras=%&quot; ( @@ -41,9 +40,7 @@ If NOT &quot;%path_value%&quot;==&quot;%path_value:vlibras=%&quot; (
41 SETX "PATH" "%PATH%";%HOMEDRIVE%\vlibras-libs\bin;%HOMEDRIVE%\Python27;%HOMEDRIVE%\Python27\Scripts;%HOMEDRIVE%\Python27\Lib\site-packages /M 40 SETX "PATH" "%PATH%";%HOMEDRIVE%\vlibras-libs\bin;%HOMEDRIVE%\Python27;%HOMEDRIVE%\Python27\Scripts;%HOMEDRIVE%\Python27\Lib\site-packages /M
42 ) 41 )
43 42
44 -::Código executa a partir desse ponto caso o usuário não precise configurar as variáveis de ambiente  
45 ::################# Instalação do Python ################# 43 ::################# Instalação do Python #################
46 -  
47 msiexec /i python-2.7.9.msi /passive 44 msiexec /i python-2.7.9.msi /passive
48 ECHO OK 45 ECHO OK
49 46
@@ -75,8 +72,12 @@ ECHO OK @@ -75,8 +72,12 @@ ECHO OK
75 c:\Python27\Scripts\pip install nltk-3.0.2-py2.py3-none-any.whl 72 c:\Python27\Scripts\pip install nltk-3.0.2-py2.py3-none-any.whl
76 ECHO OK 73 ECHO OK
77 74
78 -::################# HUNPOS.PY ############################# 75 +c:\Python27\Scripts\pip install future-0.14.3-py2-none-any.whl
  76 +ECHO OK
  77 +
  78 +::################# HUNPOS.PY & DATA.PY #############################
79 COPY %HOMEDRIVE%\vlibras-libs\nltk_data\hunpos.py %homedrive%\Python27\Lib\site-packages\nltk\tag\ /y 79 COPY %HOMEDRIVE%\vlibras-libs\nltk_data\hunpos.py %homedrive%\Python27\Lib\site-packages\nltk\tag\ /y
80 COPY %HOMEDRIVE%\vlibras-libs\nltk_data\data.py %homedrive%\Python27\Lib\site-packages\nltk /y 80 COPY %HOMEDRIVE%\vlibras-libs\nltk_data\data.py %homedrive%\Python27\Lib\site-packages\nltk /y
  81 +COPY %HOMEDRIVE%\vlibras-libs\nltk_data\nltk_tgrep.py %homedrive%\Python27\Lib\site-packages /y
81 82
82 ECHO VLibras Tradutor instalado com sucesso! 83 ECHO VLibras Tradutor instalado com sucesso!
install/inno setup/user_install.iss
@@ -4,9 +4,9 @@ @@ -4,9 +4,9 @@
4 ;##################################################################### 4 ;#####################################################################
5 5
6 #define MyAppName "VLibras" 6 #define MyAppName "VLibras"
7 -#define MyAppVersion "1.0" 7 +#define MyAppVersion "beta"
8 #define MyAppPublisher "LAViD" 8 #define MyAppPublisher "LAViD"
9 -#define MyAppURL "http://www.lavid.ufpb.br" 9 +#define MyAppURL "http://www.vlibrasplayer.lavid.ufpb.br"
10 #define MyAppExeName "Playerx86.exe" 10 #define MyAppExeName "Playerx86.exe"
11 11
12 [Setup] 12 [Setup]
@@ -23,14 +23,11 @@ DefaultGroupName={#MyAppName} @@ -23,14 +23,11 @@ DefaultGroupName={#MyAppName}
23 DisableProgramGroupPage=yes 23 DisableProgramGroupPage=yes
24 OutputDir=saida 24 OutputDir=saida
25 OutputBaseFilename=VLibras Installer 25 OutputBaseFilename=VLibras Installer
26 -SetupIconFile="C:\Users\bruno\Desktop\user_install\icon\deaf.ico" 26 +SetupIconFile="C:\Users\bruno\Desktop\user_install\icons\deaf.ico"
27 Compression=lzma 27 Compression=lzma
28 SolidCompression=yes 28 SolidCompression=yes
29 -  
30 -  
31 -  
32 -WizardImageFile = "C:\Users\bruno\Pictures\avatar.bmp"  
33 -WizardSmallImageFile = "C:\Users\bruno\Pictures\icon.bmp" 29 +WizardImageFile = "C:\Users\bruno\Desktop\user_install\icons\avatar.bmp"
  30 +WizardSmallImageFile = "C:\Users\bruno\Desktop\user_install\icons\icon.bmp"
34 31
35 [Languages] 32 [Languages]
36 Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl" 33 Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
@@ -43,12 +40,11 @@ Name: &quot;quicklaunchicon&quot;; Description: &quot;{cm:CreateQuickLaunchIcon}&quot;; GroupDescrip @@ -43,12 +40,11 @@ Name: &quot;quicklaunchicon&quot;; Description: &quot;{cm:CreateQuickLaunchIcon}&quot;; GroupDescrip
43 Source: "C:\Users\bruno\Desktop\user_install\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs 40 Source: "C:\Users\bruno\Desktop\user_install\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
44 41
45 [Icons] 42 [Icons]
46 -Name: "{group}\{#MyAppName}"; Filename: "{app}\Player\{#MyAppExeName}"; IconFilename: "{app}\icon\deaf.ico" 43 +Name: "{group}\{#MyAppName}"; Filename: "{app}\Player\{#MyAppExeName}"; IconFilename: "{app}\icons\deaf.ico"
47 Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}" 44 Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}"
48 Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}" 45 Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
49 -Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\Player\{#MyAppExeName}"; Tasks: desktopicon; IconFilename: "{app}\icon\deaf.ico"  
50 -Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Filename: "{app}\Player\{#MyAppExeName}"; Tasks: quicklaunchicon; IconFilename: "{app}\icon\deaf.ico"  
51 - 46 +Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\Player\{#MyAppExeName}"; Tasks: desktopicon; IconFilename: "{app}\icons\deaf.ico"
  47 +Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Filename: "{app}\Player\{#MyAppExeName}"; Tasks: quicklaunchicon; IconFilename: "{app}\icons\deaf.ico"
52 48
53 [Run] 49 [Run]
54 Filename: {sd}\vlibras-libs\required\user_install.bat; Flags: runhidden 50 Filename: {sd}\vlibras-libs\required\user_install.bat; Flags: runhidden
plugin/Plugin-x86/CorePlugin.dll
No preview for this file type
plugin/Plugin-x86/CorePlugin.lib
No preview for this file type
src/pyTradutor.cpp
@@ -23,7 +23,7 @@ namespace Tradutor @@ -23,7 +23,7 @@ namespace Tradutor
23 Py_Initialize(); 23 Py_Initialize();
24 24
25 // Type conversion between C++ string to Py string 25 // Type conversion between C++ string to Py string
26 - pName = PyString_FromString("ModuleTranslate"); 26 + pName = PyString_FromString("PortGlosa");
27 assert(pName!=NULL); 27 assert(pName!=NULL);
28 // Loads the script name saved in 'pName' 28 // Loads the script name saved in 'pName'
29 pModule = PyImport_Import(pName); 29 pModule = PyImport_Import(pName);
@@ -34,7 +34,7 @@ namespace Tradutor @@ -34,7 +34,7 @@ namespace Tradutor
34 //PyErr_Print(); 34 //PyErr_Print();
35 assert(pDict!=NULL); 35 assert(pDict!=NULL);
36 // Return the object from dictionary pDict which has a key 'iniciar' 36 // Return the object from dictionary pDict which has a key 'iniciar'
37 - pFunc = PyDict_GetItemString(pDict, "iniciar"); 37 + pFunc = PyDict_GetItemString(pDict, "traduzir");
38 //PyErr_Print(); 38 //PyErr_Print();
39 assert(pFunc!=NULL); 39 assert(pFunc!=NULL);
40 } 40 }