diff --git a/packaging/windows/QET.nsi b/packaging/windows/QET.nsi index 556355c5e..80367073e 100644 --- a/packaging/windows/QET.nsi +++ b/packaging/windows/QET.nsi @@ -70,6 +70,7 @@ ;-------------------------------- ;Pages + !define MUI_COMPONENTSPAGE_SMALLDESC !insertmacro MUI_PAGE_WELCOME !insertmacro MUI_PAGE_LICENSE "files\LICENSE" !insertmacro MUI_PAGE_COMPONENTS @@ -137,10 +138,9 @@ File /r "./files/conf" SectionEnd +;--------------------------- SetOverwrite on SubSection "$(Elements)" -;--------------------------- - SetOverwrite on Section "$(Electric)" @@ -167,7 +167,7 @@ Section "$(Pneumatic)" File /r "./files/elements/50_pneumatic" SectionEnd - +SubSectionEnd ;--------------------------------- SubSection "$(Energy)" @@ -192,10 +192,27 @@ SectionEnd SubSectionEnd ;------------------------------- -SubSectionEnd +SetOverwrite on +Section "$(Lang)" SEC02 + SetOutPath "$INSTDIR\lang" + File "./files/lang/*.qm" +SectionEnd +SetOverwrite on +Section "$(Titleblocks)" SEC03 + SetOutPath "$INSTDIR" + File /r "./files/titleblocks" +SectionEnd + +SetOverwrite on +Section "$(Examples)" SEC04 + SetOutPath "$INSTDIR" + File /r "./files/examples" +SectionEnd ;-------------------------------- + + ;Installer Sections Section "" diff --git a/packaging/windows/QET64.nsi b/packaging/windows/QET64.nsi index a8f244c03..a896c5c7a 100644 --- a/packaging/windows/QET64.nsi +++ b/packaging/windows/QET64.nsi @@ -73,6 +73,7 @@ ;-------------------------------- ;Pages + !define MUI_COMPONENTSPAGE_SMALLDESC !insertmacro MUI_PAGE_WELCOME !insertmacro MUI_PAGE_LICENSE "files\LICENSE" !insertmacro MUI_PAGE_COMPONENTS @@ -140,10 +141,9 @@ File /r "./files/conf" SectionEnd +;--------------------------- SetOverwrite on SubSection "$(Elements)" -;--------------------------- - SetOverwrite on Section "$(Electric)" @@ -170,7 +170,7 @@ Section "$(Pneumatic)" File /r "./files/elements/50_pneumatic" SectionEnd - +SubSectionEnd ;--------------------------------- SubSection "$(Energy)" @@ -195,11 +195,6 @@ SectionEnd SubSectionEnd ;------------------------------- -SubSectionEnd - - - -;--------------------------------- SetOverwrite on Section "$(Lang)" SEC02 SetOutPath "$INSTDIR\lang" @@ -218,11 +213,9 @@ Section "$(Examples)" SEC04 File /r "./files/examples" SectionEnd - ;-------------------------------- -;Installer Sections -;-------------------------------- + ;Installer Sections Section "" diff --git a/packaging/windows/lang_extra.nsh b/packaging/windows/lang_extra.nsh index 7a35235c9..f3299c308 100644 --- a/packaging/windows/lang_extra.nsh +++ b/packaging/windows/lang_extra.nsh @@ -42,7 +42,7 @@ LangString Solar_thermal ${LANG_POLISH} "Energia słoneczna" LangString Lang ${LANG_POLISH} "Język" LangString Titleblocks ${LANG_POLISH} "Tabliczki rysunkowe" - LangString Examples ${LANG_FRENCH} "Przykłady" + LangString Examples ${LANG_POLISH} "Przykłady" LangString installed ${LANG_GREEK} "${SOFT_NAME} is already installed. $\n$\nClick `OK` to remove the previous version or `Cancel` to cancel this upgrade." LangString wrongArch ${LANG_GREEK} "This distribution is for 64 bits computers only."