Skip to content

Commit

Permalink
Deduplicate ChocolateyMessageBox class
Browse files Browse the repository at this point in the history 
Remove a lot of the duplication in the ChocolateyMessageBox class.

Co-authored-by: Gary Ewan Park <[email protected]>
  • Loading branch information
@corbob @gep13
corbob and gep13 authored Jan 20, 2022
1 parent cbee966 commit 07ee3d8
Showing 1 changed file with 21 additions and 61 deletions.
82 changes: 21 additions & 61 deletions Source/ChocolateyGui.Common.Windows/Utilities/ChocolateyMessageBox.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,110 +11,70 @@ namespace ChocolateyGui.Common.Windows.Utilities

public static class ChocolateyMessageBox
{
public static MessageBoxResult Show(string messageBoxText)
public static MessageBoxResult Show(string messageBoxText)
{
var dummyWindow = DummyWindow();
dummyWindow.Show();
var result = MessageBox.Show(messageBoxText);
dummyWindow.Close();
return result;
return Show(messageBoxText, string.Empty);
}

public static MessageBoxResult Show(string messageBoxText, string caption)
{
var dummyWindow = DummyWindow();
dummyWindow.Show();
var result = MessageBox.Show(messageBoxText, caption);
dummyWindow.Close();
return result;
return Show(messageBoxText, caption, MessageBoxButton.OK);
}

public static MessageBoxResult Show(string messageBoxText, string caption, MessageBoxButton button)
{
var dummyWindow = DummyWindow();
dummyWindow.Show();
var result = MessageBox.Show(messageBoxText, caption, button);
dummyWindow.Close();
return result;
return Show(messageBoxText, caption, button, MessageBoxImage.None);
}

public static MessageBoxResult Show(string messageBoxText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, MessageBoxOptions options)
public static MessageBoxResult Show(string messageBoxText, string caption, MessageBoxButton button, MessageBoxImage icon)
{
var dummyWindow = DummyWindow();
dummyWindow.Show();
var result = MessageBox.Show(messageBoxText, caption, button, icon, defaultResult, options);
dummyWindow.Show();
return result;
return Show(messageBoxText, caption, button, icon, MessageBoxResult.OK);
}

public static MessageBoxResult Show(string messageBoxText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult)
{
var dummyWindow = DummyWindow();
dummyWindow.Show();
var result = MessageBox.Show(messageBoxText, caption, button, icon, defaultResult);
dummyWindow.Show();
return result;
return Show(messageBoxText, caption, button, icon, defaultResult, MessageBoxOptions.None);
}

public static MessageBoxResult Show(string messageBoxText, string caption, MessageBoxButton button, MessageBoxImage icon)
public static MessageBoxResult Show(string messageBoxText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, MessageBoxOptions options)
{
var dummyWindow = DummyWindow();
dummyWindow.Show();
var result = MessageBox.Show(messageBoxText, caption, button, icon);
var result = MessageBox.Show(messageBoxText, caption, button, icon, defaultResult, options);
dummyWindow.Show();
return result;
}

public static MessageBoxResult Show(Window owner, string messageBoxText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, MessageBoxOptions options)
public static MessageBoxResult Show(Window owner, string messageBoxText)
{
var dummyWindow = DummyWindow();
dummyWindow.Show();
var result = MessageBox.Show(owner, messageBoxText, caption, button, icon, defaultResult, options);
dummyWindow.Show();
return result;
return Show(owner, messageBoxText, string.Empty);
}

public static MessageBoxResult Show(Window owner, string messageBoxText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult)
public static MessageBoxResult Show(Window owner, string messageBoxText, string caption)
{
var dummyWindow = DummyWindow();
dummyWindow.Show();
var result = MessageBox.Show(owner, messageBoxText, caption, button, icon, defaultResult);
dummyWindow.Show();
return result;
return Show(owner, messageBoxText, caption, MessageBoxButton.OK);
}

public static MessageBoxResult Show(Window owner, string messageBoxText, string caption, MessageBoxButton button, MessageBoxImage icon)
public static MessageBoxResult Show(Window owner, string messageBoxText, string caption, MessageBoxButton button)
{
var dummyWindow = DummyWindow();
dummyWindow.Show();
var result = MessageBox.Show(owner, messageBoxText, caption, button, icon);
dummyWindow.Show();
return result;
return Show(owner, messageBoxText, caption, button, MessageBoxImage.None);
}

public static MessageBoxResult Show(Window owner, string messageBoxText, string caption, MessageBoxButton button)
public static MessageBoxResult Show(Window owner, string messageBoxText, string caption, MessageBoxButton button, MessageBoxImage icon)
{
var dummyWindow = DummyWindow();
dummyWindow.Show();
var result = MessageBox.Show(owner, messageBoxText, caption, button);
dummyWindow.Show();
return result;
return Show(owner, messageBoxText, caption, button, icon, MessageBoxResult.OK);
}

public static MessageBoxResult Show(Window owner, string messageBoxText, string caption)
public static MessageBoxResult Show(Window owner, string messageBoxText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult)
{
var dummyWindow = DummyWindow();
dummyWindow.Show();
var result = MessageBox.Show(owner, messageBoxText, caption);
dummyWindow.Show();
return result;
return Show(owner, messageBoxText, caption, button, icon, defaultResult, MessageBoxOptions.None);
}

public static MessageBoxResult Show(Window owner, string messageBoxText)
public static MessageBoxResult Show(Window owner, string messageBoxText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, MessageBoxOptions options)
{
var dummyWindow = DummyWindow();
dummyWindow.Show();
var result = MessageBox.Show(owner, messageBoxText);
var result = MessageBox.Show(owner, messageBoxText, caption, button, icon, defaultResult, options);
dummyWindow.Show();
return result;
}
Expand Down

0 comments on commit 07ee3d8

Please sign in to comment.