Skip to content

Commit

Permalink
Added RequestExecutionLevel option to make the installer behave bette…
Browse files Browse the repository at this point in the history 
…r under Vista and Win 7. Updated reg entries for toolbars etc

git-svn-id: http://svn.osgeo.org/qgis/trunk@11812 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Oct 15, 2009
1 parent a0d9617 commit 651135a
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 7 deletions.
7 changes: 5 additions & 2 deletions ms-windows/QGIS-Installer.nsi
View file
Expand Up @@ -15,8 +15,8 @@

;Version variables

!define RELEASE_VERSION_NUMBER "1.3.0"
!define RELEASE_VERSION_NAME "Mimas"
!define RELEASE_VERSION_NUMBER "1.4.0"
!define RELEASE_VERSION_NAME "Trunk-Test-Build"
!define RELEASE_SVN_REVISION "11639"
!define RELEASE_BINARY_REVISION "0"

Expand All @@ -27,6 +27,9 @@

; Added by Tim to get optimal compression
SetCompressor /SOLID lzma
; Added by Tim to allow priveledge elevation in vista
RequestExecutionLevel admin

;----------------------------------------------------------------------------------------------------------------------------

;Don't modify the following lines
Expand Down
4 changes: 4 additions & 0 deletions ms-windows/plugins.nsh
View file
Expand Up @@ -22,5 +22,9 @@ WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\Plugins" "scalebarplugin
WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\Plugins" "spitplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\Plugins" "wfsplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\Plugins" "grassplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\Plugins" "diagramoverlay" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\Plugins" "oracleplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\Plugins" "evis" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\Plugins" "rasterterrainplugin" "true"

############################### reg2nsis end #################################
14 changes: 9 additions & 5 deletions ms-windows/ui.nsh
View file
Expand Up @@ -7,12 +7,16 @@
# Please don't remove this header. #
################################################################################

WriteRegBin HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\UI" "state" 40004200790074006500410072007200610079002800000000000000ff000000000000000000fd000000000000000100000000000000000000000000010000000000000002008700fc0002000000000000000300fb000000000000000c0000004c0000006500000067000000650000006e000000640001000000000000006800000000000200870000000000000072000000ff00ff00ff00fb00000000000000100000004f00000076000000650000007200000076000000690000006500000077000000000000000100f4000000000000002a0000000000000014000000ff00ff00ff00fb0000000000000022000000430000006f0000006f0000007200000064000000690000006e000000610000007400000065000000430000006100000070000000740000007500000072000000650000000000000001007e00000000000000a0000000000000007e000000ff00ff00ff00000000000300af0000000000020087000000000000000100000000000000020000000000000001000000000000000200fc00000000000000040000000000000001000000000000000000000000000000020000000000000005000000000000001600000046000000690000006c00000065000000540000006f0000006f0000006c0000004200000061000000720001000000000000000000000000000100900000000000000000000000000000000000000000000000180000004c00000061000000790000006500000072000000540000006f0000006f0000006c0000004200000061000000720001000000000001009000000000000000be000000000000000000000000000000000000000000000014000000410000007400000074000000720000006900000062000000750000007400000065000000730001000000000002004e000000000001002700000000000000000000000000000000000000000000000800000048000000650000006c00000070000000000000000300d900000000000000dd00000000000000000000000000000000000000000000000e000000500000006c0000007500000067000000690000006e00000073000100000000000300750000000000010040000000000000000000000000000000000000000000000002000000000000000200000000000000140000004400000069000000670000006900000074000000690000007a000000690000006e0000006700010000000000000000000000000002001c00000000000000000000000000000000000000000000001c0000004d0000006100000070000000200000004e000000610000007600000069000000670000006100000074000000690000006f0000006e0001000000000002001c00000000000200990000000000000000000000000000000000000000000000020000000000000000002900
WriteRegBin HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\UI" "geometry" 400042007900740065004100720072006100790028000100d900d000cb000000010000000000ff00ff00ff00fc00ff00ff00ff00fc00000000000400b800000000000300220000000000000030000000000000004300000000000200af0000000000020022000000000000000000020000002900
WriteRegBin HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\UI" "state" 40004200790074006500410072007200610079002800000000000000ff000000000000000000fd0000000000000002000000000000000000000000000000e700000000000200b600fc0002000000000000000500fb000000000000000c0000004c0000006500000067000000650000006e000000640001000000000000008d00000000000200b60000000000000072000000ff00ff00ff00fb00000000000000100000004f00000076000000650000007200000076000000690000006500000077000000000000000100f4000000000000002a0000000000000014000000ff00ff00ff00fb0000000000000022000000430000006f0000006f0000007200000064000000690000006e000000610000007400000065000000430000006100000070000000740000007500000072000000650000000000000001007e00000000000000a000000000000000a1000000ff00ff00ff00fb0000000000000014000000550000006e000000640000006f0000005700000069000000640000006700000065000000740000000000000000000000ff00ff00ff00ff00000000000000dc000000ff00ff00ff00fb000000000000001a0000004f000000730000006d000000550000006e000000640000006f0000005200000065000000640000006f00000044000000570000000000000000000000ff00ff00ff00ff00000000000000a3000000ff00ff00ff0000000000000001000000000001002f00000000000200b600fc0002000000000000000100fb00000000000000180000004f000000730000006d0000004600000065000000610000007400000075000000720000006500000044000000570000000000000000008d00000000000200b60000000000010065000000ff00ff00ff000000000005009300000000000200b6000000000000000100000000000000020000000000000001000000000000000200fc00000000000000040000000000000001000000000000000000000000000000020000000000000004000000000000001600000046000000690000006c00000065000000540000006f0000006f0000006c0000004200000061000000720001000000000000000000000000000100b70000000000000000000000000000000000000000000000180000004c00000061000000790000006500000072000000540000006f0000006f0000006c000000420000006100000072000100000000000100b700000000000000c200000000000000000000000000000000000000000000000800000048000000650000006c00000070000000000000000300d900000000000000dd00000000000000000000000000000000000000000000000e000000500000006c0000007500000067000000690000006e0000007300010000000000020079000000000001003700000000000000000000000000000000000000000000000200000000000000020000000000000014000000410000007400000074000000720000006900000062000000750000007400000065000000730001000000000000000000ff00ff00ff00ff00000000000000000000000000000000000000000000001c0000004d0000006100000070000000200000004e000000610000007600000069000000670000006100000074000000690000006f0000006e0001000000000001002600ff00ff00ff00ff000000000000000000000000000000000000000000000002000000000000000300000000000000140000004400000069000000670000006900000074000000690000007a000000690000006e000000670001000000000000000000ff00ff00ff00ff000000000000000000000000000000000000000000000026000000410000006400000076000000610000006e000000630000006500000064000000200000004400000069000000670000006900000074000000690000007a000000690000006e000000670001000000000001004900ff00ff00ff00ff00000000000000000000000000000000000000000000001a0000004f00000070000000650000006e0000005300000074000000720000006500000065000000740000004d0000006100000070000100000000000200d800ff00ff00ff00ff00000000000000000000000000000000002900
WriteRegBin HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\UI" "geometry" 400042007900740065004100720072006100790028000100d900d000cb000000010000000000ff00ff00ff00fc00ff00ff00ff00fc000000000006008300000000000300760000000000000000000000000000001400000000000400b40000000000010091000000000000000000020000002900
WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\UI" "lastVectorFileFilter" "[OGR] ESRI Shapefiles (*.shp *.SHP)"
WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\UI" "lastVectorFileFilterDir" "C:/Program Files/Quantum GIS/gisdata/ecape"
WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\UI" "encoding" "System"
WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\UI" "lastRasterFileFilter" "GeoTIFF (*.tif *.TIF)"
WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\UI" "lastRasterFileFilterDir" "C:/Program Files/Quantum GIS/gisdata/ecape"
WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\UI" "lastRasterFileFilter" "SAR_CEOS, CEOS, JAXAPALSAR, ELAS, AIG, OGDI, MEM, BSB, DIMAP, AirSAR, RS2, HDF4, HDF4Image, ISIS3, ISIS2, PDS, ERS, L1B, FIT, WCS, WMS, INGR, COSAR, TSX, DOQ1, DOQ2, ENVI, EHdr, GenBin, PAux, MFF2, FujiBAS, GSC, FAST, LAN, CPG, IDA, NDF, EIR, DIPEx, HTTP, HDF5Image and all other files (*)"
WriteRegBin HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\UI" "recentProjections" 33003400350032000000330033003400340000000000
WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\UI" "lastSaveAsImageFilter" "jpg format (*.jpg *.JPG);;"
WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\UI" "lastSaveAsImageDir" "C:/tmp"
WriteRegBin HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\UI" "recentProjectionsEpsg" 34003300320036000000340032003100310000000000
WriteRegBin HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\UI" "recentProjectionsProj4" 2b00700072006f006a003d006c006f006e0067006c006100740020002b0065006c006c00700073003d005700470053003800340020002b0064006100740075006d003d005700470053003800340020002b006e006f005f00640065006600730000002b00700072006f006a003d006c006f006e0067006c006100740020002b0065006c006c00700073003d00620065007300730065006c0020002b006e006f005f00640065006600730000000000
WriteRegBin HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\UI" "recentProjectsList" 43003a002f0044006f00630075006d0065006e0074007300200061006e0064002000530065007400740069006e00670073002f00410064006d0069006e006900730074007200610074006f0072002f006700690064006100740061002f004c0061006e00640063006f007600650072002f006c0061006e00640063006f007600650072002e0071006700730000000000

############################### reg2nsis end #################################

0 comments on commit 651135a

Please sign in to comment.