Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
NSIS: Modernize the installer and remove GTK+ entries.
Migrate the Additional Tasks page to nsDialog. Create it using NSIS Dialog Designer. Migrate the Modern UI code (WinPcapPage.ini and USBPcapPage.ini) to Modern UI2. Use LogicLib flow control instead of Gotos+labels in more places. Change-Id: I1a3733f0202ca372456074f43e5ae23b1da4e1b9 Reviewed-on: https://code.wireshark.org/review/27449 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
- Loading branch information
1 parent
ff90e30
commit aedc1c7
Showing
7 changed files
with
248 additions
and
321 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!-- | ||
This file was created by NSISDialogDesigner 1.4.2.0 | ||
http://coolsoft.altervista.org/nsisdialogdesigner | ||
Do not edit manually! | ||
--> | ||
<Dialog Name="AdditionalTasksPage" Title="Additional Tasks" Subtitle="Create shortcuts and associate file extensions."> | ||
<CreateFunctionCustomScript>; Defined in wireshark.nsi | ||
Call InitAdditionalTasksPage</CreateFunctionCustomScript> | ||
<Label Name="ExtensionsLabel" Location="22, 151" Size="372, 52" Text="Extensions include 5vw, acp, apc, atc, bfr, cap, enc, erf, fdc, ipfix, lcap, mplog, out, pcap, pcapng, pklg, pkt, rf5, snoop, syc, tpc, tr1, trace, trc, vwr, wpc, and wpz." TabIndex="0" /> | ||
<CheckBox Name="AssociateExtensionsCheckBox" Location="22, 126" Size="406, 14" Text="Associate trace file extensions with Wireshark" TabIndex="1" /> | ||
<CheckBox Name="QuickLaunchCheckBox" Location="22, 74" Size="406, 14" Text="Wireshark Quick Launch Icon" TabIndex="2" /> | ||
<CheckBox Name="DesktopIconCheckBox" Location="22, 54" Size="406, 14" Text="Wireshark Desktop Icon" TabIndex="3" /> | ||
<CheckBox Name="StartMenuCheckBox" Location="22, 34" Size="406, 14" Text="Wireshark Start Menu Item" TabIndex="4" /> | ||
<Label Name="FileExtensionsLabel" Location="12, 101" Size="426, 14" Text="Associate File Extensions" Font="Microsoft Sans Serif, 8.25pt, style=Bold" TabIndex="5" /> | ||
<Label Name="CreateShortcutsLabel" Location="12, 9" Size="426, 14" Text="Create Shortcuts" Font="Microsoft Sans Serif, 8.25pt, style=Bold" TabIndex="6" /> | ||
</Dialog> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
; ========================================================= | ||
; This file was generated by NSISDialogDesigner 1.4.2.0 | ||
; http://coolsoft.altervista.org/nsisdialogdesigner | ||
; | ||
; Do not edit it manually, use NSISDialogDesigner instead! | ||
; ========================================================= | ||
|
||
; handle variables | ||
Var hCtl_AdditionalTasksPage | ||
Var hCtl_AdditionalTasksPage_ExtensionsLabel | ||
Var hCtl_AdditionalTasksPage_AssociateExtensionsCheckBox | ||
Var hCtl_AdditionalTasksPage_QuickLaunchCheckBox | ||
Var hCtl_AdditionalTasksPage_DesktopIconCheckBox | ||
Var hCtl_AdditionalTasksPage_StartMenuCheckBox | ||
Var hCtl_AdditionalTasksPage_FileExtensionsLabel | ||
Var hCtl_AdditionalTasksPage_CreateShortcutsLabel | ||
Var hCtl_AdditionalTasksPage_Font1 | ||
|
||
|
||
; dialog create function | ||
Function fnc_AdditionalTasksPage_Create | ||
|
||
; custom font definitions | ||
CreateFont $hCtl_AdditionalTasksPage_Font1 "Microsoft Sans Serif" "8.25" "700" | ||
|
||
; === AdditionalTasksPage (type: Dialog) === | ||
nsDialogs::Create 1018 | ||
Pop $hCtl_AdditionalTasksPage | ||
${If} $hCtl_AdditionalTasksPage == error | ||
Abort | ||
${EndIf} | ||
!insertmacro MUI_HEADER_TEXT "Additional Tasks" "Create shortcuts and associate file extensions." | ||
|
||
; === ExtensionsLabel (type: Label) === | ||
${NSD_CreateLabel} 14.48u 92.92u 244.86u 32u "Extensions include 5vw, acp, apc, atc, bfr, cap, enc, erf, fdc, ipfix, lcap, mplog, out, pcap, pcapng, pklg, pkt, rf5, snoop, syc, tpc, tr1, trace, trc, vwr, wpc, and wpz." | ||
Pop $hCtl_AdditionalTasksPage_ExtensionsLabel | ||
|
||
; === AssociateExtensionsCheckBox (type: Checkbox) === | ||
${NSD_CreateCheckbox} 14.48u 77.54u 267.24u 8.62u "Associate trace file extensions with Wireshark" | ||
Pop $hCtl_AdditionalTasksPage_AssociateExtensionsCheckBox | ||
|
||
; === QuickLaunchCheckBox (type: Checkbox) === | ||
${NSD_CreateCheckbox} 14.48u 45.54u 267.24u 8.62u "Wireshark Quick Launch Icon" | ||
Pop $hCtl_AdditionalTasksPage_QuickLaunchCheckBox | ||
|
||
; === DesktopIconCheckBox (type: Checkbox) === | ||
${NSD_CreateCheckbox} 14.48u 33.23u 267.24u 8.62u "Wireshark Desktop Icon" | ||
Pop $hCtl_AdditionalTasksPage_DesktopIconCheckBox | ||
|
||
; === StartMenuCheckBox (type: Checkbox) === | ||
${NSD_CreateCheckbox} 14.48u 20.92u 267.24u 8.62u "Wireshark Start Menu Item" | ||
Pop $hCtl_AdditionalTasksPage_StartMenuCheckBox | ||
|
||
; === FileExtensionsLabel (type: Label) === | ||
${NSD_CreateLabel} 7.9u 62.15u 280.41u 8.62u "Associate File Extensions" | ||
Pop $hCtl_AdditionalTasksPage_FileExtensionsLabel | ||
SendMessage $hCtl_AdditionalTasksPage_FileExtensionsLabel ${WM_SETFONT} $hCtl_AdditionalTasksPage_Font1 0 | ||
|
||
; === CreateShortcutsLabel (type: Label) === | ||
${NSD_CreateLabel} 7.9u 5.54u 280.41u 8.62u "Create Shortcuts" | ||
Pop $hCtl_AdditionalTasksPage_CreateShortcutsLabel | ||
SendMessage $hCtl_AdditionalTasksPage_CreateShortcutsLabel ${WM_SETFONT} $hCtl_AdditionalTasksPage_Font1 0 | ||
|
||
; CreateFunctionCustomScript | ||
; Defined in wireshark.nsi | ||
Call InitAdditionalTasksPage | ||
|
||
|
||
FunctionEnd | ||
|
||
; dialog show function | ||
Function fnc_AdditionalTasksPage_Show | ||
Call fnc_AdditionalTasksPage_Create | ||
nsDialogs::Show | ||
FunctionEnd | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -32,5 +32,3 @@ | |
!define SMI_DIR "@SMI_DIR@" | ||
|
||
!define QT_DIR "@QT_DIR@" | ||
|
||
!define GTK_DIR "@GTK_DIR@" |
Oops, something went wrong.