| [qet] [4134] Nsis Installers : minors fix, improve Components page Drop List Box Size |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 4134
Author: scorpio810
Date: 2015-08-19 01:53:52 +0200 (Wed, 19 Aug 2015)
Log Message:
-----------
Nsis Installers : minors fix, improve Components page Drop List Box Size
Modified Paths:
--------------
trunk/packaging/windows/QET.nsi
trunk/packaging/windows/QET64.nsi
trunk/packaging/windows/lang_extra.nsh
Modified: trunk/packaging/windows/QET.nsi
===================================================================
--- trunk/packaging/windows/QET.nsi 2015-08-18 18:19:00 UTC (rev 4133)
+++ trunk/packaging/windows/QET.nsi 2015-08-18 23:53:52 UTC (rev 4134)
@@ -70,6 +70,7 @@
;--------------------------------
;Pages
+ !define MUI_COMPONENTSPAGE_SMALLDESC
!insertmacro MUI_PAGE_WELCOME
!insertmacro MUI_PAGE_LICENSE "files\LICENSE"
!insertmacro MUI_PAGE_COMPONENTS
@@ -137,11 +138,10 @@
SectionEnd
+;---------------------------
SetOverwrite on
SubSection "$(Elements)"
-;---------------------------
-
SetOverwrite on
Section "$(Electric)"
SetOutPath "$INSTDIR"
@@ -167,7 +167,7 @@
File /r "./files/elements/50_pneumatic"
SectionEnd
-
+SubSectionEnd
;---------------------------------
SubSection "$(Energy)"
@@ -192,10 +192,27 @@
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 ""
Modified: trunk/packaging/windows/QET64.nsi
===================================================================
--- trunk/packaging/windows/QET64.nsi 2015-08-18 18:19:00 UTC (rev 4133)
+++ trunk/packaging/windows/QET64.nsi 2015-08-18 23:53:52 UTC (rev 4134)
@@ -73,6 +73,7 @@
;--------------------------------
;Pages
+ !define MUI_COMPONENTSPAGE_SMALLDESC
!insertmacro MUI_PAGE_WELCOME
!insertmacro MUI_PAGE_LICENSE "files\LICENSE"
!insertmacro MUI_PAGE_COMPONENTS
@@ -140,11 +141,10 @@
SectionEnd
+;---------------------------
SetOverwrite on
SubSection "$(Elements)"
-;---------------------------
-
SetOverwrite on
Section "$(Electric)"
SetOutPath "$INSTDIR"
@@ -170,7 +170,7 @@
File /r "./files/elements/50_pneumatic"
SectionEnd
-
+SubSectionEnd
;---------------------------------
SubSection "$(Energy)"
@@ -195,11 +195,6 @@
SubSectionEnd
;-------------------------------
-SubSectionEnd
-
-
-
-;---------------------------------
SetOverwrite on
Section "$(Lang)" SEC02
SetOutPath "$INSTDIR\lang"
@@ -218,11 +213,9 @@
File /r "./files/examples"
SectionEnd
-
;--------------------------------
-;Installer Sections
-;--------------------------------
+
;Installer Sections
Section ""
Modified: trunk/packaging/windows/lang_extra.nsh
===================================================================
--- trunk/packaging/windows/lang_extra.nsh 2015-08-18 18:19:00 UTC (rev 4133)
+++ trunk/packaging/windows/lang_extra.nsh 2015-08-18 23:53:52 UTC (rev 4134)
@@ -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."