diff options
Diffstat (limited to 'packaging/wix/WiresharkOptionsDlg.wxs')
| -rw-r--r-- | packaging/wix/WiresharkOptionsDlg.wxs | 113 |
1 files changed, 57 insertions, 56 deletions
diff --git a/packaging/wix/WiresharkOptionsDlg.wxs b/packaging/wix/WiresharkOptionsDlg.wxs index 9b1cd3aacb..42f865f3cb 100644 --- a/packaging/wix/WiresharkOptionsDlg.wxs +++ b/packaging/wix/WiresharkOptionsDlg.wxs @@ -1,64 +1,65 @@ <?xml version="1.0" encoding="UTF-8"?> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> - <UI> - <Dialog Id="WiresharkOptionsDlg" Width="370" Height="320" Title="!(loc.LicenseAgreementDlg_Title)"> - <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.LicenseAgreementDlgBannerBitmap)" /> - <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" /> - <Control Id="Description" Type="Text" X="25" Y="23" Width="340" Height="15" Transparent="yes" NoPrefix="yes" Text="Which additional tasks should be done?" /> - <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="Select Additional Tasks" /> + <UI> + <!-- + Recommended control sizing and spacing: + https://msdn.microsoft.com/en-us/library/windows/desktop/dn742486.aspx#sizingandspacing + The recommended spacing between unrelated controls is 7, but 10 looks better. + --> + <Dialog Id="WiresharkOptionsDlg" Width="370" Height="270" Title="!(loc.LicenseAgreementDlg_Title)"> + <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.LicenseAgreementDlgBannerBitmap)"/> + <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0"/> + <Control Id="Title" Type="Text" X="14" Y="7" Width="350" Height="15" Transparent="yes" NoPrefix="yes" Text="Packet capture, shortcuts, and file extensions"/> + <Control Id="Description" Type="Text" X="20" Y="26" Width="350" Height="15" Transparent="yes" NoPrefix="yes" Text="You must install Npcap or WinPcap in order to capture packets."/> - <Control Id="Shortcuts" Type="GroupBox" X="15" Y="50" Width="250" Height="125" Text="Create Shortcuts"/> - <Control Id="WiresharkStartMenuCB" Type="CheckBox" X="20" Y="65" Width="180" Height="15" CheckBoxValue="1" Property="WIRESHARK_START_MENU" Text="Wireshark Start Menu Item"> - <Condition Action="enable"><![CDATA[&Fe.Wireshark = 3]]></Condition> - <Condition Action="disable"><![CDATA[&Fe.Wireshark <> 3]]></Condition> - </Control> - <Control Id="WiresharkDesktopIconCB" Type="CheckBox" X="20" Y="83" Width="180" Height="15" CheckBoxValue="1" Property="WIRESHARK_DESKTOP_ICON" Text="Wireshark Desktop Icon"> - <Condition Action="enable"><![CDATA[&Fe.Wireshark = 3]]></Condition> - <Condition Action="disable"><![CDATA[&Fe.Wireshark <> 3]]></Condition> - </Control> - <Control Id="WiresharkQuickLaunchIconCB" Type="CheckBox" X="20" Y="101" Width="180" Height="15" CheckBoxValue="1" Property="WIRESHARK_QUICK_LAUNCH_ICON" Text="Wireshark Quick Launch Icon"> - <Condition Action="enable"><![CDATA[&Fe.Wireshark = 3]]></Condition> - <Condition Action="disable"><![CDATA[&Fe.Wireshark <> 3]]></Condition> - </Control> + <!-- BannerLine y = 44, 44 + 7 = 51 --> + <Control Id="NetworkCapture" Type="Text" X="14" Y="51" Width="350" Height="12" Text="{\WixUI_Font_Bold}Wireshark requires Npcap or WinPcap to capture network packets"/> + <Control Id="NetworkCaptureNpcap" Type="Hyperlink" X="20" Y="63" Width="350" Height="11"> + <Text><![CDATA[<a href="http://npcap.org">Download Npcap</a> (recommended)]]></Text> + </Control> + <!-- It looks Hyperlink controls only support one hyperlink, per control. --> + <Control Id="NetworkCaptureWinPcap" Type="Hyperlink" X="20" Y="74" Width="350" Height="11"> + <Text><![CDATA[…or <a href="https://www.winpcap.org">download WinPcap</a>]]></Text> + </Control> - <?ifdef GTK_DIR?> - <Control Id="WiresharkLegacyStartMenuCB" Type="CheckBox" X="20" Y="117" Width="180" Height="15" CheckBoxValue="1" Property="WIRESHARK_LEGACY_START_MENU" Text="Wireshark Legacy Start Menu Item"> - <Condition Action="enable"><![CDATA[&Fe.WiresharkGTK = 3]]></Condition> - <Condition Action="disable"><![CDATA[&Fe.WiresharkGTK <> 3]]></Condition> - </Control> - <Control Id="WiresharkLegacyDesktopIconCB" Type="CheckBox" X="20" Y="135" Width="180" Height="15" CheckBoxValue="1" Property="WIRESHARK_LEGACY_DESKTOP_ICON" Text="Wireshark Legacy Desktop Icon"> - <Condition Action="enable"><![CDATA[&Fe.WiresharkGTK = 3]]></Condition> - <Condition Action="disable"><![CDATA[&Fe.WiresharkGTK <> 3]]></Condition> - </Control> - <Control Id="WiresharkLegacyQuickLaunchIconCB" Type="CheckBox" X="20" Y="153" Width="180" Height="15" CheckBoxValue="1" Property="WIRESHARK_LEGACY_QUICK_LAUNCH_ICON" Text="Wireshark Legacy Quick Launch Icon"> - <Condition Action="enable"><![CDATA[&Fe.WiresharkGTK = 3]]></Condition> - <Condition Action="disable"><![CDATA[&Fe.WiresharkGTK <> 3]]></Condition> - </Control> - <?endif?> + <!-- NetworkCaptureWinPcap y = 74, 74 + 8 + 10 = 92 --> + <Control Id="UsbCapture" Type="Text" X="14" Y="92" Width="350" Height="12" Text="{\WixUI_Font_Bold}Wireshark requires USBPcap to capture USB Packets"/> + <Control Id="UsbCaptureUsbPcap" Type="Hyperlink" X="20" Y="104" Width="350" Height="11"> + <Text><![CDATA[<a href="http://desowin.org/usbpcap/">Download USBPcap</a> (experimental)]]></Text> + </Control> - <Control Id="FileExtensions" Type="GroupBox" X="15" Y="180" Width="250" Height="100" Text="File Extensions"/> - <Control Id="FileExtensionsRadio" Type="RadioButtonGroup" X="20" Y="190" Width="235" Height="50" Property="WIRESHARK_FILE_EXTENSIONS"> - <RadioButtonGroup Property="WIRESHARK_FILE_EXTENSIONS"> - <!-- - It doesn't look like RadioButtons can be enabled or disabled: - http://windows-installer-xml-wix-toolset.687559.n2.nabble.com/disabling-a-single-RadioButton-td694368.html - --> - <RadioButton Value="0" X="5" Y="5" Height="15" Width="235" Text="Associate trace file extensions to Wireshark" /> - <RadioButton Value="1" X="5" Y="20" Height="15" Width="235" Text="Associate trace file extensions to Wireshark Legacy" /> - <RadioButton Value="2" X="5" Y="35" Height="15" Width="235" Text="None" /> - </RadioButtonGroup> - </Control> - <Control Id="FileExtensionsText1" Type="Text" X="20" Y="250" Width="235" Height="15" Transparent="yes" NoPrefix="yes" Text="Extensions: 5vw, acp, apc, atc, bfr, cap, enc, erf, fdc, lcap, mplog, ntar, out," /> - <Control Id="FileExtensionsText2" Type="Text" X="20" Y="265" Width="235" Height="15" Transparent="yes" NoPrefix="yes" Text="pcap, pcapng, pkt, rf5, snoop, syc, tpc, tr1, trace, trc, vwr, wpc, wpz" /> + <!-- UsbCaptureUsbPcap y = 104, 104 + 8 + 10 = 122 --> + <Control Id="Shortcuts" Type="Text" X="14" Y="122" Width="350" Height="11" Text="{\WixUI_Font_Bold}Create Shortcuts"/><!-- h = static text + label spacing = 8 + 3 --> + <Control Id="WiresharkStartMenuCB" Type="CheckBox" X="20" Y="133" Width="350" Height="14" CheckBoxValue="1" Property="WIRESHARK_START_MENU" Text="Wireshark Start Menu Item"><!-- h = 10 + 4 --> + <Condition Action="enable"><![CDATA[&Fe.Wireshark = 3]]></Condition> + <Condition Action="disable"><![CDATA[&Fe.Wireshark <> 3]]></Condition> + </Control> + <Control Id="WiresharkDesktopIconCB" Type="CheckBox" X="20" Y="147" Width="350" Height="14" CheckBoxValue="1" Property="WIRESHARK_DESKTOP_ICON" Text="Wireshark Desktop Icon"> + <Condition Action="enable"><![CDATA[&Fe.Wireshark = 3]]></Condition> + <Condition Action="disable"><![CDATA[&Fe.Wireshark <> 3]]></Condition> + </Control> + <Control Id="WiresharkQuickLaunchIconCB" Type="CheckBox" X="20" Y="161" Width="350" Height="14" CheckBoxValue="1" Property="WIRESHARK_QUICK_LAUNCH_ICON" Text="Wireshark Quick Launch Icon"> + <Condition Action="enable"><![CDATA[&Fe.Wireshark = 3]]></Condition> + <Condition Action="disable"><![CDATA[&Fe.Wireshark <> 3]]></Condition> + </Control> - <Control Id="BottomLine" Type="Line" X="0" Y="284" Width="370" Height="0" /> - <Control Id="Back" Type="PushButton" X="180" Y="293" Width="56" Height="17" Text="!(loc.WixUIBack)" /> - <Control Id="Next" Type="PushButton" X="236" Y="293" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)"/> - <Control Id="Cancel" Type="PushButton" X="304" Y="293" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)"> - <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish> - </Control> - </Dialog> - </UI> - </Fragment> + <!-- WiresharkQuickLaunchIconCB y = 161, 161 + 10 + 10 = 181 --> + <Control Id="FileExtensions" Type="Text" X="14" Y="181" Width="350" Height="11" Text="{\WixUI_Font_Bold}Associate File Extensions"/><!-- h = static text + label spacing = 8 + 3 --> + <Control Id="FileExtensionsCB" Type="CheckBox" X="20" Y="192" Width="350" Height="14" CheckBoxValue="1" Property="WIRESHARK_FILE_EXTENSIONS" Text="Associate trace file extensions with Wireshark"> + <Condition Action="enable"><![CDATA[&Fe.Wireshark = 3]]></Condition> + <Condition Action="disable"><![CDATA[&Fe.Wireshark <> 3]]></Condition> + </Control> + <Control Id="FileExtensionsText1" Type="Text" X="20" Y="206" Width="350" Height="11" Transparent="yes" NoPrefix="yes" Text="Extensions include 5vw, acp, apc, atc, bfr, cap, enc, erf, fdc, lcap, mplog, ntar, out,"/> + <Control Id="FileExtensionsText2" Type="Text" X="20" Y="217" Width="350" Height="11" Transparent="yes" NoPrefix="yes" Text="pcap, pcapng, pkt, rf5, snoop, syc, tpc, tr1, trace, trc, vwr, wpc, and wpz."/> + + <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0"/> + <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)"/> + <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)"/> + <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)"> + <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish> + </Control> + </Dialog> + </UI> + </Fragment> </Wix> |