diff options
| author | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2012-12-02 23:55:44 +0000 |
|---|---|---|
| committer | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2012-12-02 23:55:44 +0000 |
| commit | f5b9238ed6105890ddf756b562918944acd7a29f (patch) | |
| tree | a8bc9e20cbea3ed73a6271660fc7990e7e419be7 /packaging/nsis | |
| parent | e52313959bdfaadfba750d8cb205ed85c916005c (diff) | |
Make list of file extensions to register display properly, using 3 text
lines rather than 2. Add 2 new extensions to common.nsh.
Not sure if changes to wireshark.ini are necessary, copied what was done
for "Field 7", which is also just a label.
svn path=/trunk/; revision=46337
Diffstat (limited to 'packaging/nsis')
| -rw-r--r-- | packaging/nsis/AdditionalTasksPage.ini | 14 | ||||
| -rwxr-xr-x | packaging/nsis/common.nsh | 2 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 2 |
3 files changed, 15 insertions, 3 deletions
diff --git a/packaging/nsis/AdditionalTasksPage.ini b/packaging/nsis/AdditionalTasksPage.ini index 9ccb57dceb..f21b1f9341 100644 --- a/packaging/nsis/AdditionalTasksPage.ini +++ b/packaging/nsis/AdditionalTasksPage.ini @@ -1,5 +1,5 @@ [Settings] -NumFields=7 +NumFields=8 [Field 1] Type=GroupBox @@ -42,7 +42,7 @@ Type=GroupBox Left=0 Right=-1 Top=50 -Bottom=85 +Bottom=95 Text=File Extensions State=1 @@ -61,5 +61,13 @@ Left=20 Right=280 Top=70 Bottom=78 -Text=cap, enc, erf, fdc, out, pcap, pcapng, pkt, rf5, snoop, syc, tpc, tr1, trace, trc, vwr, wpc, wpz) +Text=cap, enc, erf, fdc, out, pcap, pcapng, pkt, rf5, snoop, syc, tpc, tr1, + +[Field 8] +Type=Label +Left=20 +Right=280 +Top=80 +Bottom=88 +Text=trace, trc, vwr, wpc, wpz) diff --git a/packaging/nsis/common.nsh b/packaging/nsis/common.nsh index 7676e28a3d..5734dcba21 100755 --- a/packaging/nsis/common.nsh +++ b/packaging/nsis/common.nsh @@ -78,6 +78,7 @@ UpdateIcons.quit_${UPDATEICONS_UNIQUE}: Push "${FILE_EXTENSION_MARKER}" Push ".wpz" Push ".wpc" + Push ".vwr" Push ".trc" Push ".trace" Push ".tr1" @@ -88,6 +89,7 @@ UpdateIcons.quit_${UPDATEICONS_UNIQUE}: Push ".pkt" Push ".pcapng" Push ".pcap" + Push ".out" Push ".ntar" Push ".fdc" Push ".erf" diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 8ac87b3ab6..a94089ecc4 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -997,12 +997,14 @@ Function .onSelChange WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 6" "State" 1 WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 6" "Flags" "" WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 7" "Flags" "" + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 8" "Flags" "" Goto onSelChange.end onSelChange.unselect: WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 6" "State" 0 WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 6" "Flags" "DISABLED" WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 7" "Flags" "DISABLED" + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 8" "Flags" "DISABLED" Goto onSelChange.end onSelChange.end: |