Wireshark-commits: [Wireshark-commits] master 575e363: WiX: Disable desktop icon and shortcut check
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sat, 24 Sep 2016 02:10:22 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=575e36324c700ac89cb11ff4e70dcfe542ad753c
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

575e363 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    WiX: Disable desktop icon and shortcut checkboxes.
    
    Enable and disable the Wireshark and Wireshark-gtk desktop icon and
    shortcut checkboxes depending on our feature selections to match the
    NSIS installer behavior (and make sense).
    
    Set the level of "Fe.WiresharkGTK" to 2 so that it's disabled by default.
    This roughly matches the behavior of the NSIS installer.
    
    Note that we can't enable or disable radio buttons.
    
    Change-Id: I1c73f901344e21bd62e67890ce544f644c0cdda6
    Reviewed-on: https://code.wireshark.org/review/17898
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  a1b04ad   More WSDG layout & markup fixups.
    adds  575e363   WiX: Disable desktop icon and shortcut checkboxes.


Summary of changes:
 packaging/wix/Features.wxi            |    2 +-
 packaging/wix/WiresharkOptionsDlg.wxs |   37 ++++++++++++++++++++++++++-------
 2 files changed, 31 insertions(+), 8 deletions(-)