Make GTK Wimp the default, so the installation type isn't always "Custom" on recent OS like 2K or XP (it will be disabled, if an "unappropriate" OS like Win98 is detected)

Grouping the sections together, so getting an idea of the available sections become an easier task

svn path=/trunk/; revision=14977

1 files changed, 62 insertions, 43 deletions

diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi
index 7f20aa08fd..39ca8aa452 100644
--- a/packaging/nsis/ethereal.nsi
+++ b/packaging/nsis/ethereal.nsi
@@ -393,6 +393,8 @@ WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\App Pa
 
 SectionEnd
 
+SectionGroup "Ethereal"
+
 !ifdef GTK1_DIR
 Section "Ethereal GTK1" SecEtherealGTK1
 ;-------------------------------------------
@@ -435,6 +437,7 @@ SectionEnd
 !ifdef GTK_WIMP_DIR
 Section "GTK-Wimp" SecGTKWimp
 ;-------------------------------------------
+SectionIn 1
 SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_INST_VERSION}.0\engines
 File "${GTK_WIMP_DIR}\libwimp.dll"
 SetOutPath $INSTDIR\share\themes\Default\gtk-2.0
@@ -443,6 +446,9 @@ SectionEnd
 !endif
 !endif
 
+SectionGroupEnd	; "Ethereal"
+
+
 Section "Tethereal" SecTethereal
 ;-------------------------------------------
 !ifdef GTK1_DIR & GTK2_DIR
@@ -453,46 +459,7 @@ File "..\..\tethereal.exe"
 File "..\..\doc\tethereal.html"
 SectionEnd
 
-Section "Editcap" SecEditcap
-;-------------------------------------------
-!ifdef GTK1_DIR & GTK2_DIR
-SectionIn 1 2
-!endif
-SetOutPath $INSTDIR
-File "..\..\editcap.exe"
-File "..\..\doc\editcap.html"
-SectionEnd
-
-Section "Text2Pcap" SecText2Pcap
-;-------------------------------------------
-!ifdef GTK1_DIR & GTK2_DIR
-SectionIn 1 2
-!endif
-SetOutPath $INSTDIR
-File "..\..\text2pcap.exe"
-File "..\..\doc\text2pcap.html"
-SectionEnd
-
-Section "Mergecap" SecMergecap
-;-------------------------------------------
-!ifdef GTK1_DIR & GTK2_DIR
-SectionIn 1 2
-!endif
-SetOutPath $INSTDIR
-File "..\..\mergecap.exe"
-File "..\..\doc\mergecap.html"
-SectionEnd
-
-Section "Capinfos" SecCapinfos
-;-------------------------------------------
-!ifdef GTK1_DIR & GTK2_DIR
-SectionIn 1 2
-!endif
-SetOutPath $INSTDIR
-File "..\..\capinfos.exe"
-File "..\..\doc\capinfos.html"
-SectionEnd
-
+SectionGroup	"Plugins / Extensions"
 
 Section "Dissector Plugins" SecPlugins
 ;-------------------------------------------
@@ -527,7 +494,7 @@ File "..\..\plugins\v5ua\v5ua.dll"
 File "..\..\plugins\xml\xml.dll"
 SectionEnd
 
-Section "Tree Statistics Plugin (currently only for http)" SecStatsTree
+Section "Tree Statistics Plugin (currently http only)" SecStatsTree
 ;-------------------------------------------
 !ifdef GTK1_DIR & GTK2_DIR
 SectionIn 1 2
@@ -536,7 +503,7 @@ SetOutPath $INSTDIR\plugins\${VERSION}
 File "..\..\plugins\stats_tree\stats_tree.dll"
 SectionEnd
 
-Section "Mate - Meta Analysis and Tracing Engine (Experimental)" SecMate
+Section "Mate - Meta Analysis and Tracing Engine" SecMate
 ;-------------------------------------------
 SetOutPath $INSTDIR\plugins\${VERSION}
 File "..\..\plugins\mate\mate.dll"
@@ -551,6 +518,56 @@ SetOutPath $INSTDIR\snmp\mibs
 File "${NET_SNMP_DIR}\mibs\*.txt"
 SectionEnd
 
+SectionGroupEnd	; "Plugins / Extensions"
+
+
+SectionGroup "Tools"
+
+Section "Editcap" SecEditcap
+;-------------------------------------------
+!ifdef GTK1_DIR & GTK2_DIR
+SectionIn 1 2
+!endif
+SetOutPath $INSTDIR
+File "..\..\editcap.exe"
+File "..\..\doc\editcap.html"
+SectionEnd
+
+Section "Text2Pcap" SecText2Pcap
+;-------------------------------------------
+!ifdef GTK1_DIR & GTK2_DIR
+SectionIn 1 2
+!endif
+SetOutPath $INSTDIR
+File "..\..\text2pcap.exe"
+File "..\..\doc\text2pcap.html"
+SectionEnd
+
+Section "Mergecap" SecMergecap
+;-------------------------------------------
+!ifdef GTK1_DIR & GTK2_DIR
+SectionIn 1 2
+!endif
+SetOutPath $INSTDIR
+File "..\..\mergecap.exe"
+File "..\..\doc\mergecap.html"
+SectionEnd
+
+Section "Capinfos" SecCapinfos
+;-------------------------------------------
+!ifdef GTK1_DIR & GTK2_DIR
+SectionIn 1 2
+!endif
+SetOutPath $INSTDIR
+File "..\..\capinfos.exe"
+File "..\..\doc\capinfos.html"
+SectionEnd
+
+SectionGroupEnd	; "Tools"
+
+
+SectionGroup	"Icons / Shortcuts"
+
 ; SectionDivider
 ;-------------------------------------------
 
@@ -632,6 +649,8 @@ pop $R0
 !insertmacro UpdateIcons
 SectionEnd
 
+SectionGroupEnd	; "Icons / Shortcuts"
+
 Section "Load Winpcap NPF service at startup" SecNPFservice
 ;-------------------------------------------
 	WriteRegDWORD HKEY_LOCAL_MACHINE "SYSTEM\CurrentControlSet\Services\NPF" "Start" 2 ;set NPF to (SERVICE_AUTO_START)
@@ -787,7 +806,7 @@ SectionEnd
 !ifdef GTK2_DIR  
   !insertmacro MUI_DESCRIPTION_TEXT ${SecEtherealGTK2} "${PROGRAM_NAME} is a GUI network protocol analyzer (using the modern GTK2 GUI toolkit)."
 !ifdef GTK_WIMP_DIR
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecGTKWimp} "GTKWimp is the GTK2 windows impersonator (native Win32 look and feel)."
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecGTKWimp} "GTKWimp is the GTK2 windows impersonator (native Win32 look and feel, for Win2000 and up)."
 !endif  
 !endif
   !insertmacro MUI_DESCRIPTION_TEXT ${SecTethereal} "Tethereal is a text based network protocol analyzer."