Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions WDAC-Policy-Wizard/app/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions WDAC-Policy-Wizard/app/Properties/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,9 @@
<data name="merge" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\imgs\merge.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="compare" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\imgs\compare.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="next" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\imgs\next.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
Expand Down
Binary file added WDAC-Policy-Wizard/app/Resources/imgs/compare.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions WDAC-Policy-Wizard/app/WDAC Wizard.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@
<Content Include="Resources\imgs\locked-padlock.png" />
<Content Include="Resources\imgs\question-sign.png" />
<Content Include="Resources\imgs\shield.png" />
<Content Include="Resources\imgs\compare.png" />
<Content Include="Resources\imgs\toggle.png" />
<Content Include="Resources\imgs\toggle_lg.png" />
<Content Include="Resources\imgs\untoggle.png" />
Expand Down
71 changes: 56 additions & 15 deletions WDAC-Policy-Wizard/app/src/MainForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 27 additions & 0 deletions WDAC-Policy-Wizard/app/src/MainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,33 @@ private void Button_Merge_Click(object sender, EventArgs e)
}
}

/// <summary>
/// Compare policy button selected: opens a separate window where the user can load 2 or
/// more policies (XML or binary) and view their differences side-by-side. The comparison
/// flow is non-destructive and does not affect the active wizard workflow state.
/// </summary>
private void Button_Compare_Click(object sender, EventArgs e)
{
Logger.Log.AddNewSeparationLine("Workflow -- Compare Policies Selected");

try
{
using (var compareForm = new PolicyCompare_Form())
{
compareForm.ShowDialog(this);
}
}
catch (Exception ex)
{
Logger.Log.AddErrorMsg("Button_Compare_Click caught the following exception", ex);
MessageBox.Show(this,
"Unable to open the Policy Compare window: " + ex.Message,
"Policy Compare Error",
MessageBoxButtons.OK,
MessageBoxIcon.Error);
}
}

// #####################
// CONTROL PANEL CONTROLS
// #####################
Expand Down
Loading