|
11 | 11 | !define PRODUCT_STARTMENU_REGVAL "NSIS:StartMenuDir"
|
12 | 12 |
|
13 | 13 | SetCompressor zlib
|
| 14 | + |
| 15 | +; MUI 1.67 compatible ------ |
| 16 | +!include "MUI.nsh" |
14 | 17 | ; Added by Tim for setting env vars (see this file on disk)
|
15 | 18 | !include WriteEnvStr.nsh
|
16 | 19 | ;Added by Tim for a macro that will recursively delete the files in the install dir
|
17 | 20 | !include RecursiveDelete.nsh
|
18 |
| - |
19 |
| -; MUI 1.67 compatible ------ |
20 |
| -!include "MUI.nsh" |
| 21 | +;Added by Tim to support unzipping downloaded sample data automatically |
| 22 | +!include ZipDLL.nsh |
21 | 23 |
|
22 | 24 | ; MUI Settings
|
23 | 25 | !define MUI_ABORTWARNING
|
@@ -85,7 +87,7 @@ InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
|
85 | 87 | ShowInstDetails show
|
86 | 88 | ShowUnInstDetails show
|
87 | 89 |
|
88 |
| -Section "MainSection" SEC01 |
| 90 | +Section "Quantum GIS Application" SEC01 |
89 | 91 | ;Set the reg key so we get default toolbar layout
|
90 | 92 | !include qgis_window_geometry.nsh
|
91 | 93 | SetOutPath "$INSTDIR"
|
@@ -126,10 +128,22 @@ Section "MainSection" SEC01
|
126 | 128 |
|
127 | 129 | SectionEnd
|
128 | 130 |
|
129 |
| -Section "Sample Data" SEC02 |
130 |
| - ; SetOutPath "$INSTDIR\SampleData\EnvironmentLayers\2050\A1F" |
| 131 | +Section "Sample Data - Spearfish (GRASS)" SEC02 |
| 132 | + SetOutPath "$INSTDIR\SampleData\" |
| 133 | + NSISdl::download http://grass.itc.it/sampledata/spearfish_grass60data-0.3.zip spearfish.zip |
| 134 | + !insertmacro ZIPDLL_EXTRACT "$INSTDIR\SampleData\spearfish.zip" "$INSTDIR\SampleData\" "<ALL>" |
| 135 | + ;ZipDLL::extractall "$INSTDIR\SampleData\spearfish.zip" "$INSTDIR\SampleData\" |
| 136 | + ;the next line is a hack / workaround for a problem in zipdll.nsh |
| 137 | + !endif |
| 138 | + |
| 139 | + |
| 140 | +SectionEnd |
| 141 | +Section "Sample Data - Alaska (Non GRASS)" SEC03 |
| 142 | + SetOutPath "$INSTDIR\SampleData\Alaska\" |
| 143 | + NSISdl::download http://qgis.org/uploadfiles/qgis_sample_data.tar.gz alaska.tar.gz |
131 | 144 | ; File "C:\dev/cpp/qgis/\qgis-release\SampleData\EnvironmentLayers\2050\A1F\Annual_dev/cpp/qgis/erature_range.asc"
|
132 | 145 |
|
| 146 | + |
133 | 147 | ; Shortcuts
|
134 | 148 | !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
|
135 | 149 | !insertmacro MUI_STARTMENU_WRITE_END
|
@@ -158,7 +172,8 @@ SectionEnd
|
158 | 172 | ; Section descriptions
|
159 | 173 | !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
|
160 | 174 | !insertmacro MUI_DESCRIPTION_TEXT ${SEC01} "Main application files - you really need this!"
|
161 |
| - !insertmacro MUI_DESCRIPTION_TEXT ${SEC02} "Sample data (not required if you have your own data already)" |
| 175 | + !insertmacro MUI_DESCRIPTION_TEXT ${SEC02} "20mb Download of sample data in GRASS format (not required if you have your own data already)" |
| 176 | + !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} "20mb Download of sample shapefiles and TIFF data for Alaska (not required if you have your own data already)" |
162 | 177 | !insertmacro MUI_FUNCTION_DESCRIPTION_END
|
163 | 178 |
|
164 | 179 |
|
|
0 commit comments