diff --git a/po/pt_BR.po b/po/pt_BR.po index 6111c88..e766841 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: pw3270 5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-17 08:29-0300\n" +"POT-Creation-Date: 2013-07-17 09:44-0300\n" "PO-Revision-Date: 2013-07-03 10:51-0300\n" "Last-Translator: Perry Werneck \n" "Language-Team: Português \n" diff --git a/pw3270-i686.nsi.in b/pw3270-i686.nsi.in index 175b0a7..62fd06f 100644 --- a/pw3270-i686.nsi.in +++ b/pw3270-i686.nsi.in @@ -155,21 +155,26 @@ Section /o "Software Development Kit" SecSDK CreateDirectory "$INSTDIR\sdk\include" CreateDirectory "$INSTDIR\sdk\include\lib3270" CreateDirectory "$INSTDIR\sdk\include\pw3270" + CreateDirectory "$INSTDIR\sdk\sample" + CreateDirectory "$INSTDIR\sdk\sample\classlib" - file "/oname=$INSTDIR\sdk\include\lib3270.h" "src\include\lib3270.h" - file "/oname=$INSTDIR\sdk\include\pw3270.h" "src\include\pw3270.h" - file "/oname=$INSTDIR\sdk\include\pw3270\v3270.h" "src\include\pw3270\v3270.h" - file "/oname=$INSTDIR\sdk\include\pw3270\hllapi.h" "src\include\pw3270\hllapi.h" + setOutPath $INSTDIR\sdk\include + file "src\include\lib3270.h" + file "src\include\pw3270.h" + file "src\include\pw3270\v3270.h" + file "src\include\pw3270\hllapi.h" - file "/oname=$INSTDIR\sdk\include\lib3270\config.h" "src\include\lib3270\config.h" - file "/oname=$INSTDIR\sdk\include\lib3270\rules.mak" "src\include\rules.mak" + setOutPath $INSTDIR\sdk\include\lib3270 + file "src\include\lib3270\config.h" + file "src\include\rules.mak" - file "/oname=$INSTDIR\sdk\sample\Makefile" "src\sample\Makefile" - file "/oname=$INSTDIR\sdk\sample\connect.c" "src\sample\connect.c" + setOutPath $INSTDIR\sdk\sample\connect + file "src\sample\Makefile" + file "src\sample\connect.c" - file "/oname=$INSTDIR\sdk\lib3270.def" ".bin\Release\lib3270.dll.@PACKAGE_VERSION@.def" - file "/oname=$INSTDIR\sdk\pw3270.def" ".bin\Release\pw3270.dll.@PACKAGE_VERSION@.def" - file "/oname=$INSTDIR\sdk\libhllapi.def" ".bin\Release\libhllapi.dll.def" + setOutPath $INSTDIR\sdk\sample\classlib + file "src\classlib\*.cc" + file "src\include\pw3270\class.h" SectionEnd @@ -217,14 +222,39 @@ sectionEnd Function .onInit -IfFileExists $PROGRAMFILES\ooRexx\rexx.exe EnableRexx RexxSET +${if} ${FileExists} `$PROGRAMFILES\ooRexx\rexx.exe` -EnableRexx: SectionGetFlags "${RexxPlugin}" $0 IntOp $0 $0 | ${SF_SELECTED} SectionSetFlags "${RexxPlugin}" $0 -RexxSET: +${EndIf} + +ReadRegStr $4 HKLM "Software\gtkwin\@GTK_MODVERSION@" "path" + +${if} $4 == "" + + SectionGetFlags "${SecGTK}" $0 + IntOp $0 $0 | ${SF_SELECTED} + SectionSetFlags "${SecGTK}" $0 + +${Else} + + ${if} ${FileExists} `$4\*.*` + + SectionGetFlags "${SecGTK}" $0 + IntOp $0 $0 & ${SECTION_OFF} + SectionSetFlags "${SecGTK}" $0 + + ${Else} + + SectionGetFlags "${SecGTK}" $0 + IntOp $0 $0 | ${SF_SELECTED} + SectionSetFlags "${SecGTK}" $0 + + ${EndIf} + +${EndIf} FunctionEnd diff --git a/pw3270-x86_64.nsi.in b/pw3270-x86_64.nsi.in index b3ae519..2c2b1b1 100644 --- a/pw3270-x86_64.nsi.in +++ b/pw3270-x86_64.nsi.in @@ -239,16 +239,31 @@ ${if} ${FileExists} `$PROGRAMFILES64\ooRexx\rexx.exe` ${EndIf} -ReadRegStr $4 HKLM "Software\gtk3win\@GTK_MODVERSION@" "path" +ReadRegStr $4 HKLM "Software\gtkwin\@GTK_MODVERSION@" "path" -${if} ${FileExists} `$4\*.*` +${if} $4 == "" SectionGetFlags "${SecGTK}" $0 - IntOp $0 $0 & ${SECTION_OFF} + IntOp $0 $0 | ${SF_SELECTED} SectionSetFlags "${SecGTK}" $0 -${EndIf} +${Else} + + ${if} ${FileExists} `$4\*.*` + + SectionGetFlags "${SecGTK}" $0 + IntOp $0 $0 & ${SECTION_OFF} + SectionSetFlags "${SecGTK}" $0 + ${Else} + + SectionGetFlags "${SecGTK}" $0 + IntOp $0 $0 | ${SF_SELECTED} + SectionSetFlags "${SecGTK}" $0 + + ${EndIf} + +${EndIf} FunctionEnd diff --git a/src/include/pw3270/class.h b/src/include/pw3270/class.h index 5a8e504..40c9109 100644 --- a/src/include/pw3270/class.h +++ b/src/include/pw3270/class.h @@ -18,7 +18,7 @@ * programa; se não, escreva para a Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA, 02111-1307, USA * - * Este programa está nomeado como pw3270class.c e possui - linhas de código. + * Este programa está nomeado como class.h e possui - linhas de código. * * Contatos: * -- libgit2 0.21.2