Enhance NSIS Windows installer (Wireshark Qt support)

* Add Radiobox to choose File Association (Wireshark GTK or Qt)
* Add Checkbox to choose Wireshark Qt icon will be installed (Startup, Desktop...)
* Fix unistaller (don't remove all icons...)
* ...

svn path=/trunk/; revision=54604

1 files changed, 74 insertions, 22 deletions

diff --git a/packaging/nsis/AdditionalTasksPage.ini b/packaging/nsis/AdditionalTasksPage.ini
index f21b1f9341..ea0c4e8aa1 100644
--- a/packaging/nsis/AdditionalTasksPage.ini
+++ b/packaging/nsis/AdditionalTasksPage.ini
@@ -1,12 +1,12 @@
 [Settings]
-NumFields=8
+NumFields=13
 
 [Field 1]
 Type=GroupBox
 Left=0
 Right=-1
 Top=0
-Bottom=45
+Bottom=75
 Text=Create Shortcuts
 State=1
 
@@ -16,7 +16,7 @@ Left=10
 Right=-1
 Top=10
 Bottom=18
-Text=Start Menu Item
+Text=Start Menu Item (Wireshark GTK+)
 State=1
 
 [Field 3]
@@ -25,7 +25,7 @@ Left=10
 Right=-1
 Top=20
 Bottom=28
-Text=Desktop Icon
+Text=Desktop Icon (Wireshark GTK+)
 State=0
 
 [Field 4]
@@ -34,40 +34,92 @@ Left=10
 Right=-1
 Top=30
 Bottom=38
-Text=Quick Launch Icon
+Text=Quick Launch Icon (Wireshark GTK+)
 State=1
 
 [Field 5]
-Type=GroupBox
-Left=0
+Type=CheckBox
+Left=10
 Right=-1
-Top=50
-Bottom=95
-Text=File Extensions
-State=1
+Top=40
+Bottom=48
+Text=Start Menu Item (Wireshark Qt)
+Flags=DISABLED
+State=0
 
 [Field 6]
 Type=CheckBox
 Left=10
 Right=-1
+Top=50
+Bottom=58
+Text=Desktop Icon (Wireshark Qt)
+Flags=DISABLED
+State=0
+
+[Field 7]
+Type=CheckBox
+Left=10
+Right=-1
 Top=60
 Bottom=68
-Text=Associate trace file extensions to Wireshark (5vw, acp, apc, atc, bfr,
+Text=Quick Launch Icon (Wireshark Qt)
+Flags=DISABLED
+State=0
+
+[Field 8]
+Type=GroupBox
+Left=0
+Right=-1
+Top=75
+Bottom=140
+Text=File Extensions
 State=1
 
-[Field 7]
+[Field 9]
+Type=Radiobutton
+Radiogroup=1
+Left=10
+Right=-1
+Top=85
+Bottom=93
+Text=Associate trace file extensions to Wireshark GTK+
+State=1
+
+[Field 10]
+Type=Radiobutton
+Radiogroup=1
+Left=10
+Right=-1
+Top=95
+Bottom=103
+Text=Associate trace file extensions to Wireshark Qt
+Flags=DISABLED
+State=0
+
+[Field 11]
+Type=Radiobutton
+Radiogroup=1
+Left=10
+Right=-1
+Top=105
+Bottom=113
+Text=None
+State=0
+
+[Field 12]
 Type=Label
-Left=20
+Left=30
 Right=280
-Top=70
-Bottom=78
-Text=cap, enc, erf, fdc, out, pcap, pcapng, pkt, rf5, snoop, syc, tpc, tr1,
+Top=115
+Bottom=123
+Text=(5vw, acp, apc, atc, bfr, cap, enc, erf, fdc, out, pcap, pcapng, pkt,
 
-[Field 8]
+[Field 13]
 Type=Label
-Left=20
+Left=30
 Right=280
-Top=80
-Bottom=88
-Text=trace, trc, vwr, wpc, wpz)
+Top=125
+Bottom=133
+Text=rf5, snoop, syc, tpc, tr1, trace, trc, vwr, wpc, wpz)