重构InternalShowDialog
This commit is contained in:
1 parent
ceb8dbb465
commit
86349157b0
1 file changed
+28
-123
@@ -31,7 +31,7 @@ namespace HandyControl.Controls
|
|||||||
|
|
||||||
public string Message
|
public string Message
|
||||||
{
|
{
|
||||||
get => (string) GetValue(MessageProperty);
|
get => (string)GetValue(MessageProperty);
|
||||||
set => SetValue(MessageProperty, value);
|
set => SetValue(MessageProperty, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -40,7 +40,7 @@ namespace HandyControl.Controls
|
|||||||
|
|
||||||
public Geometry Image
|
public Geometry Image
|
||||||
{
|
{
|
||||||
get => (Geometry) GetValue(ImageProperty);
|
get => (Geometry)GetValue(ImageProperty);
|
||||||
set => SetValue(ImageProperty, value);
|
set => SetValue(ImageProperty, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -49,7 +49,7 @@ namespace HandyControl.Controls
|
|||||||
|
|
||||||
public Brush ImageBrush
|
public Brush ImageBrush
|
||||||
{
|
{
|
||||||
get => (Brush) GetValue(ImageBrushProperty);
|
get => (Brush)GetValue(ImageBrushProperty);
|
||||||
set => SetValue(ImageBrushProperty, value);
|
set => SetValue(ImageBrushProperty, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -58,7 +58,7 @@ namespace HandyControl.Controls
|
|||||||
|
|
||||||
public bool ShowImage
|
public bool ShowImage
|
||||||
{
|
{
|
||||||
get => (bool) GetValue(ShowImageProperty);
|
get => (bool)GetValue(ShowImageProperty);
|
||||||
set => SetValue(ShowImageProperty, value);
|
set => SetValue(ShowImageProperty, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -131,6 +131,14 @@ namespace HandyControl.Controls
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void InternalShowDialog()
|
||||||
|
{
|
||||||
|
#if !netle40
|
||||||
|
SystemSounds.Asterisk.Play();
|
||||||
|
#endif
|
||||||
|
ShowDialog();
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 成功
|
/// 成功
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -139,18 +147,7 @@ namespace HandyControl.Controls
|
|||||||
public static MessageBoxResult Success(string messageBoxText, string caption = null)
|
public static MessageBoxResult Success(string messageBoxText, string caption = null)
|
||||||
{
|
{
|
||||||
MessageBox messageBox = null;
|
MessageBox messageBox = null;
|
||||||
#if netle40
|
|
||||||
Application.Current.Dispatcher.Invoke(new Action(() =>
|
Application.Current.Dispatcher.Invoke(new Action(() =>
|
||||||
{
|
|
||||||
messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.OK);
|
|
||||||
SetButtonStatus(messageBox, MessageBoxButton.OK);
|
|
||||||
messageBox.ShowImage = true;
|
|
||||||
messageBox.Image = ResourceHelper.GetResource<Geometry>(ResourceToken.SuccessGeometry);
|
|
||||||
messageBox.ImageBrush = ResourceHelper.GetResource<Brush>(ResourceToken.SuccessBrush);
|
|
||||||
messageBox.ShowDialog();
|
|
||||||
}));
|
|
||||||
#else
|
|
||||||
Application.Current.Dispatcher.Invoke(() =>
|
|
||||||
{
|
{
|
||||||
messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.OK);
|
messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.OK);
|
||||||
SetButtonStatus(messageBox, MessageBoxButton.OK);
|
SetButtonStatus(messageBox, MessageBoxButton.OK);
|
||||||
@@ -158,10 +155,8 @@ namespace HandyControl.Controls
|
|||||||
messageBox.Image = ResourceHelper.GetResource<Geometry>(ResourceToken.SuccessGeometry);
|
messageBox.Image = ResourceHelper.GetResource<Geometry>(ResourceToken.SuccessGeometry);
|
||||||
messageBox.ImageBrush = ResourceHelper.GetResource<Brush>(ResourceToken.SuccessBrush);
|
messageBox.ImageBrush = ResourceHelper.GetResource<Brush>(ResourceToken.SuccessBrush);
|
||||||
SystemSounds.Asterisk.Play();
|
SystemSounds.Asterisk.Play();
|
||||||
messageBox.ShowDialog();
|
messageBox.InternalShowDialog();
|
||||||
});
|
}));
|
||||||
#endif
|
|
||||||
|
|
||||||
return messageBox._messageBoxResult;
|
return messageBox._messageBoxResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -173,25 +168,14 @@ namespace HandyControl.Controls
|
|||||||
public static MessageBoxResult Info(string messageBoxText, string caption = null)
|
public static MessageBoxResult Info(string messageBoxText, string caption = null)
|
||||||
{
|
{
|
||||||
MessageBox messageBox = null;
|
MessageBox messageBox = null;
|
||||||
#if netle40
|
|
||||||
Application.Current.Dispatcher.Invoke(new Action(() =>
|
Application.Current.Dispatcher.Invoke(new Action(() =>
|
||||||
{
|
|
||||||
messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK);
|
|
||||||
SetButtonStatus(messageBox, MessageBoxButton.OK);
|
|
||||||
SetImage(messageBox, MessageBoxImage.Information);
|
|
||||||
messageBox.ShowDialog();
|
|
||||||
}));
|
|
||||||
#else
|
|
||||||
Application.Current.Dispatcher.Invoke(() =>
|
|
||||||
{
|
{
|
||||||
messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK);
|
messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK);
|
||||||
SetButtonStatus(messageBox, MessageBoxButton.OK);
|
SetButtonStatus(messageBox, MessageBoxButton.OK);
|
||||||
SetImage(messageBox, MessageBoxImage.Information);
|
SetImage(messageBox, MessageBoxImage.Information);
|
||||||
SystemSounds.Asterisk.Play();
|
SystemSounds.Asterisk.Play();
|
||||||
messageBox.ShowDialog();
|
messageBox.InternalShowDialog();
|
||||||
});
|
}));
|
||||||
#endif
|
|
||||||
|
|
||||||
return messageBox._messageBoxResult;
|
return messageBox._messageBoxResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -203,25 +187,14 @@ namespace HandyControl.Controls
|
|||||||
public static MessageBoxResult Warning(string messageBoxText, string caption = null)
|
public static MessageBoxResult Warning(string messageBoxText, string caption = null)
|
||||||
{
|
{
|
||||||
MessageBox messageBox = null;
|
MessageBox messageBox = null;
|
||||||
#if netle40
|
|
||||||
Application.Current.Dispatcher.Invoke(new Action(() =>
|
Application.Current.Dispatcher.Invoke(new Action(() =>
|
||||||
{
|
|
||||||
messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Warning, MessageBoxResult.OK);
|
|
||||||
SetButtonStatus(messageBox, MessageBoxButton.OK);
|
|
||||||
SetImage(messageBox, MessageBoxImage.Warning);
|
|
||||||
messageBox.ShowDialog();
|
|
||||||
}));
|
|
||||||
#else
|
|
||||||
Application.Current.Dispatcher.Invoke(() =>
|
|
||||||
{
|
{
|
||||||
messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Warning, MessageBoxResult.OK);
|
messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Warning, MessageBoxResult.OK);
|
||||||
SetButtonStatus(messageBox, MessageBoxButton.OK);
|
SetButtonStatus(messageBox, MessageBoxButton.OK);
|
||||||
SetImage(messageBox, MessageBoxImage.Warning);
|
SetImage(messageBox, MessageBoxImage.Warning);
|
||||||
SystemSounds.Asterisk.Play();
|
SystemSounds.Asterisk.Play();
|
||||||
messageBox.ShowDialog();
|
messageBox.InternalShowDialog();
|
||||||
});
|
}));
|
||||||
#endif
|
|
||||||
|
|
||||||
return messageBox._messageBoxResult;
|
return messageBox._messageBoxResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -233,25 +206,14 @@ namespace HandyControl.Controls
|
|||||||
public static MessageBoxResult Error(string messageBoxText, string caption = null)
|
public static MessageBoxResult Error(string messageBoxText, string caption = null)
|
||||||
{
|
{
|
||||||
MessageBox messageBox = null;
|
MessageBox messageBox = null;
|
||||||
#if netle40
|
|
||||||
Application.Current.Dispatcher.Invoke(new Action(() =>
|
Application.Current.Dispatcher.Invoke(new Action(() =>
|
||||||
{
|
|
||||||
messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK);
|
|
||||||
SetButtonStatus(messageBox, MessageBoxButton.OK);
|
|
||||||
SetImage(messageBox, MessageBoxImage.Error);
|
|
||||||
messageBox.ShowDialog();
|
|
||||||
}));
|
|
||||||
#else
|
|
||||||
Application.Current.Dispatcher.Invoke(() =>
|
|
||||||
{
|
{
|
||||||
messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK);
|
messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK);
|
||||||
SetButtonStatus(messageBox, MessageBoxButton.OK);
|
SetButtonStatus(messageBox, MessageBoxButton.OK);
|
||||||
SetImage(messageBox, MessageBoxImage.Error);
|
SetImage(messageBox, MessageBoxImage.Error);
|
||||||
SystemSounds.Asterisk.Play();
|
SystemSounds.Asterisk.Play();
|
||||||
messageBox.ShowDialog();
|
messageBox.InternalShowDialog();
|
||||||
});
|
}));
|
||||||
#endif
|
|
||||||
|
|
||||||
return messageBox._messageBoxResult;
|
return messageBox._messageBoxResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -263,18 +225,7 @@ namespace HandyControl.Controls
|
|||||||
public static MessageBoxResult Fatal(string messageBoxText, string caption = null)
|
public static MessageBoxResult Fatal(string messageBoxText, string caption = null)
|
||||||
{
|
{
|
||||||
MessageBox messageBox = null;
|
MessageBox messageBox = null;
|
||||||
#if netle40
|
|
||||||
Application.Current.Dispatcher.Invoke(new Action(() =>
|
Application.Current.Dispatcher.Invoke(new Action(() =>
|
||||||
{
|
|
||||||
messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.OK);
|
|
||||||
SetButtonStatus(messageBox, MessageBoxButton.OK);
|
|
||||||
messageBox.ShowImage = true;
|
|
||||||
messageBox.Image = ResourceHelper.GetResource<Geometry>(ResourceToken.FatalGeometry);
|
|
||||||
messageBox.ImageBrush = ResourceHelper.GetResource<Brush>(ResourceToken.PrimaryTextBrush);
|
|
||||||
messageBox.ShowDialog();
|
|
||||||
}));
|
|
||||||
#else
|
|
||||||
Application.Current.Dispatcher.Invoke(() =>
|
|
||||||
{
|
{
|
||||||
messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.OK);
|
messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.OK);
|
||||||
SetButtonStatus(messageBox, MessageBoxButton.OK);
|
SetButtonStatus(messageBox, MessageBoxButton.OK);
|
||||||
@@ -282,10 +233,8 @@ namespace HandyControl.Controls
|
|||||||
messageBox.Image = ResourceHelper.GetResource<Geometry>(ResourceToken.FatalGeometry);
|
messageBox.Image = ResourceHelper.GetResource<Geometry>(ResourceToken.FatalGeometry);
|
||||||
messageBox.ImageBrush = ResourceHelper.GetResource<Brush>(ResourceToken.PrimaryTextBrush);
|
messageBox.ImageBrush = ResourceHelper.GetResource<Brush>(ResourceToken.PrimaryTextBrush);
|
||||||
SystemSounds.Asterisk.Play();
|
SystemSounds.Asterisk.Play();
|
||||||
messageBox.ShowDialog();
|
messageBox.InternalShowDialog();
|
||||||
});
|
}));
|
||||||
#endif
|
|
||||||
|
|
||||||
return messageBox._messageBoxResult;
|
return messageBox._messageBoxResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -297,25 +246,14 @@ namespace HandyControl.Controls
|
|||||||
public static MessageBoxResult Ask(string messageBoxText, string caption = null)
|
public static MessageBoxResult Ask(string messageBoxText, string caption = null)
|
||||||
{
|
{
|
||||||
MessageBox messageBox = null;
|
MessageBox messageBox = null;
|
||||||
#if netle40
|
|
||||||
Application.Current.Dispatcher.Invoke(new Action(() =>
|
Application.Current.Dispatcher.Invoke(new Action(() =>
|
||||||
{
|
|
||||||
messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OKCancel, MessageBoxImage.Question, MessageBoxResult.Cancel);
|
|
||||||
SetButtonStatus(messageBox, MessageBoxButton.OKCancel);
|
|
||||||
SetImage(messageBox, MessageBoxImage.Question);
|
|
||||||
messageBox.ShowDialog();
|
|
||||||
}));
|
|
||||||
#else
|
|
||||||
Application.Current.Dispatcher.Invoke(() =>
|
|
||||||
{
|
{
|
||||||
messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OKCancel, MessageBoxImage.Question, MessageBoxResult.Cancel);
|
messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OKCancel, MessageBoxImage.Question, MessageBoxResult.Cancel);
|
||||||
SetButtonStatus(messageBox, MessageBoxButton.OKCancel);
|
SetButtonStatus(messageBox, MessageBoxButton.OKCancel);
|
||||||
SetImage(messageBox, MessageBoxImage.Question);
|
SetImage(messageBox, MessageBoxImage.Question);
|
||||||
SystemSounds.Asterisk.Play();
|
SystemSounds.Asterisk.Play();
|
||||||
messageBox.ShowDialog();
|
messageBox.InternalShowDialog();
|
||||||
});
|
}));
|
||||||
#endif
|
|
||||||
|
|
||||||
return messageBox._messageBoxResult;
|
return messageBox._messageBoxResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -327,7 +265,6 @@ namespace HandyControl.Controls
|
|||||||
public static MessageBoxResult Show(MessageBoxInfo info)
|
public static MessageBoxResult Show(MessageBoxInfo info)
|
||||||
{
|
{
|
||||||
MessageBox messageBox = null;
|
MessageBox messageBox = null;
|
||||||
#if netle40
|
|
||||||
Application.Current.Dispatcher.Invoke(new Action(() =>
|
Application.Current.Dispatcher.Invoke(new Action(() =>
|
||||||
{
|
{
|
||||||
messageBox = CreateMessageBox(null, info.MessageBoxText, info.Caption, info.Button, MessageBoxImage.None, info.DefaultResult);
|
messageBox = CreateMessageBox(null, info.MessageBoxText, info.Caption, info.Button, MessageBoxImage.None, info.DefaultResult);
|
||||||
@@ -340,34 +277,13 @@ namespace HandyControl.Controls
|
|||||||
messageBox.ImageBrush = ResourceHelper.GetResource<Brush>(info.IconBrushKey);
|
messageBox.ImageBrush = ResourceHelper.GetResource<Brush>(info.IconBrushKey);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (info.Style != null)
|
|
||||||
{
|
|
||||||
messageBox.Style = info.Style;
|
|
||||||
}
|
|
||||||
messageBox.ShowDialog();
|
|
||||||
}));
|
|
||||||
#else
|
|
||||||
Application.Current.Dispatcher.Invoke(() =>
|
|
||||||
{
|
|
||||||
messageBox = CreateMessageBox(null, info.MessageBoxText, info.Caption, info.Button, MessageBoxImage.None, info.DefaultResult);
|
|
||||||
SetButtonStatus(messageBox, info.Button);
|
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(info.IconKey))
|
|
||||||
{
|
|
||||||
messageBox.ShowImage = true;
|
|
||||||
messageBox.Image = ResourceHelper.GetResource<Geometry>(info.IconKey);
|
|
||||||
messageBox.ImageBrush = ResourceHelper.GetResource<Brush>(info.IconBrushKey);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (info.Style != null)
|
if (info.Style != null)
|
||||||
{
|
{
|
||||||
messageBox.Style = info.Style;
|
messageBox.Style = info.Style;
|
||||||
}
|
}
|
||||||
SystemSounds.Asterisk.Play();
|
SystemSounds.Asterisk.Play();
|
||||||
messageBox.ShowDialog();
|
messageBox.InternalShowDialog();
|
||||||
});
|
}));
|
||||||
#endif
|
|
||||||
|
|
||||||
return messageBox._messageBoxResult;
|
return messageBox._messageBoxResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -398,25 +314,14 @@ namespace HandyControl.Controls
|
|||||||
public static MessageBoxResult Show(System.Windows.Window owner, string messageBoxText, string caption = null, MessageBoxButton button = MessageBoxButton.OK, MessageBoxImage icon = MessageBoxImage.None, MessageBoxResult defaultResult = MessageBoxResult.None)
|
public static MessageBoxResult Show(System.Windows.Window owner, string messageBoxText, string caption = null, MessageBoxButton button = MessageBoxButton.OK, MessageBoxImage icon = MessageBoxImage.None, MessageBoxResult defaultResult = MessageBoxResult.None)
|
||||||
{
|
{
|
||||||
MessageBox messageBox = null;
|
MessageBox messageBox = null;
|
||||||
#if netle40
|
|
||||||
Application.Current.Dispatcher.Invoke(new Action(() =>
|
Application.Current.Dispatcher.Invoke(new Action(() =>
|
||||||
{
|
|
||||||
messageBox = CreateMessageBox(owner, messageBoxText, caption, button, icon, defaultResult);
|
|
||||||
SetButtonStatus(messageBox, button);
|
|
||||||
SetImage(messageBox, icon);
|
|
||||||
messageBox.ShowDialog();
|
|
||||||
}));
|
|
||||||
#else
|
|
||||||
Application.Current.Dispatcher.Invoke(() =>
|
|
||||||
{
|
{
|
||||||
messageBox = CreateMessageBox(owner, messageBoxText, caption, button, icon, defaultResult);
|
messageBox = CreateMessageBox(owner, messageBoxText, caption, button, icon, defaultResult);
|
||||||
SetButtonStatus(messageBox, button);
|
SetButtonStatus(messageBox, button);
|
||||||
SetImage(messageBox, icon);
|
SetImage(messageBox, icon);
|
||||||
SystemSounds.Asterisk.Play();
|
SystemSounds.Asterisk.Play();
|
||||||
messageBox.ShowDialog();
|
messageBox.InternalShowDialog();
|
||||||
});
|
}));
|
||||||
#endif
|
|
||||||
|
|
||||||
return messageBox._messageBoxResult;
|
return messageBox._messageBoxResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user