Adjust project structure

src/Core_30/HandyControlDemo_Core_30/ViewModel/Basic/ChatBoxViewModel.cs

@@ -1,172 +0,0 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.IO;
-using System.Media;
-using System.Windows;
-using System.Windows.Input;
-using System.Windows.Media.Imaging;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.CommandWpf;
-using GalaSoft.MvvmLight.Messaging;
-using HandyControl.Controls;
-using HandyControl.Data;
-using HandyControl.Tools;
-using HandyControlDemo.Data;
-using HandyControlDemo.Tools;
-using Microsoft.Win32;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class ChatBoxViewModel : ViewModelBase
-    {
-        private static readonly string AudioCachePath = $"{AppDomain.CurrentDomain.BaseDirectory}Cache";
-
-        private readonly string _id = Guid.NewGuid().ToString();
-
-        private readonly Stopwatch _stopwatch = new Lazy<Stopwatch>(() => new Stopwatch()).Value;
-
-        public ChatBoxViewModel()
-        {
-            Messenger.Default.Register<ChatInfoModel>(this, MessageToken.SendChatMessage, ReceiveMessage);
-        }
-
-        private void ReceiveMessage(ChatInfoModel info)
-        {
-            if (_id.Equals(info.SenderId)) return;
-            info.Role = ChatRoleType.Receiver;
-            ChatInfos.Add(info);
-        }
-
-        private string _chatString;
-
-        public string ChatString
-        {
-            get => _chatString;
-            set => Set(ref _chatString, value);
-        }
-
-        public ObservableCollection<ChatInfoModel> ChatInfos { get; set; } = new ObservableCollection<ChatInfoModel>();
-
-        public RelayCommand<KeyEventArgs> SendStringCmd => new Lazy<RelayCommand<KeyEventArgs>>(() =>
-            new RelayCommand<KeyEventArgs>(SendString)).Value;
-
-        private void SendString(KeyEventArgs e)
-        {
-            if (e.Key == Key.Enter)
-            {
-                if (string.IsNullOrEmpty(ChatString)) return;
-                var info = new ChatInfoModel
-                {
-                    Message = ChatString,
-                    SenderId = _id,
-                    Type = ChatMessageType.String,
-                    Role = ChatRoleType.Sender
-                };
-                ChatInfos.Add(info);
-                Messenger.Default.Send(info, MessageToken.SendChatMessage);
-                ChatString = string.Empty;
-            }
-        }
-
-        public RelayCommand<RoutedEventArgs> ReadMessageCmd => new Lazy<RelayCommand<RoutedEventArgs>>(() =>
-            new RelayCommand<RoutedEventArgs>(ReadMessage)).Value;
-
-        private void ReadMessage(RoutedEventArgs e)
-        {
-            if (e.OriginalSource is FrameworkElement element && element.Tag is ChatInfoModel info)
-            {
-                if (info.Type == ChatMessageType.Image)
-                {
-                    new ImageBrowser(new Uri(info.Enclosure.ToString()))
-                    {
-                        Owner = VisualHelper.GetActiveWindow()
-                    }.Show();
-                }
-                else if (info.Type == ChatMessageType.Audio)
-                {
-                    var player = new SoundPlayer(info.Enclosure.ToString());
-                    player.PlaySync();
-                }
-            }
-        }
-
-        public RelayCommand StartRecordCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(StartRecord)).Value;
-
-        private void StartRecord()
-        {
-            ExternDllHelper.MciSendString("set wave bitpersample 8", "", 0, 0);
-            ExternDllHelper.MciSendString("set wave samplespersec 20000", "", 0, 0);
-            ExternDllHelper.MciSendString("set wave channels 2", "", 0, 0);
-            ExternDllHelper.MciSendString("set wave format tag pcm", "", 0, 0);
-            ExternDllHelper.MciSendString("open new type WAVEAudio alias movie", "", 0, 0);
-            ExternDllHelper.MciSendString("record movie", "", 0, 0);
-
-            _stopwatch.Reset();
-            _stopwatch.Start();
-        }
-
-        public RelayCommand StopRecordCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(StopRecord)).Value;
-
-        private void StopRecord()
-        {
-            if (!Directory.Exists(AudioCachePath))
-            {
-                try
-                {
-                    Directory.CreateDirectory(AudioCachePath);
-                }
-                catch (Exception e)
-                {
-                    Growl.Error(e.Message);
-                    return;
-                }
-            }
-
-            var cachePath = $"{AudioCachePath}\\{Guid.NewGuid().ToString()}";
-            ExternDllHelper.MciSendString("stop movie", "", 0, 0);
-            ExternDllHelper.MciSendString($"save movie {cachePath}", "", 0, 0);
-            ExternDllHelper.MciSendString("close movie", "", 0, 0);
-
-            _stopwatch.Stop();
-
-            var info = new ChatInfoModel
-            {
-                Message = $"{_stopwatch.Elapsed.Seconds.ToString()} {Properties.Langs.Lang.Second}",
-                SenderId = _id,
-                Type = ChatMessageType.Audio,
-                Role = ChatRoleType.Sender,
-                Enclosure = cachePath
-            };
-            ChatInfos.Add(info);
-            Messenger.Default.Send(info, MessageToken.SendChatMessage);
-        }
-
-        public RelayCommand OpenImageCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(OpenImage)).Value;
-
-        private void OpenImage()
-        {
-            var dialog = new OpenFileDialog();
-            if (dialog.ShowDialog() == true)
-            {
-                var fileName = dialog.FileName;
-                if (File.Exists(fileName))
-                {
-                    var info = new ChatInfoModel
-                    {
-                        Message = BitmapFrame.Create(new Uri(fileName)),
-                        SenderId = _id,
-                        Type = ChatMessageType.Image,
-                        Role = ChatRoleType.Sender,
-                        Enclosure = fileName
-                    };
-                    ChatInfos.Add(info);
-                    Messenger.Default.Send(info, MessageToken.SendChatMessage);
-                }
-            }
-        }
-    }
-}

src/Core_30/HandyControlDemo_Core_30/ViewModel/Basic/InteractiveDialogViewModel.cs

@@ -1,30 +0,0 @@
-using System;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.CommandWpf;
-using HandyControl.Tools.Extension;
-
-namespace HandyControlDemo.ViewModel.Basic
-{
-    public class InteractiveDialogViewModel : ViewModelBase, IDialogResultable<string>
-    {
-        public Action CloseAction { get; set; }
-
-        private string _result;
-
-        public string Result
-        {
-            get => _result;
-            set => Set(ref _result, value);
-        }
-
-        private string _message;
-
-        public string Message
-        {
-            get => _message;
-            set => Set(ref _message, value);
-        }
-
-        public RelayCommand CloseCmd => new Lazy<RelayCommand>(() => new RelayCommand(() => CloseAction?.Invoke())).Value;
-    }
-}

src/Core_30/HandyControlDemo_Core_30/ViewModel/Controls/BadgeDemoViewModel.cs

@@ -1,20 +0,0 @@
-using System;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.CommandWpf;
-
-namespace HandyControlDemo.ViewModel.Controls
-{
-    public class BadgeDemoViewModel : ViewModelBase
-    {
-        private int _count = 1;
-
-        public int Count
-        {
-            get => _count;
-            set => Set(ref _count, value);
-        }
-
-        public RelayCommand CountCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() => Count++)).Value;
-    }
-}

src/Core_30/HandyControlDemo_Core_30/ViewModel/Controls/DialogDemoViewModel.cs

@@ -1,41 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.CommandWpf;
-using HandyControl.Controls;
-using HandyControl.Tools.Extension;
-using HandyControlDemo.UserControl;
-using HandyControlDemo.UserControl.Basic;
-using HandyControlDemo.ViewModel.Basic;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class DialogDemoViewModel : ViewModelBase
-    {
-        private string _dialogResult;
-
-        public string DialogResult
-        {
-            get => _dialogResult;
-            set => Set(ref _dialogResult, value);
-        }
-
-        public RelayCommand ShowTextCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(ShowText)).Value;
-
-        private void ShowText()
-        {
-            Dialog.Show(new TextDialog());
-        }
-
-        public RelayCommand ShowInteractiveDialogCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(async () => await ShowInteractiveDialog())).Value;
-
-        private async Task ShowInteractiveDialog()
-        {
-            DialogResult = await Dialog.Show<InteractiveDialog>()
-                .Initialize<InteractiveDialogViewModel>(vm => vm.Message = DialogResult)
-                .GetResultAsync<string>();
-        }
-    }
-}

src/Core_30/HandyControlDemo_Core_30/ViewModel/Controls/GrowlDemoViewModel.cs

@@ -1,66 +0,0 @@
-using System;
-using GalaSoft.MvvmLight.CommandWpf;
-using HandyControl.Controls;
-using HandyControl.Data;
-using HandyControlDemo.Window;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class GrowlDemoViewModel
-    {
-        private readonly string _token;
-
-        public GrowlDemoViewModel()
-        {
-            
-        }
-
-        public GrowlDemoViewModel(string token)
-        {
-            _token = token;
-        }
-
-        public RelayCommand InfoCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() => Growl.Info(Properties.Langs.Lang.GrowlInfo, _token))).Value;
-
-        public RelayCommand SuccessCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() => Growl.Success(Properties.Langs.Lang.GrowlSuccess, _token))).Value;
-
-        public RelayCommand WarningCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() => Growl.Warning(new GrowlInfo
-            {
-                Message = Properties.Langs.Lang.GrowlWarning,
-                CancelStr = Properties.Langs.Lang.Ignore,
-                ActionBeforeClose = isConfirmed =>
-                {
-                    Growl.Info(isConfirmed.ToString());
-                    return true;
-                },
-                Token = _token
-            }))).Value;
-
-        public RelayCommand ErrorCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() => Growl.Error(Properties.Langs.Lang.GrowlError, _token))).Value;
-
-        public RelayCommand AskCmd => new Lazy<RelayCommand>(() => 
-            new RelayCommand(() => Growl.Ask(Properties.Langs.Lang.GrowlAsk, isConfirmed =>
-            {
-                Growl.Info(isConfirmed.ToString());
-                return true;
-            }, _token))).Value;
-
-        public RelayCommand FatalCmd => new Lazy<RelayCommand>(() => 
-            new RelayCommand(() => Growl.Fatal(new GrowlInfo
-            {
-                Message = Properties.Langs.Lang.GrowlFatal,
-                ShowDateTime = false,
-                Token = _token
-            }))).Value;
-
-        public RelayCommand ClearCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() => Growl.Clear(_token))).Value;
-
-        public RelayCommand NewWindowCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() => new GrowlDemoWindow().Show())).Value;
-    }
-}

src/Core_30/HandyControlDemo_Core_30/ViewModel/Controls/ImageBrowserDemoViewModel.cs

@@ -1,13 +0,0 @@
-using System;
-using GalaSoft.MvvmLight.CommandWpf;
-using HandyControl.Controls;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class ImageBrowserDemoViewModel
-    {
-        public RelayCommand OpenImgCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() =>
-                new ImageBrowser(new Uri("pack://application:,,,/Resources/Img/1.jpg")).Show())).Value;
-    }
-}

src/Core_30/HandyControlDemo_Core_30/ViewModel/Controls/NotifyIconDemoViewModel.cs

@@ -1,54 +0,0 @@
-using System;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.CommandWpf;
-using HandyControl.Controls;
-using HandyControlDemo.Data;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class NotifyIconDemoViewModel : ViewModelBase
-    {
-        private bool _contextMenuIsShow;
-
-        public bool ContextMenuIsShow
-        {
-            get => _contextMenuIsShow;
-            set
-            {
-                Set(ref _contextMenuIsShow, value);
-                GlobalData.NotifyIconIsShow = ContextMenuIsShow || ContextContentIsShow;
-            }
-        }
-
-        private bool _contextMenuIsBlink;
-
-        public bool ContextMenuIsBlink
-        {
-            get => _contextMenuIsBlink;
-            set => Set(ref _contextMenuIsBlink, value);
-        }
-
-        private bool _contextContentIsShow;
-
-        public bool ContextContentIsShow
-        {
-            get => _contextContentIsShow;
-            set
-            {
-                Set(ref _contextContentIsShow, value);
-                GlobalData.NotifyIconIsShow = ContextMenuIsShow || ContextContentIsShow;
-            }
-        }
-
-        private bool _contextContentIsBlink;
-
-        public bool ContextContentIsBlink
-        {
-            get => _contextContentIsBlink;
-            set => Set(ref _contextContentIsBlink, value);
-        }
-
-        public RelayCommand<object> MouseCmd => new Lazy<RelayCommand<object>>(() =>
-            new RelayCommand<object>(str=> Growl.Info(str.ToString()))).Value;
-    }
-}

src/Core_30/HandyControlDemo_Core_30/ViewModel/Controls/PaginationDemoViewModel.cs

@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using GalaSoft.MvvmLight.CommandWpf;
-using HandyControl.Data;
-using HandyControlDemo.Data;
-using HandyControlDemo.Service;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class PaginationDemoViewModel : DemoViewModelBase<DemoDataModel>
-    {
-        /// <summary>
-        ///     所有数据
-        /// </summary>
-        private readonly List<DemoDataModel> _totalDataList;
-
-        /// <summary>
-        ///     页码
-        /// </summary>
-        private int _pageIndex = 1;
-
-        /// <summary>
-        ///     页码
-        /// </summary>
-        public int PageIndex
-        {
-            get => _pageIndex;
-            set => Set(ref _pageIndex, value);
-        }
-
-        public PaginationDemoViewModel(DataService dataService)
-        {
-            _totalDataList = dataService.GetDemoDataList(100);
-            DataList = _totalDataList.Take(10).ToList();
-        }
-
-        /// <summary>
-        ///     页码改变命令
-        /// </summary>
-        public RelayCommand<FunctionEventArgs<int>> PageUpdatedCmd =>
-            new Lazy<RelayCommand<FunctionEventArgs<int>>>(() =>
-                new RelayCommand<FunctionEventArgs<int>>(PageUpdated)).Value;
-
-        /// <summary>
-        ///     页码改变
-        /// </summary>
-        private void PageUpdated(FunctionEventArgs<int> info)
-        {
-            DataList = _totalDataList.Skip((info.Info - 1) * 10).Take(10).ToList();
-        }
-    }
-}

src/Core_30/HandyControlDemo_Core_30/ViewModel/Controls/SearchBarDemoViewModel.cs

@@ -1,18 +0,0 @@
-using System;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.CommandWpf;
-using HandyControl.Controls;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class SearchBarDemoViewModel : ViewModelBase
-    {
-        public RelayCommand<string> SearchCmd => new Lazy<RelayCommand<string>>(() =>
-            new RelayCommand<string>(Search)).Value;
-
-        private void Search(string key)
-        {
-            Growl.Info(key);
-        }
-    }
-}

src/Core_30/HandyControlDemo_Core_30/ViewModel/Controls/StepBarDemoViewModel.cs

@@ -1,41 +0,0 @@
-using System;
-using System.Linq;
-using System.Windows.Controls;
-using GalaSoft.MvvmLight.CommandWpf;
-using HandyControl.Controls;
-using HandyControlDemo.Data;
-using HandyControlDemo.Service;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class StepBarDemoViewModel : DemoViewModelBase<StepBarDemoModel>
-    {
-        public StepBarDemoViewModel(DataService dataService) => DataList = dataService.GetStepBarDemoDataList();
-
-        /// <summary>
-        ///     下一步
-        /// </summary>
-        public RelayCommand<Panel> NextCmd => new Lazy<RelayCommand<Panel>>(() => new RelayCommand<Panel>(Next)).Value;
-
-        /// <summary>
-        ///     上一步
-        /// </summary>
-        public RelayCommand<Panel> PrevCmd => new Lazy<RelayCommand<Panel>>(() => new RelayCommand<Panel>(Prev)).Value;
-
-        private void Next(Panel panel)
-        {
-            foreach (var stepBar in panel.Children.OfType<StepBar>())
-            {
-                stepBar.Next();
-            }
-        }
-
-        private void Prev(Panel panel)
-        {
-            foreach (var stepBar in panel.Children.OfType<StepBar>())
-            {
-                stepBar.Prev();
-            }
-        }
-    }
-}

src/Core_30/HandyControlDemo_Core_30/ViewModel/Controls/WindowDemoViewModel.cs

@@ -1,21 +0,0 @@
-using System;
-using System.Windows;
-using GalaSoft.MvvmLight.CommandWpf;
-using HandyControlDemo.Tools;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class WindowDemoViewModel
-    {
-        public RelayCommand<string> OpenWindowCmd => new Lazy<RelayCommand<string>>(() => new RelayCommand<string>(OpenWindow)).Value;
-
-        private void OpenWindow(string windowTag)
-        {
-            if (AssemblyHelper.CreateInternalInstance($"Window.{windowTag}") is System.Windows.Window window)
-            {
-                window.Owner = Application.Current.MainWindow;
-                window.ShowDialog();
-            }
-        }
-    }
-}

src/Core_30/HandyControlDemo_Core_30/ViewModel/DemoViewModelBase!1.cs

@@ -1,22 +0,0 @@
-using System.Collections.Generic;
-using GalaSoft.MvvmLight;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class DemoViewModelBase<T> : ViewModelBase
-    {
-        /// <summary>
-        ///     数据列表
-        /// </summary>
-        private IList<T> _dataList;
-
-        /// <summary>
-        ///     数据列表
-        /// </summary>
-        public IList<T> DataList
-        {
-            get => _dataList;
-            set => Set(ref _dataList, value);
-        }
-    }
-}

src/Core_30/HandyControlDemo_Core_30/ViewModel/Main/ContributorsViewModel.cs

@@ -1,17 +0,0 @@
-using System.Threading.Tasks;
-using HandyControlDemo.Data;
-using HandyControlDemo.Service;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class ContributorsViewModel : DemoViewModelBase<ContributorModel>
-    {
-        public ContributorsViewModel(DataService dataService)
-        {
-            Task.Run(() =>
-            {
-                DataList = dataService.GetContributorDataList();
-            });
-        }
-    }
-}

src/Core_30/HandyControlDemo_Core_30/ViewModel/Main/MainViewModel.cs

@@ -1,113 +0,0 @@
-using System;
-using System.Windows.Controls;
-using GalaSoft.MvvmLight.CommandWpf;
-using GalaSoft.MvvmLight.Messaging;
-using HandyControlDemo.Data;
-using HandyControlDemo.Service;
-using HandyControlDemo.Tools;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class MainViewModel : DemoViewModelBase<DemoDataModel>
-    {
-        #region 字段
-
-        /// <summary>
-        ///     内容标题
-        /// </summary>
-        private object _contentTitle;
-
-        /// <summary>
-        ///     子内容
-        /// </summary>
-        private object _subContent;
-
-        /// <summary>
-        ///     当前选中的列表项
-        /// </summary>
-        private ListBoxItem _listBoxItemCurrent;
-
-        #endregion
-
-        public MainViewModel(DataService dataService)
-        {
-            Messenger.Default.Register<object>(this, MessageToken.LoadShowContent, obj =>
-            {
-                if (SubContent is IDisposable disposable)
-                {
-                    disposable.Dispose();
-                }
-                SubContent = obj;
-            });
-            Messenger.Default.Register<object>(this, MessageToken.ClearLeftSelected, obj =>
-            {
-                if (_listBoxItemCurrent == null) return;
-                _listBoxItemCurrent.IsSelected = false;
-                _listBoxItemCurrent = null;
-            });
-            DataList = dataService.GetDemoDataList();
-        }
-
-        #region 属性
-
-        /// <summary>
-        ///     子内容
-        /// </summary>
-        public object SubContent
-        {
-            get => _subContent;
-            set => Set(ref _subContent, value);
-        }
-
-        /// <summary>
-        ///     内容标题
-        /// </summary>
-        public object ContentTitle
-        {
-            get => _contentTitle;
-            set => Set(ref _contentTitle, value);
-        }
-
-        #endregion
-
-        #region 命令
-
-        /// <summary>
-        ///     切换例子命令
-        /// </summary>
-        public RelayCommand<SelectionChangedEventArgs> SwitchDemoCmd =>
-            new Lazy<RelayCommand<SelectionChangedEventArgs>>(() =>
-                new RelayCommand<SelectionChangedEventArgs>(SwitchDemo)).Value;
-
-        #endregion
-
-        #region 方法
-
-        /// <summary>
-        ///     切换例子
-        /// </summary>
-        private void SwitchDemo(SelectionChangedEventArgs e)
-        {
-            if (e.AddedItems.Count == 0) return;
-            if (e.AddedItems[0] is ListBoxItem item)
-            {
-                if (item.Tag is string tag)
-                {
-                    if (Equals(_listBoxItemCurrent, item)) return;
-                    _listBoxItemCurrent = item;
-                    ContentTitle = item.Content;
-                    Messenger.Default.Send(false, MessageToken.FullSwitch);
-                    Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{tag}"), MessageToken.LoadShowContent);
-                }
-                else
-                {
-                    _listBoxItemCurrent = null;
-                    ContentTitle = null;
-                    SubContent = null;
-                }
-            }
-        }
-
-        #endregion
-    }
-}

src/Core_30/HandyControlDemo_Core_30/ViewModel/ViewModelLocator.cs

@@ -1,76 +0,0 @@
-using System;
-using System.Windows;
-using CommonServiceLocator;
-using GalaSoft.MvvmLight.Ioc;
-using HandyControlDemo.Data;
-using HandyControlDemo.Service;
-using HandyControlDemo.ViewModel.Basic;
-using HandyControlDemo.ViewModel.Controls;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class ViewModelLocator
-    {
-        public ViewModelLocator()
-        {
-            ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);
-
-            SimpleIoc.Default.Register<DataService>();
-
-            SimpleIoc.Default.Register<MainViewModel>();
-            SimpleIoc.Default.Register(() => new GrowlDemoViewModel(), "GrowlDemo");
-            SimpleIoc.Default.Register(() => new GrowlDemoViewModel(MessageToken.GrowlDemoPanel), "GrowlDemoWithToken");
-            SimpleIoc.Default.Register<ImageBrowserDemoViewModel>();
-            SimpleIoc.Default.Register<ComboBoxDemoViewModel>();
-            SimpleIoc.Default.Register<WindowDemoViewModel>();
-            SimpleIoc.Default.Register<ContributorsViewModel>();
-            SimpleIoc.Default.Register<StepBarDemoViewModel>();
-            SimpleIoc.Default.Register<PaginationDemoViewModel>();
-            SimpleIoc.Default.Register<ChatBoxViewModel>();
-            SimpleIoc.Default.Register<CoverViewModel>();
-            SimpleIoc.Default.Register<DialogDemoViewModel>();
-            SimpleIoc.Default.Register<SearchBarDemoViewModel>();
-            SimpleIoc.Default.Register<NotifyIconDemoViewModel>();
-            SimpleIoc.Default.Register<InteractiveDialogViewModel>();
-            SimpleIoc.Default.Register<BadgeDemoViewModel>();
-        }
-
-        public static ViewModelLocator Instance => new Lazy<ViewModelLocator>(() =>
-            Application.Current.TryFindResource("Locator") as ViewModelLocator).Value;
-
-        #region Vm
-
-        public MainViewModel Main => ServiceLocator.Current.GetInstance<MainViewModel>();
-
-        public GrowlDemoViewModel GrowlDemo => ServiceLocator.Current.GetInstance<GrowlDemoViewModel>("GrowlDemo");
-
-        public GrowlDemoViewModel GrowlDemoWithToken => ServiceLocator.Current.GetInstance<GrowlDemoViewModel>("GrowlDemoWithToken");
-
-        public ImageBrowserDemoViewModel ImageBrowserDemo => ServiceLocator.Current.GetInstance<ImageBrowserDemoViewModel>();
-
-        public ComboBoxDemoViewModel ComboBoxDemo => ServiceLocator.Current.GetInstance<ComboBoxDemoViewModel>();
-
-        public WindowDemoViewModel WindowDemo => ServiceLocator.Current.GetInstance<WindowDemoViewModel>();
-
-        public ContributorsViewModel ContributorsView => ServiceLocator.Current.GetInstance<ContributorsViewModel>();
-
-        public StepBarDemoViewModel StepBarDemo => ServiceLocator.Current.GetInstance<StepBarDemoViewModel>();
-
-        public PaginationDemoViewModel PaginationDemo => ServiceLocator.Current.GetInstance<PaginationDemoViewModel>();
-
-        public ChatBoxViewModel ChatBox => new ChatBoxViewModel();
-
-        public CoverViewModel CoverView => ServiceLocator.Current.GetInstance<CoverViewModel>();
-
-        public DialogDemoViewModel DialogDemo => ServiceLocator.Current.GetInstance<DialogDemoViewModel>();
-
-        public SearchBarDemoViewModel SearchBarDemo => ServiceLocator.Current.GetInstance<SearchBarDemoViewModel>();
-
-        public NotifyIconDemoViewModel NotifyIconDemo => ServiceLocator.Current.GetInstance<NotifyIconDemoViewModel>();
-
-        public InteractiveDialogViewModel InteractiveDialog => ServiceLocator.Current.GetInstance<InteractiveDialogViewModel>();
-
-        public BadgeDemoViewModel BadgeDemo => ServiceLocator.Current.GetInstance<BadgeDemoViewModel>();
-        #endregion
-    }
-}

src/Core_30/HandyControl_Core_30/Controls/Other/Growl.cs

@@ -1,601 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Threading;
-using HandyControl.Data;
-using HandyControl.Interactivity;
-using HandyControl.Tools;
-using HandyControl.Tools.Extension;
-
-namespace HandyControl.Controls
-{
-    /// <summary>
-    ///     消息提醒
-    /// </summary>
-    [TemplatePart(Name = ElementPanelMore, Type = typeof(Panel))]
-    [TemplatePart(Name = ElementGridMain, Type = typeof(Grid))]
-    [TemplatePart(Name = ElementButtonClose, Type = typeof(Button))]
-    public class Growl : Control
-    {
-        #region Constants
-
-        private const string ElementPanelMore = "PART_PanelMore";
-        private const string ElementGridMain = "PART_GridMain";
-        private const string ElementButtonClose = "PART_ButtonClose";
-
-        #endregion Constants
-
-        #region Data
-
-        private Panel _panelMore;
-
-        private Grid _gridMain;
-
-        private Button _buttonClose;
-
-        private bool _showCloseButton;
-
-        private bool _staysOpen;
-
-        private int _waitTime = 6;
-
-        /// <summary>
-        ///     计数
-        /// </summary>
-        private int _tickCount;
-
-        /// <summary>
-        ///     关闭计时器
-        /// </summary>
-        private DispatcherTimer _timerClose;
-
-        private static readonly Dictionary<string, Panel> PanelDic = new Dictionary<string, Panel>();
-
-        #endregion Data
-
-        public Growl()
-        {
-            CommandBindings.Add(new CommandBinding(ControlCommands.Close, ButtonClose_OnClick));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Cancel, ButtonCancel_OnClick));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Confirm, ButtonOk_OnClick));
-        }
-
-        public static void Register(string token, Panel panel)
-        {
-            if (string.IsNullOrEmpty(token) || panel == null) return;
-            PanelDic[token] = panel;
-            InitGrowlPanel(panel);
-        }
-
-        public static void Unregister(string token, Panel panel)
-        {
-            if (string.IsNullOrEmpty(token) || panel == null) return;
-
-            if (PanelDic.ContainsKey(token))
-            {
-                if (ReferenceEquals(PanelDic[token], panel))
-                {
-                    PanelDic.Remove(token);
-                    panel.ContextMenu = null;
-                    panel.SetCurrentValue(PanelElement.FluidMoveBehaviorProperty, DependencyProperty.UnsetValue);
-                }
-            }
-        }
-
-        public static void Unregister(Panel panel)
-        {
-            if (panel == null) return;
-            var first = PanelDic.FirstOrDefault(item => ReferenceEquals(panel, item.Value));
-            if (!string.IsNullOrEmpty(first.Key))
-            {
-                PanelDic.Remove(first.Key);
-                panel.ContextMenu = null;
-                panel.SetCurrentValue(PanelElement.FluidMoveBehaviorProperty, DependencyProperty.UnsetValue);
-            }
-        }
-
-        protected override void OnMouseEnter(MouseEventArgs e)
-        {
-            base.OnMouseEnter(e);
-
-            _buttonClose.Show(_showCloseButton);
-        }
-
-        protected override void OnMouseLeave(MouseEventArgs e)
-        {
-            base.OnMouseLeave(e);
-
-            _buttonClose.Collapse();
-        }
-
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-
-            _panelMore = GetTemplateChild(ElementPanelMore) as Panel;
-            _gridMain = GetTemplateChild(ElementGridMain) as Grid;
-            _buttonClose = GetTemplateChild(ElementButtonClose) as Button;
-
-            CheckNull();
-            Update();
-        }
-
-        private void CheckNull()
-        {
-            if (_panelMore == null || _gridMain == null || _buttonClose == null) throw new Exception();
-        }
-
-        private Func<bool, bool> ActionBeforeClose { get; set; }
-
-        /// <summary>
-        ///     消息容器
-        /// </summary>
-        public static Panel GrowlPanel { get; set; }
-
-        internal static readonly DependencyProperty CancelStrProperty = DependencyProperty.Register(
-            "CancelStr", typeof(string), typeof(Growl), new PropertyMetadata(default(string)));
-
-        internal static readonly DependencyProperty ConfirmStrProperty = DependencyProperty.Register(
-            "ConfirmStr", typeof(string), typeof(Growl), new PropertyMetadata(default(string)));
-
-        public static readonly DependencyProperty ShowDateTimeProperty = DependencyProperty.Register(
-            "ShowDateTime", typeof(bool), typeof(Growl), new PropertyMetadata(ValueBoxes.TrueBox));
-
-        public static readonly DependencyProperty MessageProperty = DependencyProperty.Register(
-            "Message", typeof(string), typeof(Growl), new PropertyMetadata(default(string)));
-
-        public static readonly DependencyProperty TimeProperty = DependencyProperty.Register(
-            "Time", typeof(DateTime), typeof(Growl), new PropertyMetadata(default(DateTime)));
-
-        public static readonly DependencyProperty IconProperty = DependencyProperty.Register(
-            "Icon", typeof(Geometry), typeof(Growl), new PropertyMetadata(default(Geometry)));
-
-        public static readonly DependencyProperty IconBrushProperty = DependencyProperty.Register(
-            "IconBrush", typeof(Brush), typeof(Growl), new PropertyMetadata(default(Brush)));
-
-        public static readonly DependencyProperty TypeProperty = DependencyProperty.Register(
-            "Type", typeof(InfoType), typeof(Growl), new PropertyMetadata(default(InfoType)));
-
-        public static readonly DependencyProperty GrowlParentProperty = DependencyProperty.RegisterAttached(
-            "GrowlParent", typeof(bool), typeof(Growl), new PropertyMetadata(ValueBoxes.FalseBox, (o, args) =>
-            {
-                if ((bool)args.NewValue && o is Panel panel)
-                {
-                    SetGrowlPanel(panel);
-                }
-            }));
-
-        public static readonly DependencyProperty TokenProperty = DependencyProperty.RegisterAttached(
-            "Token", typeof(string), typeof(Growl), new PropertyMetadata(default(string), OnTokenChanged));
-
-        private static void OnTokenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is Panel panel)
-            {
-                if (e.NewValue == null)
-                {
-                    Unregister(panel);
-                }
-                else
-                {
-                    Register(e.NewValue.ToString(), panel);
-                }
-            }
-        }
-
-        public static void SetToken(DependencyObject element, string value)
-            => element.SetValue(TokenProperty, value);
-
-        public static string GetToken(DependencyObject element)
-            => (string) element.GetValue(TokenProperty);
-
-        public static void SetGrowlParent(DependencyObject element, bool value) => element.SetValue(GrowlParentProperty, value);
-
-        public static bool GetGrowlParent(DependencyObject element) => (bool)element.GetValue(GrowlParentProperty);
-
-        public InfoType Type
-        {
-            get => (InfoType)GetValue(TypeProperty);
-            set => SetValue(TypeProperty, value);
-        }
-
-        internal string CancelStr
-        {
-            get => (string)GetValue(CancelStrProperty);
-            set => SetValue(CancelStrProperty, value);
-        }
-
-        internal string ConfirmStr
-        {
-            get => (string)GetValue(ConfirmStrProperty);
-            set => SetValue(ConfirmStrProperty, value);
-        }
-
-        public bool ShowDateTime
-        {
-            get => (bool)GetValue(ShowDateTimeProperty);
-            set => SetValue(ShowDateTimeProperty, value);
-        }
-
-        public string Message
-        {
-            get => (string)GetValue(MessageProperty);
-            set => SetValue(MessageProperty, value);
-        }
-
-        public DateTime Time
-        {
-            get => (DateTime)GetValue(TimeProperty);
-            set => SetValue(TimeProperty, value);
-        }
-
-        public Geometry Icon
-        {
-            get => (Geometry)GetValue(IconProperty);
-            set => SetValue(IconProperty, value);
-        }
-
-        public Brush IconBrush
-        {
-            get => (Brush)GetValue(IconBrushProperty);
-            set => SetValue(IconBrushProperty, value);
-        }
-
-        /// <summary>
-        ///     开始计时器
-        /// </summary>
-        private void StartTimer()
-        {
-            _timerClose = new DispatcherTimer
-            {
-                Interval = TimeSpan.FromSeconds(1)
-            };
-            _timerClose.Tick += delegate
-            {
-                if (IsMouseOver)
-                {
-                    _tickCount = 0;
-                    return;
-                }
-
-                _tickCount++;
-                if (_tickCount >= _waitTime) Close();
-            };
-            _timerClose.Start();
-        }
-
-        /// <summary>
-        ///     消息容器
-        /// </summary>
-        /// <param name="panel"></param>
-        private static void SetGrowlPanel(Panel panel)
-        {
-            GrowlPanel = panel;
-            InitGrowlPanel(panel);
-        }
-
-        private static void InitGrowlPanel(Panel panel)
-        {
-            var menuItem = new MenuItem
-            {
-                Header = Properties.Langs.Lang.Clear
-            };
-            menuItem.Click += (s, e) =>
-            {
-                foreach (var item in panel.Children.OfType<Growl>())
-                {
-                    item.Close();
-                }
-            };
-            panel.ContextMenu = new ContextMenu
-            {
-                Items =
-                {
-                    menuItem
-                }
-            };
-
-            PanelElement.SetFluidMoveBehavior(panel, ResourceHelper.GetResource<FluidMoveBehavior>(ResourceToken.BehaviorXY400));
-        }
-
-        private void Update()
-        {
-            if (ActionBeforeClose != null)
-            {
-                _staysOpen = true;
-                _showCloseButton = false;
-                _panelMore.IsEnabled = true;
-                _panelMore.Show();
-            }
-
-            var transform = new TranslateTransform
-            {
-                X = MaxWidth
-            };
-            _gridMain.RenderTransform = transform;
-            transform.BeginAnimation(TranslateTransform.XProperty, AnimationHelper.CreateAnimation(0));
-            if (!_staysOpen) StartTimer();
-        }
-
-        /// <summary>
-        ///     显示信息
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        private static void Show(GrowlInfo growlInfo)
-        {
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                var ctl = new Growl
-                {
-                    Message = growlInfo.Message,
-                    Time = DateTime.Now,
-                    Icon = ResourceHelper.GetResource<Geometry>(growlInfo.IconKey),
-                    IconBrush = ResourceHelper.GetResource<Brush>(growlInfo.IconBrushKey),
-                    _showCloseButton = growlInfo.ShowCloseButton,
-                    ActionBeforeClose = growlInfo.ActionBeforeClose,
-                    _staysOpen = growlInfo.StaysOpen,
-                    ShowDateTime = growlInfo.ShowDateTime,
-                    ConfirmStr = growlInfo.ConfirmStr,
-                    CancelStr = growlInfo.CancelStr,
-                    Type = growlInfo.Type,
-                    _waitTime = Math.Max(growlInfo.WaitTime, 2)
-                };
-                if (!string.IsNullOrEmpty(growlInfo.Token))
-                {
-                    if (PanelDic.TryGetValue(growlInfo.Token, out var panel))
-                    {
-                        panel?.Children.Insert(0, ctl);
-                    }
-                }
-                else
-                {
-                    GrowlPanel.Children.Insert(0, ctl);
-                }
-            });
-        }
-
-        /// <summary>
-        ///     成功
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="token"></param>
-        public static void Success(string message, string token = "") => Success(new GrowlInfo
-        {
-            Message = message,
-            Token = token
-        });
-
-        /// <summary>
-        ///     成功
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void Success(GrowlInfo growlInfo)
-        {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.SuccessGeometry;
-                growlInfo.IconBrushKey = ResourceToken.SuccessBrush;
-                growlInfo.Type = InfoType.Success;
-            }
-            Show(growlInfo);
-        }
-
-        /// <summary>
-        ///     消息
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="token"></param>
-        public static void Info(string message, string token = "") => Info(new GrowlInfo
-        {
-            Message = message,
-            Token = token
-        });
-
-        /// <summary>
-        ///     消息
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void Info(GrowlInfo growlInfo)
-        {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.InfoGeometry;
-                growlInfo.IconBrushKey = ResourceToken.InfoBrush;
-                growlInfo.Type = InfoType.Info;
-            }
-            Show(growlInfo);
-        }
-
-        /// <summary>
-        ///     警告
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="token"></param>
-        public static void Warning(string message, string token = "") => Warning(new GrowlInfo
-        {
-            Message = message,
-            Token = token
-        });
-
-        /// <summary>
-        ///     警告
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void Warning(GrowlInfo growlInfo)
-        {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.WarningGeometry;
-                growlInfo.IconBrushKey = ResourceToken.WarningBrush;
-                growlInfo.Type = InfoType.Warning;
-            }
-            Show(growlInfo);
-        }
-
-        /// <summary>
-        ///     错误
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="token"></param>
-        public static void Error(string message, string token = "") => Error(new GrowlInfo
-        {
-            Message = message,
-            Token = token
-        });
-
-        /// <summary>
-        ///     错误
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void Error(GrowlInfo growlInfo)
-        {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.ErrorGeometry;
-                growlInfo.IconBrushKey = ResourceToken.DangerBrush;
-                growlInfo.StaysOpen = true;
-                growlInfo.Type = InfoType.Error;
-            }
-            Show(growlInfo);
-        }
-
-        /// <summary>
-        ///     严重
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="token"></param>
-        public static void Fatal(string message, string token = "") => Fatal(new GrowlInfo
-        {
-            Message = message,
-            Token = token
-        });
-
-        /// <summary>
-        ///     严重
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void Fatal(GrowlInfo growlInfo)
-        {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.FatalGeometry;
-                growlInfo.IconBrushKey = ResourceToken.PrimaryTextBrush;
-                growlInfo.StaysOpen = true;
-                growlInfo.ShowCloseButton = false;
-                growlInfo.Type = InfoType.Fatal;
-                if (GrowlPanel.ContextMenu != null) GrowlPanel.ContextMenu.Opacity = 0;
-            }
-            Show(growlInfo);
-        }
-
-        /// <summary>
-        ///     询问
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="actionBeforeClose"></param>
-        /// <param name="token"></param>
-        public static void Ask(string message, Func<bool, bool> actionBeforeClose, string token = "") => Ask(new GrowlInfo
-        {
-            Message = message,
-            ActionBeforeClose = actionBeforeClose,
-            Token = token
-        });
-
-        /// <summary>
-        ///     询问
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void Ask(GrowlInfo growlInfo)
-        {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.AskGeometry;
-                growlInfo.IconBrushKey = ResourceToken.AccentBrush;
-                growlInfo.StaysOpen = true;
-                growlInfo.ShowCloseButton = false;
-                growlInfo.Type = InfoType.Ask;
-            }
-            Show(growlInfo);
-        }
-
-        private void ButtonClose_OnClick(object sender, RoutedEventArgs e) => Close();
-
-        /// <summary>
-        ///     关闭
-        /// </summary>
-        private void Close()
-        {
-            _timerClose?.Stop();
-            var transform = new TranslateTransform();
-            _gridMain.RenderTransform = transform;
-            var animation = AnimationHelper.CreateAnimation(MaxWidth);
-            animation.Completed += (s, e) =>
-            {
-                if (Parent is Panel panel)
-                {
-                    panel.Children.Remove(this);
-                }
-            };
-            transform.BeginAnimation(TranslateTransform.XProperty, animation);
-        }
-
-        /// <summary>
-        ///     清除
-        /// </summary>
-        /// <param name="token"></param>
-        public static void Clear(string token = "")
-        {
-            if (!string.IsNullOrEmpty(token))
-            {
-                if (PanelDic.TryGetValue(token, out var panel))
-                {
-                    Clear(panel);
-                }
-            }
-            else
-            {
-                Clear(GrowlPanel);
-            }
-        }
-
-        /// <summary>
-        ///     清除
-        /// </summary>
-        /// <param name="panel"></param>
-        private static void Clear(Panel panel)
-        {
-            panel.Children.Clear();
-            if (panel.ContextMenu != null)
-            {
-                panel.ContextMenu.IsOpen = false;
-                panel.ContextMenu.Opacity = 1;
-            }
-        }
-
-        private void ButtonCancel_OnClick(object sender, RoutedEventArgs e)
-        {
-            if (ActionBeforeClose?.Invoke(false) == true)
-            {
-                Close();
-            }
-        }
-
-        private void ButtonOk_OnClick(object sender, RoutedEventArgs e)
-        {
-            if (ActionBeforeClose?.Invoke(true) == true)
-            {
-                Close();
-            }
-        }
-    }
-}

src/Core_30/HandyControl_Core_30/Controls/Window/MessageBox.cs

@@ -1,436 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Text;
-using System.Windows;
-using System.Windows.Input;
-using System.Windows.Media;
-using HandyControl.Data;
-using HandyControl.Interactivity;
-using HandyControl.Tools;
-
-namespace HandyControl.Controls
-{
-    /// <summary>
-    ///     消息框
-    /// </summary>
-    public sealed class MessageBox : Window
-    {
-        private MessageBoxResult _messageBoxResult = MessageBoxResult.Cancel;
-
-        private bool _showOk;
-
-        private bool _showCancel;
-
-        private bool _showYes;
-
-        private bool _showNo;
-
-        public static readonly DependencyProperty MessageProperty = DependencyProperty.Register(
-            "Message", typeof(string), typeof(MessageBox), new PropertyMetadata(default(string)));
-
-        public string Message
-        {
-            get => (string) GetValue(MessageProperty);
-            set => SetValue(MessageProperty, value);
-        }
-
-        public static readonly DependencyProperty ImageProperty = DependencyProperty.Register(
-            "Image", typeof(Geometry), typeof(MessageBox), new PropertyMetadata(default(Geometry)));
-
-        public Geometry Image
-        {
-            get => (Geometry) GetValue(ImageProperty);
-            set => SetValue(ImageProperty, value);
-        }
-
-        public static readonly DependencyProperty ImageBrushProperty = DependencyProperty.Register(
-            "ImageBrush", typeof(Brush), typeof(MessageBox), new PropertyMetadata(default(Brush)));
-
-        public Brush ImageBrush
-        {
-            get => (Brush) GetValue(ImageBrushProperty);
-            set => SetValue(ImageBrushProperty, value);
-        }
-
-        public static readonly DependencyProperty ShowImageProperty = DependencyProperty.Register(
-            "ShowImage", typeof(bool), typeof(MessageBox), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool ShowImage
-        {
-            get => (bool) GetValue(ShowImageProperty);
-            set => SetValue(ShowImageProperty, value);
-        }
-
-        private MessageBox()
-        {
-            CommandBindings.Add(new CommandBinding(ControlCommands.Confirm, (s, e) =>
-            {
-                _messageBoxResult = MessageBoxResult.OK;
-                Close();
-            }, (s, e) => e.CanExecute = _showOk));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Cancel, (s, e) =>
-            {
-                _messageBoxResult = MessageBoxResult.Cancel;
-                Close();
-            }, (s, e) => e.CanExecute = _showCancel));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Yes, (s, e) =>
-            {
-                _messageBoxResult = MessageBoxResult.Yes;
-                Close();
-            }, (s, e) => e.CanExecute = _showYes));
-            CommandBindings.Add(new CommandBinding(ControlCommands.No, (s, e) =>
-            {
-                _messageBoxResult = MessageBoxResult.No;
-                Close();
-            }, (s, e) => e.CanExecute = _showNo));
-        }
-
-        protected override void OnPreviewKeyDown(KeyEventArgs e)
-        {
-            base.OnPreviewKeyDown(e);
-
-            if (e.KeyboardDevice.Modifiers == ModifierKeys.Control && e.Key == Key.C)
-            {
-                var builder = new StringBuilder();
-                var line = new string('-', 27);
-                builder.Append(line);
-                builder.Append(Environment.NewLine);
-                builder.Append(Title);
-                builder.Append(Environment.NewLine);
-                builder.Append(line);
-                builder.Append(Environment.NewLine);
-                builder.Append(Message);
-                builder.Append(Environment.NewLine);
-                builder.Append(line);
-                builder.Append(Environment.NewLine);
-                if (_showOk)
-                {
-                    builder.Append(Properties.Langs.Lang.Confirm);
-                    builder.Append("   ");
-                }
-                if (_showYes)
-                {
-                    builder.Append(Properties.Langs.Lang.Yes);
-                    builder.Append("   ");
-                }
-                if (_showNo)
-                {
-                    builder.Append(Properties.Langs.Lang.No);
-                    builder.Append("   ");
-                }
-                if (_showCancel)
-                {
-                    builder.Append(Properties.Langs.Lang.Cancel);
-                    builder.Append("   ");
-                }
-                builder.Append(Environment.NewLine);
-                builder.Append(line);
-                builder.Append(Environment.NewLine);
-                Clipboard.SetText(builder.ToString());
-            }
-        }
-
-        /// <summary>
-        ///     成功
-        /// </summary>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        public static MessageBoxResult Success(string messageBoxText, string caption = null)
-        {
-            MessageBox messageBox = null;
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                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();
-            });
-
-            return messageBox._messageBoxResult;
-        }
-
-        /// <summary>
-        ///     消息
-        /// </summary>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        public static MessageBoxResult Info(string messageBoxText, string caption = null)
-        {
-            MessageBox messageBox = null;
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK);
-                SetButtonStatus(messageBox, MessageBoxButton.OK);
-                SetImage(messageBox, MessageBoxImage.Information);
-                messageBox.ShowDialog();
-            });
-
-            return messageBox._messageBoxResult;
-        }
-
-        /// <summary>
-        ///     警告
-        /// </summary>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        public static MessageBoxResult Warning(string messageBoxText, string caption = null)
-        {
-            MessageBox messageBox = null;
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Warning, MessageBoxResult.OK);
-                SetButtonStatus(messageBox, MessageBoxButton.OK);
-                SetImage(messageBox, MessageBoxImage.Warning);
-                messageBox.ShowDialog();
-            });
-
-            return messageBox._messageBoxResult;
-        }
-
-        /// <summary>
-        ///     错误
-        /// </summary>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        public static MessageBoxResult Error(string messageBoxText, string caption = null)
-        {
-            MessageBox messageBox = null;
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK);
-                SetButtonStatus(messageBox, MessageBoxButton.OK);
-                SetImage(messageBox, MessageBoxImage.Error);
-                messageBox.ShowDialog();
-            });
-
-            return messageBox._messageBoxResult;
-        }
-
-        /// <summary>
-        ///     严重
-        /// </summary>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        public static MessageBoxResult Fatal(string messageBoxText, string caption = null)
-        {
-            MessageBox messageBox = null;
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                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();
-            });
-
-            return messageBox._messageBoxResult;
-        }
-
-        /// <summary>
-        ///     询问
-        /// </summary>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        public static MessageBoxResult Ask(string messageBoxText, string caption = null)
-        {
-            MessageBox messageBox = null;
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OKCancel, MessageBoxImage.Question, MessageBoxResult.Cancel);
-                SetButtonStatus(messageBox, MessageBoxButton.OKCancel);
-                SetImage(messageBox, MessageBoxImage.Question);
-                messageBox.ShowDialog();
-            });
-
-            return messageBox._messageBoxResult;
-        }
-
-        /// <summary>
-        ///     自定义信息展示
-        /// </summary>
-        /// <param name="info"></param>
-        /// <returns></returns>
-        public static MessageBoxResult Show(MessageBoxInfo info)
-        {
-            MessageBox messageBox = null;
-            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);
-                }
-
-                messageBox.Style = info.Style;
-                messageBox.ShowDialog();
-            });
-
-            return messageBox._messageBoxResult;
-        }
-
-        /// <summary>
-        ///     信息展示
-        /// </summary>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        /// <param name="button"></param>
-        /// <param name="icon"></param>
-        /// <param name="defaultResult"></param>
-        /// <returns></returns>
-        public static MessageBoxResult Show(string messageBoxText, string caption = null,
-            MessageBoxButton button = MessageBoxButton.OK, MessageBoxImage icon = MessageBoxImage.None,
-            MessageBoxResult defaultResult = MessageBoxResult.None) =>
-            Show(null, messageBoxText, caption, button, icon, defaultResult);
-
-        /// <summary>
-        ///     信息展示
-        /// </summary>
-        /// <param name="owner"></param>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        /// <param name="button"></param>
-        /// <param name="icon"></param>
-        /// <param name="defaultResult"></param>
-        /// <returns></returns>
-        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;
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                messageBox = CreateMessageBox(owner, messageBoxText, caption, button, icon, defaultResult);
-                SetButtonStatus(messageBox, button);
-                SetImage(messageBox, icon);
-                messageBox.ShowDialog();
-            });
-
-            return messageBox._messageBoxResult;
-        }
-
-        private static MessageBox CreateMessageBox(
-            System.Windows.Window owner,
-            string messageBoxText,
-            string caption,
-            MessageBoxButton button,
-            MessageBoxImage icon,
-            MessageBoxResult defaultResult)
-        {
-            if (!IsValidMessageBoxButton(button))
-            {
-                throw new InvalidEnumArgumentException(nameof(button), (int)button, typeof(MessageBoxButton));
-            }
-            if (!IsValidMessageBoxImage(icon))
-            {
-                throw new InvalidEnumArgumentException(nameof(icon), (int)icon, typeof(MessageBoxImage));
-            }
-            if (!IsValidMessageBoxResult(defaultResult))
-            {
-                throw new InvalidEnumArgumentException(nameof(defaultResult), (int)defaultResult, typeof(MessageBoxResult));
-            }
-
-            var ownerWindow = owner ?? VisualHelper.GetActiveWindow();
-            var ownerIsNull = ownerWindow is null;
-
-            return new MessageBox
-            {
-                Message = messageBoxText,
-                Owner = ownerWindow,
-                WindowStartupLocation = WindowStartupLocation.CenterScreen,
-                ShowTitle = true,
-                Title = caption ?? string.Empty,
-                Topmost = ownerIsNull,
-                _messageBoxResult = defaultResult
-            };
-        }
-
-        private static void SetButtonStatus(MessageBox messageBox, MessageBoxButton messageBoxButton)
-        {
-            switch (messageBoxButton)
-            {
-                case MessageBoxButton.OK:
-                    messageBox._showOk = true;
-                    break;
-                case MessageBoxButton.OKCancel:
-                    messageBox._showOk = true;
-                    messageBox._showCancel = true;
-                    break;
-                case MessageBoxButton.YesNo:
-                    messageBox._showYes = true;
-                    messageBox._showNo = true;
-                    break;
-                case MessageBoxButton.YesNoCancel:
-                    messageBox._showYes = true;
-                    messageBox._showNo = true;
-                    messageBox._showCancel = true;
-                    break;
-            }
-        }
-
-        private static void SetImage(MessageBox messageBox, MessageBoxImage messageBoxImage)
-        {
-            var iconKey = string.Empty;
-            var iconBrushKey = string.Empty;
-
-            switch (messageBoxImage)
-            {
-                case MessageBoxImage.Error:
-                    iconKey = ResourceToken.ErrorGeometry;
-                    iconBrushKey = ResourceToken.DangerBrush;
-                    break;
-                case MessageBoxImage.Question:
-                    iconKey = ResourceToken.AskGeometry;
-                    iconBrushKey = ResourceToken.AccentBrush;
-                    break;
-                case MessageBoxImage.Warning:
-                    iconKey = ResourceToken.WarningGeometry;
-                    iconBrushKey = ResourceToken.WarningBrush;
-                    break;
-                case MessageBoxImage.Information:
-                    iconKey = ResourceToken.InfoGeometry;
-                    iconBrushKey = ResourceToken.InfoBrush;
-                    break;
-            }
-
-            if (string.IsNullOrEmpty(iconKey)) return;
-            messageBox.ShowImage = true;
-            messageBox.Image = ResourceHelper.GetResource<Geometry>(iconKey);
-            messageBox.ImageBrush = ResourceHelper.GetResource<Brush>(iconBrushKey);
-        }
-
-        private static bool IsValidMessageBoxButton(MessageBoxButton value)
-        {
-            return value == MessageBoxButton.OK
-                   || value == MessageBoxButton.OKCancel
-                   || value == MessageBoxButton.YesNo
-                   || value == MessageBoxButton.YesNoCancel;
-        }
-
-        private static bool IsValidMessageBoxImage(MessageBoxImage value)
-        {
-            return value == MessageBoxImage.Asterisk
-                   || value == MessageBoxImage.Error
-                   || value == MessageBoxImage.Exclamation
-                   || value == MessageBoxImage.Hand
-                   || value == MessageBoxImage.Information
-                   || value == MessageBoxImage.None
-                   || value == MessageBoxImage.Question
-                   || value == MessageBoxImage.Stop
-                   || value == MessageBoxImage.Warning;
-        }
-
-        private static bool IsValidMessageBoxResult(MessageBoxResult value)
-        {
-            return value == MessageBoxResult.Cancel
-                   || value == MessageBoxResult.No
-                   || value == MessageBoxResult.None
-                   || value == MessageBoxResult.OK
-                   || value == MessageBoxResult.Yes;
-        }
-    }
-}

src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj

@@ -22,7 +22,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;netle45;netle40</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
@@ -32,7 +32,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;netle45;netle40</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
@@ -66,21 +66,6 @@
     <Compile Include="UserControl\Main\NoUserContent.xaml.cs">
       <DependentUpon>NoUserContent.xaml</DependentUpon>
     </Compile>
-    <Compile Include="ViewModel\Basic\ChatBoxViewModel.cs" />
-    <Compile Include="ViewModel\Basic\InteractiveDialogViewModel.cs" />
-    <Compile Include="ViewModel\Controls\BadgeDemoViewModel.cs" />
-    <Compile Include="ViewModel\Controls\DialogDemoViewModel.cs" />
-    <Compile Include="ViewModel\Controls\GrowlDemoViewModel.cs" />
-    <Compile Include="ViewModel\Controls\ImageBrowserDemoViewModel.cs" />
-    <Compile Include="ViewModel\Controls\NotifyIconDemoViewModel.cs" />
-    <Compile Include="ViewModel\Controls\PaginationDemoViewModel.cs" />
-    <Compile Include="ViewModel\Controls\SearchBarDemoViewModel.cs" />
-    <Compile Include="ViewModel\Controls\StepBarDemoViewModel.cs" />
-    <Compile Include="ViewModel\Controls\WindowDemoViewModel.cs" />
-    <Compile Include="ViewModel\DemoViewModelBase!1.cs" />
-    <Compile Include="ViewModel\Main\ContributorsViewModel.cs" />
-    <Compile Include="ViewModel\Main\MainViewModel.cs" />
-    <Compile Include="ViewModel\ViewModelLocator.cs" />
   </ItemGroup>
   <ItemGroup>
     <Page Include="UserControl\Main\NoUserContent.xaml">

src/Net_40/HandyControlDemo_Net_40/ViewModel/Basic/ChatBoxViewModel.cs

@@ -1,172 +0,0 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.IO;
-using System.Media;
-using System.Windows;
-using System.Windows.Input;
-using System.Windows.Media.Imaging;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Command;
-using GalaSoft.MvvmLight.Messaging;
-using HandyControl.Controls;
-using HandyControl.Data;
-using HandyControl.Tools;
-using HandyControlDemo.Data;
-using HandyControlDemo.Tools;
-using Microsoft.Win32;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class ChatBoxViewModel : ViewModelBase
-    {
-        private static readonly string AudioCachePath = $"{AppDomain.CurrentDomain.BaseDirectory}Cache";
-
-        private readonly string _id = Guid.NewGuid().ToString();
-
-        private readonly Stopwatch _stopwatch = new Lazy<Stopwatch>(() => new Stopwatch()).Value;
-
-        public ChatBoxViewModel()
-        {
-            Messenger.Default.Register<ChatInfoModel>(this, MessageToken.SendChatMessage, ReceiveMessage);
-        }
-
-        private void ReceiveMessage(ChatInfoModel info)
-        {
-            if (_id.Equals(info.SenderId)) return;
-            info.Role = ChatRoleType.Receiver;
-            ChatInfos.Add(info);
-        }
-
-        private string _chatString;
-
-        public string ChatString
-        {
-            get => _chatString;
-            set => Set(nameof(ChatString), ref _chatString, value);
-        }
-
-        public ObservableCollection<ChatInfoModel> ChatInfos { get; set; } = new ObservableCollection<ChatInfoModel>();
-
-        public RelayCommand<KeyEventArgs> SendStringCmd => new Lazy<RelayCommand<KeyEventArgs>>(() =>
-            new RelayCommand<KeyEventArgs>(SendString)).Value;
-
-        private void SendString(KeyEventArgs e)
-        {
-            if (e.Key == Key.Enter)
-            {
-                if (string.IsNullOrEmpty(ChatString)) return;
-                var info = new ChatInfoModel
-                {
-                    Message = ChatString,
-                    SenderId = _id,
-                    Type = ChatMessageType.String,
-                    Role = ChatRoleType.Sender
-                };
-                ChatInfos.Add(info);
-                Messenger.Default.Send(info, MessageToken.SendChatMessage);
-                ChatString = string.Empty;
-            }
-        }
-
-        public RelayCommand<RoutedEventArgs> ReadMessageCmd => new Lazy<RelayCommand<RoutedEventArgs>>(() =>
-            new RelayCommand<RoutedEventArgs>(ReadMessage)).Value;
-
-        private void ReadMessage(RoutedEventArgs e)
-        {
-            if (e.OriginalSource is FrameworkElement element && element.Tag is ChatInfoModel info)
-            {
-                if (info.Type == ChatMessageType.Image)
-                {
-                    new ImageBrowser(new Uri(info.Enclosure.ToString()))
-                    {
-                        Owner = VisualHelper.GetActiveWindow()
-                    }.Show();
-                }
-                else if (info.Type == ChatMessageType.Audio)
-                {
-                    var player = new SoundPlayer(info.Enclosure.ToString());
-                    player.PlaySync();
-                }
-            }
-        }
-
-        public RelayCommand StartRecordCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(StartRecord)).Value;
-
-        private void StartRecord()
-        {
-            ExternDllHelper.MciSendString("set wave bitpersample 8", "", 0, 0);
-            ExternDllHelper.MciSendString("set wave samplespersec 20000", "", 0, 0);
-            ExternDllHelper.MciSendString("set wave channels 2", "", 0, 0);
-            ExternDllHelper.MciSendString("set wave format tag pcm", "", 0, 0);
-            ExternDllHelper.MciSendString("open new type WAVEAudio alias movie", "", 0, 0);
-            ExternDllHelper.MciSendString("record movie", "", 0, 0);
-
-            _stopwatch.Reset();
-            _stopwatch.Start();
-        }
-
-        public RelayCommand StopRecordCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(StopRecord)).Value;
-
-        private void StopRecord()
-        {
-            if (!Directory.Exists(AudioCachePath))
-            {
-                try
-                {
-                    Directory.CreateDirectory(AudioCachePath);
-                }
-                catch (Exception e)
-                {
-                    Growl.Error(e.Message);
-                    return;
-                }
-            }
-
-            var cachePath = $"{AudioCachePath}\\{Guid.NewGuid().ToString()}";
-            ExternDllHelper.MciSendString("stop movie", "", 0, 0);
-            ExternDllHelper.MciSendString($"save movie {cachePath}", "", 0, 0);
-            ExternDllHelper.MciSendString("close movie", "", 0, 0);
-
-            _stopwatch.Stop();
-
-            var info = new ChatInfoModel
-            {
-                Message = $"{_stopwatch.Elapsed.Seconds.ToString()} {Properties.Langs.Lang.Second}",
-                SenderId = _id,
-                Type = ChatMessageType.Audio,
-                Role = ChatRoleType.Sender,
-                Enclosure = cachePath
-            };
-            ChatInfos.Add(info);
-            Messenger.Default.Send(info, MessageToken.SendChatMessage);
-        }
-
-        public RelayCommand OpenImageCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(OpenImage)).Value;
-
-        private void OpenImage()
-        {
-            var dialog = new OpenFileDialog();
-            if (dialog.ShowDialog() == true)
-            {
-                var fileName = dialog.FileName;
-                if (File.Exists(fileName))
-                {
-                    var info = new ChatInfoModel
-                    {
-                        Message = BitmapFrame.Create(new Uri(fileName)),
-                        SenderId = _id,
-                        Type = ChatMessageType.Image,
-                        Role = ChatRoleType.Sender,
-                        Enclosure = fileName
-                    };
-                    ChatInfos.Add(info);
-                    Messenger.Default.Send(info, MessageToken.SendChatMessage);
-                }
-            }
-        }
-    }
-}

src/Net_40/HandyControlDemo_Net_40/ViewModel/Basic/InteractiveDialogViewModel.cs

@@ -1,30 +0,0 @@
-using System;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Command;
-using HandyControl.Tools.Extension;
-
-namespace HandyControlDemo.ViewModel.Basic
-{
-    public class InteractiveDialogViewModel : ViewModelBase, IDialogResultable<string>
-    {
-        public Action CloseAction { get; set; }
-
-        private string _result;
-
-        public string Result
-        {
-            get => _result;
-            set => Set(nameof(Result), ref _result, value);
-        }
-
-        private string _message;
-
-        public string Message
-        {
-            get => _message;
-            set => Set(nameof(Message), ref _message, value);
-        }
-
-        public RelayCommand CloseCmd => new Lazy<RelayCommand>(() => new RelayCommand(() => CloseAction?.Invoke())).Value;
-    }
-}

src/Net_40/HandyControlDemo_Net_40/ViewModel/Controls/BadgeDemoViewModel.cs

@@ -1,20 +0,0 @@
-using System;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Command;
-
-namespace HandyControlDemo.ViewModel.Controls
-{
-    public class BadgeDemoViewModel : ViewModelBase
-    {
-        private int _count = 1;
-
-        public int Count
-        {
-            get => _count;
-            set => Set(nameof(Count), ref _count, value);
-        }
-
-        public RelayCommand CountCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() => Count++)).Value;
-    }
-}

src/Net_40/HandyControlDemo_Net_40/ViewModel/Controls/DialogDemoViewModel.cs

@@ -1,40 +0,0 @@
-using System;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Command;
-using HandyControl.Controls;
-using HandyControl.Tools.Extension;
-using HandyControlDemo.UserControl;
-using HandyControlDemo.UserControl.Basic;
-using HandyControlDemo.ViewModel.Basic;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class DialogDemoViewModel : ViewModelBase
-    {
-        private string _dialogResult;
-
-        public string DialogResult
-        {
-            get => _dialogResult;
-            set => Set(nameof(DialogResult), ref _dialogResult, value);
-        }
-
-        public RelayCommand ShowTextCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(ShowText)).Value;
-
-        private void ShowText()
-        {
-            Dialog.Show(new TextDialog());
-        }
-
-        public RelayCommand ShowInteractiveDialogCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(ShowInteractiveDialog)).Value;
-
-        private void ShowInteractiveDialog()
-        {
-            Dialog.Show<InteractiveDialog>()
-                .Initialize<InteractiveDialogViewModel>(vm => vm.Message = DialogResult)
-                .GetResultAsync<string>().ContinueWith(str => DialogResult = str.Result);
-        }
-    }
-}

src/Net_40/HandyControlDemo_Net_40/ViewModel/Controls/GrowlDemoViewModel.cs

@@ -1,66 +0,0 @@
-using System;
-using GalaSoft.MvvmLight.Command;
-using HandyControl.Controls;
-using HandyControl.Data;
-using HandyControlDemo.Window;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class GrowlDemoViewModel
-    {
-        private readonly string _token;
-
-        public GrowlDemoViewModel()
-        {
-            
-        }
-
-        public GrowlDemoViewModel(string token)
-        {
-            _token = token;
-        }
-
-        public RelayCommand InfoCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() => Growl.Info(Properties.Langs.Lang.GrowlInfo, _token))).Value;
-
-        public RelayCommand SuccessCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() => Growl.Success(Properties.Langs.Lang.GrowlSuccess, _token))).Value;
-
-        public RelayCommand WarningCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() => Growl.Warning(new GrowlInfo
-            {
-                Message = Properties.Langs.Lang.GrowlWarning,
-                CancelStr = Properties.Langs.Lang.Ignore,
-                ActionBeforeClose = isConfirmed =>
-                {
-                    Growl.Info(isConfirmed.ToString());
-                    return true;
-                },
-                Token = _token
-            }))).Value;
-
-        public RelayCommand ErrorCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() => Growl.Error(Properties.Langs.Lang.GrowlError, _token))).Value;
-
-        public RelayCommand AskCmd => new Lazy<RelayCommand>(() => 
-            new RelayCommand(() => Growl.Ask(Properties.Langs.Lang.GrowlAsk, isConfirmed =>
-            {
-                Growl.Info(isConfirmed.ToString());
-                return true;
-            }, _token))).Value;
-
-        public RelayCommand FatalCmd => new Lazy<RelayCommand>(() => 
-            new RelayCommand(() => Growl.Fatal(new GrowlInfo
-            {
-                Message = Properties.Langs.Lang.GrowlFatal,
-                ShowDateTime = false,
-                Token = _token
-            }))).Value;
-
-        public RelayCommand ClearCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() => Growl.Clear(_token))).Value;
-
-        public RelayCommand NewWindowCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() => new GrowlDemoWindow().Show())).Value;
-    }
-}

src/Net_40/HandyControlDemo_Net_40/ViewModel/Controls/ImageBrowserDemoViewModel.cs

@@ -1,13 +0,0 @@
-using System;
-using GalaSoft.MvvmLight.Command;
-using HandyControl.Controls;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class ImageBrowserDemoViewModel
-    {
-        public RelayCommand OpenImgCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() =>
-                new ImageBrowser(new Uri("pack://application:,,,/Resources/Img/1.jpg")).Show())).Value;
-    }
-}

src/Net_40/HandyControlDemo_Net_40/ViewModel/Controls/NotifyIconDemoViewModel.cs

@@ -1,54 +0,0 @@
-using System;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Command;
-using HandyControl.Controls;
-using HandyControlDemo.Data;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class NotifyIconDemoViewModel : ViewModelBase
-    {
-        private bool _contextMenuIsShow;
-
-        public bool ContextMenuIsShow
-        {
-            get => _contextMenuIsShow;
-            set
-            {
-                Set(nameof(ContextMenuIsShow), ref _contextMenuIsShow, value);
-                GlobalData.NotifyIconIsShow = ContextMenuIsShow || ContextContentIsShow;
-            }
-        }
-
-        private bool _contextMenuIsBlink;
-
-        public bool ContextMenuIsBlink
-        {
-            get => _contextMenuIsBlink;
-            set => Set(nameof(ContextMenuIsBlink), ref _contextMenuIsBlink, value);
-        }
-
-        private bool _contextContentIsShow;
-
-        public bool ContextContentIsShow
-        {
-            get => _contextContentIsShow;
-            set
-            {
-                Set(nameof(ContextContentIsShow), ref _contextContentIsShow, value);
-                GlobalData.NotifyIconIsShow = ContextMenuIsShow || ContextContentIsShow;
-            }
-        }
-
-        private bool _contextContentIsBlink;
-
-        public bool ContextContentIsBlink
-        {
-            get => _contextContentIsBlink;
-            set => Set(nameof(ContextContentIsBlink), ref _contextContentIsBlink, value);
-        }
-
-        public RelayCommand<object> MouseCmd => new Lazy<RelayCommand<object>>(() =>
-            new RelayCommand<object>(str=> Growl.Info(str.ToString()))).Value;
-    }
-}

src/Net_40/HandyControlDemo_Net_40/ViewModel/Controls/PaginationDemoViewModel.cs

@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using GalaSoft.MvvmLight.Command;
-using HandyControl.Data;
-using HandyControlDemo.Data;
-using HandyControlDemo.Service;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class PaginationDemoViewModel : DemoViewModelBase<DemoDataModel>
-    {
-        /// <summary>
-        ///     所有数据
-        /// </summary>
-        private readonly List<DemoDataModel> _totalDataList;
-
-        /// <summary>
-        ///     页码
-        /// </summary>
-        private int _pageIndex = 1;
-
-        /// <summary>
-        ///     页码
-        /// </summary>
-        public int PageIndex
-        {
-            get => _pageIndex;
-            set => Set(nameof(PageIndex), ref _pageIndex, value);
-        }
-
-        public PaginationDemoViewModel(DataService dataService)
-        {
-            _totalDataList = dataService.GetDemoDataList(100);
-            DataList = _totalDataList.Take(10).ToList();
-        }
-
-        /// <summary>
-        ///     页码改变命令
-        /// </summary>
-        public RelayCommand<FunctionEventArgs<int>> PageUpdatedCmd =>
-            new Lazy<RelayCommand<FunctionEventArgs<int>>>(() =>
-                new RelayCommand<FunctionEventArgs<int>>(PageUpdated)).Value;
-
-        /// <summary>
-        ///     页码改变
-        /// </summary>
-        private void PageUpdated(FunctionEventArgs<int> info)
-        {
-            DataList = _totalDataList.Skip((info.Info - 1) * 10).Take(10).ToList();
-        }
-    }
-}

src/Net_40/HandyControlDemo_Net_40/ViewModel/Controls/SearchBarDemoViewModel.cs

@@ -1,18 +0,0 @@
-using System;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Command;
-using HandyControl.Controls;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class SearchBarDemoViewModel : ViewModelBase
-    {
-        public RelayCommand<string> SearchCmd => new Lazy<RelayCommand<string>>(() =>
-            new RelayCommand<string>(Search)).Value;
-
-        private void Search(string key)
-        {
-            Growl.Info(key);
-        }
-    }
-}

src/Net_40/HandyControlDemo_Net_40/ViewModel/Controls/StepBarDemoViewModel.cs

@@ -1,41 +0,0 @@
-using System;
-using System.Linq;
-using System.Windows.Controls;
-using GalaSoft.MvvmLight.Command;
-using HandyControl.Controls;
-using HandyControlDemo.Data;
-using HandyControlDemo.Service;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class StepBarDemoViewModel : DemoViewModelBase<StepBarDemoModel>
-    {
-        public StepBarDemoViewModel(DataService dataService) => DataList = dataService.GetStepBarDemoDataList();
-
-        /// <summary>
-        ///     下一步
-        /// </summary>
-        public RelayCommand<Panel> NextCmd => new Lazy<RelayCommand<Panel>>(() => new RelayCommand<Panel>(Next)).Value;
-
-        /// <summary>
-        ///     上一步
-        /// </summary>
-        public RelayCommand<Panel> PrevCmd => new Lazy<RelayCommand<Panel>>(() => new RelayCommand<Panel>(Prev)).Value;
-
-        private void Next(Panel panel)
-        {
-            foreach (var stepBar in panel.Children.OfType<StepBar>())
-            {
-                stepBar.Next();
-            }
-        }
-
-        private void Prev(Panel panel)
-        {
-            foreach (var stepBar in panel.Children.OfType<StepBar>())
-            {
-                stepBar.Prev();
-            }
-        }
-    }
-}

src/Net_40/HandyControlDemo_Net_40/ViewModel/Controls/WindowDemoViewModel.cs

@@ -1,21 +0,0 @@
-using System;
-using System.Windows;
-using GalaSoft.MvvmLight.Command;
-using HandyControlDemo.Tools;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class WindowDemoViewModel
-    {
-        public RelayCommand<string> OpenWindowCmd => new Lazy<RelayCommand<string>>(() => new RelayCommand<string>(OpenWindow)).Value;
-
-        private void OpenWindow(string windowTag)
-        {
-            if (AssemblyHelper.CreateInternalInstance($"Window.{windowTag}") is System.Windows.Window window)
-            {
-                window.Owner = Application.Current.MainWindow;
-                window.ShowDialog();
-            }
-        }
-    }
-}

src/Net_40/HandyControlDemo_Net_40/ViewModel/DemoViewModelBase!1.cs

@@ -1,22 +0,0 @@
-using System.Collections.Generic;
-using GalaSoft.MvvmLight;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class DemoViewModelBase<T> : ViewModelBase
-    {
-        /// <summary>
-        ///     数据列表
-        /// </summary>
-        private IList<T> _dataList;
-
-        /// <summary>
-        ///     数据列表
-        /// </summary>
-        public IList<T> DataList
-        {
-            get => _dataList;
-            set => Set(nameof(DataList), ref _dataList, value);
-        }
-    }
-}

src/Net_40/HandyControlDemo_Net_40/ViewModel/Main/ContributorsViewModel.cs

@@ -1,14 +0,0 @@
-using System.Threading.Tasks;
-using HandyControlDemo.Data;
-using HandyControlDemo.Service;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class ContributorsViewModel : DemoViewModelBase<ContributorModel>
-    {
-        public ContributorsViewModel(DataService dataService)
-        {
-            Task.Factory.StartNew(() => DataList = dataService.GetContributorDataList());
-        }
-    }
-}

src/Net_40/HandyControlDemo_Net_40/ViewModel/Main/MainViewModel.cs

@@ -1,113 +0,0 @@
-using System;
-using System.Windows.Controls;
-using GalaSoft.MvvmLight.Command;
-using GalaSoft.MvvmLight.Messaging;
-using HandyControlDemo.Data;
-using HandyControlDemo.Service;
-using HandyControlDemo.Tools;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class MainViewModel : DemoViewModelBase<DemoDataModel>
-    {
-        #region 字段
-
-        /// <summary>
-        ///     内容标题
-        /// </summary>
-        private object _contentTitle;
-
-        /// <summary>
-        ///     子内容
-        /// </summary>
-        private object _subContent;
-
-        /// <summary>
-        ///     当前选中的列表项
-        /// </summary>
-        private ListBoxItem _listBoxItemCurrent;
-
-        #endregion
-
-        public MainViewModel(DataService dataService)
-        {
-            Messenger.Default.Register<object>(this, MessageToken.LoadShowContent, obj =>
-            {
-                if (SubContent is IDisposable disposable)
-                {
-                    disposable.Dispose();
-                }
-                SubContent = obj;
-            });
-            Messenger.Default.Register<object>(this, MessageToken.ClearLeftSelected, obj =>
-            {
-                if (_listBoxItemCurrent == null) return;
-                _listBoxItemCurrent.IsSelected = false;
-                _listBoxItemCurrent = null;
-            });
-            DataList = dataService.GetDemoDataList();
-        }
-
-        #region 属性
-
-        /// <summary>
-        ///     子内容
-        /// </summary>
-        public object SubContent
-        {
-            get => _subContent;
-            set => Set(nameof(SubContent), ref _subContent, value);
-        }
-
-        /// <summary>
-        ///     内容标题
-        /// </summary>
-        public object ContentTitle
-        {
-            get => _contentTitle;
-            set => Set(nameof(ContentTitle), ref _contentTitle, value);
-        }
-
-        #endregion
-
-        #region 命令
-
-        /// <summary>
-        ///     切换例子命令
-        /// </summary>
-        public RelayCommand<SelectionChangedEventArgs> SwitchDemoCmd =>
-            new Lazy<RelayCommand<SelectionChangedEventArgs>>(() =>
-                new RelayCommand<SelectionChangedEventArgs>(SwitchDemo)).Value;
-
-        #endregion
-
-        #region 方法
-
-        /// <summary>
-        ///     切换例子
-        /// </summary>
-        private void SwitchDemo(SelectionChangedEventArgs e)
-        {
-            if (e.AddedItems.Count == 0) return;
-            if (e.AddedItems[0] is ListBoxItem item)
-            {
-                if (item.Tag is string tag)
-                {
-                    if (Equals(_listBoxItemCurrent, item)) return;
-                    _listBoxItemCurrent = item;
-                    ContentTitle = item.Content;
-                    Messenger.Default.Send(false, MessageToken.FullSwitch);
-                    Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{tag}"), MessageToken.LoadShowContent);
-                }
-                else
-                {
-                    _listBoxItemCurrent = null;
-                    ContentTitle = null;
-                    SubContent = null;
-                }
-            }
-        }
-
-        #endregion
-    }
-}

src/Net_40/HandyControlDemo_Net_40/ViewModel/ViewModelLocator.cs

@@ -1,76 +0,0 @@
-using System;
-using System.Windows;
-using CommonServiceLocator;
-using GalaSoft.MvvmLight.Ioc;
-using HandyControlDemo.Data;
-using HandyControlDemo.Service;
-using HandyControlDemo.ViewModel.Basic;
-using HandyControlDemo.ViewModel.Controls;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class ViewModelLocator
-    {
-        public ViewModelLocator()
-        {
-            ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);
-
-            SimpleIoc.Default.Register<DataService>();
-
-            SimpleIoc.Default.Register<MainViewModel>();
-            SimpleIoc.Default.Register(() => new GrowlDemoViewModel(), "GrowlDemo");
-            SimpleIoc.Default.Register(() => new GrowlDemoViewModel(MessageToken.GrowlDemoPanel), "GrowlDemoWithToken");
-            SimpleIoc.Default.Register<ImageBrowserDemoViewModel>();
-            SimpleIoc.Default.Register<ComboBoxDemoViewModel>();
-            SimpleIoc.Default.Register<WindowDemoViewModel>();
-            SimpleIoc.Default.Register<ContributorsViewModel>();
-            SimpleIoc.Default.Register<StepBarDemoViewModel>();
-            SimpleIoc.Default.Register<PaginationDemoViewModel>();
-            SimpleIoc.Default.Register<ChatBoxViewModel>();
-            SimpleIoc.Default.Register<CoverViewModel>();
-            SimpleIoc.Default.Register<DialogDemoViewModel>();
-            SimpleIoc.Default.Register<SearchBarDemoViewModel>();
-            SimpleIoc.Default.Register<NotifyIconDemoViewModel>();
-            SimpleIoc.Default.Register<InteractiveDialogViewModel>();
-            SimpleIoc.Default.Register<BadgeDemoViewModel>();
-        }
-
-        public static ViewModelLocator Instance => new Lazy<ViewModelLocator>(() =>
-            Application.Current.TryFindResource("Locator") as ViewModelLocator).Value;
-
-        #region Vm
-
-        public MainViewModel Main => ServiceLocator.Current.GetInstance<MainViewModel>();
-
-        public GrowlDemoViewModel GrowlDemo => ServiceLocator.Current.GetInstance<GrowlDemoViewModel>("GrowlDemo");
-
-        public GrowlDemoViewModel GrowlDemoWithToken => ServiceLocator.Current.GetInstance<GrowlDemoViewModel>("GrowlDemoWithToken");
-
-        public ImageBrowserDemoViewModel ImageBrowserDemo => ServiceLocator.Current.GetInstance<ImageBrowserDemoViewModel>();
-
-        public ComboBoxDemoViewModel ComboBoxDemo => ServiceLocator.Current.GetInstance<ComboBoxDemoViewModel>();
-
-        public WindowDemoViewModel WindowDemo => ServiceLocator.Current.GetInstance<WindowDemoViewModel>();
-
-        public ContributorsViewModel ContributorsView => ServiceLocator.Current.GetInstance<ContributorsViewModel>();
-
-        public StepBarDemoViewModel StepBarDemo => ServiceLocator.Current.GetInstance<StepBarDemoViewModel>();
-
-        public PaginationDemoViewModel PaginationDemo => ServiceLocator.Current.GetInstance<PaginationDemoViewModel>();
-
-        public ChatBoxViewModel ChatBox => new ChatBoxViewModel();
-
-        public CoverViewModel CoverView => ServiceLocator.Current.GetInstance<CoverViewModel>();
-
-        public DialogDemoViewModel DialogDemo => ServiceLocator.Current.GetInstance<DialogDemoViewModel>();
-
-        public SearchBarDemoViewModel SearchBarDemo => ServiceLocator.Current.GetInstance<SearchBarDemoViewModel>();
-
-        public NotifyIconDemoViewModel NotifyIconDemo => ServiceLocator.Current.GetInstance<NotifyIconDemoViewModel>();
-
-        public InteractiveDialogViewModel InteractiveDialog => ServiceLocator.Current.GetInstance<InteractiveDialogViewModel>();
-
-        public BadgeDemoViewModel BadgeDemo => ServiceLocator.Current.GetInstance<BadgeDemoViewModel>();
-        #endregion
-    }
-}

src/Net_40/HandyControl_Net_40/Controls/Other/Growl.cs

@@ -1,601 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Threading;
-using HandyControl.Data;
-using HandyControl.Interactivity;
-using HandyControl.Tools;
-using HandyControl.Tools.Extension;
-
-namespace HandyControl.Controls
-{
-    /// <summary>
-    ///     消息提醒
-    /// </summary>
-    [TemplatePart(Name = ElementPanelMore, Type = typeof(Panel))]
-    [TemplatePart(Name = ElementGridMain, Type = typeof(Grid))]
-    [TemplatePart(Name = ElementButtonClose, Type = typeof(Button))]
-    public class Growl : Control
-    {
-        #region Constants
-
-        private const string ElementPanelMore = "PART_PanelMore";
-        private const string ElementGridMain = "PART_GridMain";
-        private const string ElementButtonClose = "PART_ButtonClose";
-
-        #endregion Constants
-
-        #region Data
-
-        private Panel _panelMore;
-
-        private Grid _gridMain;
-
-        private Button _buttonClose;
-
-        private bool _showCloseButton;
-
-        private bool _staysOpen;
-
-        private int _waitTime = 6;
-
-        /// <summary>
-        ///     计数
-        /// </summary>
-        private int _tickCount;
-
-        /// <summary>
-        ///     关闭计时器
-        /// </summary>
-        private DispatcherTimer _timerClose;
-
-        private static readonly Dictionary<string, Panel> PanelDic = new Dictionary<string, Panel>();
-
-        #endregion Data
-
-        public Growl()
-        {
-            CommandBindings.Add(new CommandBinding(ControlCommands.Close, ButtonClose_OnClick));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Cancel, ButtonCancel_OnClick));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Confirm, ButtonOk_OnClick));
-        }
-
-        public static void Register(string token, Panel panel)
-        {
-            if (string.IsNullOrEmpty(token) || panel == null) return;
-            PanelDic[token] = panel;
-            InitGrowlPanel(panel);
-        }
-
-        public static void Unregister(string token, Panel panel)
-        {
-            if (string.IsNullOrEmpty(token) || panel == null) return;
-
-            if (PanelDic.ContainsKey(token))
-            {
-                if (ReferenceEquals(PanelDic[token], panel))
-                {
-                    PanelDic.Remove(token);
-                    panel.ContextMenu = null;
-                    panel.SetCurrentValue(PanelElement.FluidMoveBehaviorProperty, DependencyProperty.UnsetValue);
-                }
-            }
-        }
-
-        public static void Unregister(Panel panel)
-        {
-            if (panel == null) return;
-            var first = PanelDic.FirstOrDefault(item => ReferenceEquals(panel, item.Value));
-            if (!string.IsNullOrEmpty(first.Key))
-            {
-                PanelDic.Remove(first.Key);
-                panel.ContextMenu = null;
-                panel.SetCurrentValue(PanelElement.FluidMoveBehaviorProperty, DependencyProperty.UnsetValue);
-            }
-        }
-
-        protected override void OnMouseEnter(MouseEventArgs e)
-        {
-            base.OnMouseEnter(e);
-
-            _buttonClose.Show(_showCloseButton);
-        }
-
-        protected override void OnMouseLeave(MouseEventArgs e)
-        {
-            base.OnMouseLeave(e);
-
-            _buttonClose.Collapse();
-        }
-
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-
-            _panelMore = GetTemplateChild(ElementPanelMore) as Panel;
-            _gridMain = GetTemplateChild(ElementGridMain) as Grid;
-            _buttonClose = GetTemplateChild(ElementButtonClose) as Button;
-
-            CheckNull();
-            Update();
-        }
-
-        private void CheckNull()
-        {
-            if (_panelMore == null || _gridMain == null || _buttonClose == null) throw new Exception();
-        }
-
-        private Func<bool, bool> ActionBeforeClose { get; set; }
-
-        /// <summary>
-        ///     消息容器
-        /// </summary>
-        public static Panel GrowlPanel { get; set; }
-
-        internal static readonly DependencyProperty CancelStrProperty = DependencyProperty.Register(
-            "CancelStr", typeof(string), typeof(Growl), new PropertyMetadata(default(string)));
-
-        internal static readonly DependencyProperty ConfirmStrProperty = DependencyProperty.Register(
-            "ConfirmStr", typeof(string), typeof(Growl), new PropertyMetadata(default(string)));
-
-        public static readonly DependencyProperty ShowDateTimeProperty = DependencyProperty.Register(
-            "ShowDateTime", typeof(bool), typeof(Growl), new PropertyMetadata(ValueBoxes.TrueBox));
-
-        public static readonly DependencyProperty MessageProperty = DependencyProperty.Register(
-            "Message", typeof(string), typeof(Growl), new PropertyMetadata(default(string)));
-
-        public static readonly DependencyProperty TimeProperty = DependencyProperty.Register(
-            "Time", typeof(DateTime), typeof(Growl), new PropertyMetadata(default(DateTime)));
-
-        public static readonly DependencyProperty IconProperty = DependencyProperty.Register(
-            "Icon", typeof(Geometry), typeof(Growl), new PropertyMetadata(default(Geometry)));
-
-        public static readonly DependencyProperty IconBrushProperty = DependencyProperty.Register(
-            "IconBrush", typeof(Brush), typeof(Growl), new PropertyMetadata(default(Brush)));
-
-        public static readonly DependencyProperty TypeProperty = DependencyProperty.Register(
-            "Type", typeof(InfoType), typeof(Growl), new PropertyMetadata(default(InfoType)));
-
-        public static readonly DependencyProperty GrowlParentProperty = DependencyProperty.RegisterAttached(
-            "GrowlParent", typeof(bool), typeof(Growl), new PropertyMetadata(ValueBoxes.FalseBox, (o, args) =>
-            {
-                if ((bool)args.NewValue && o is Panel panel)
-                {
-                    SetGrowlPanel(panel);
-                }
-            }));
-
-        public static readonly DependencyProperty TokenProperty = DependencyProperty.RegisterAttached(
-            "Token", typeof(string), typeof(Growl), new PropertyMetadata(default(string), OnTokenChanged));
-
-        private static void OnTokenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is Panel panel)
-            {
-                if (e.NewValue == null)
-                {
-                    Unregister(panel);
-                }
-                else
-                {
-                    Register(e.NewValue.ToString(), panel);
-                }
-            }
-        }
-
-        public static void SetToken(DependencyObject element, string value)
-            => element.SetValue(TokenProperty, value);
-
-        public static string GetToken(DependencyObject element)
-            => (string)element.GetValue(TokenProperty);
-
-        public static void SetGrowlParent(DependencyObject element, bool value) => element.SetValue(GrowlParentProperty, value);
-
-        public static bool GetGrowlParent(DependencyObject element) => (bool)element.GetValue(GrowlParentProperty);
-
-        public InfoType Type
-        {
-            get => (InfoType)GetValue(TypeProperty);
-            set => SetValue(TypeProperty, value);
-        }
-
-        internal string CancelStr
-        {
-            get => (string)GetValue(CancelStrProperty);
-            set => SetValue(CancelStrProperty, value);
-        }
-
-        internal string ConfirmStr
-        {
-            get => (string)GetValue(ConfirmStrProperty);
-            set => SetValue(ConfirmStrProperty, value);
-        }
-
-        public bool ShowDateTime
-        {
-            get => (bool)GetValue(ShowDateTimeProperty);
-            set => SetValue(ShowDateTimeProperty, value);
-        }
-
-        public string Message
-        {
-            get => (string)GetValue(MessageProperty);
-            set => SetValue(MessageProperty, value);
-        }
-
-        public DateTime Time
-        {
-            get => (DateTime)GetValue(TimeProperty);
-            set => SetValue(TimeProperty, value);
-        }
-
-        public Geometry Icon
-        {
-            get => (Geometry)GetValue(IconProperty);
-            set => SetValue(IconProperty, value);
-        }
-
-        public Brush IconBrush
-        {
-            get => (Brush)GetValue(IconBrushProperty);
-            set => SetValue(IconBrushProperty, value);
-        }
-
-        /// <summary>
-        ///     开始计时器
-        /// </summary>
-        private void StartTimer()
-        {
-            _timerClose = new DispatcherTimer
-            {
-                Interval = TimeSpan.FromSeconds(1)
-            };
-            _timerClose.Tick += delegate
-            {
-                if (IsMouseOver)
-                {
-                    _tickCount = 0;
-                    return;
-                }
-
-                _tickCount++;
-                if (_tickCount >= _waitTime) Close();
-            };
-            _timerClose.Start();
-        }
-
-        /// <summary>
-        ///     消息容器
-        /// </summary>
-        /// <param name="panel"></param>
-        private static void SetGrowlPanel(Panel panel)
-        {
-            GrowlPanel = panel;
-            InitGrowlPanel(panel);
-        }
-
-        private static void InitGrowlPanel(Panel panel)
-        {
-            var menuItem = new MenuItem
-            {
-                Header = Properties.Langs.Lang.Clear
-            };
-            menuItem.Click += (s, e) =>
-            {
-                foreach (var item in panel.Children.OfType<Growl>())
-                {
-                    item.Close();
-                }
-            };
-            panel.ContextMenu = new ContextMenu
-            {
-                Items =
-                {
-                    menuItem
-                }
-            };
-
-            PanelElement.SetFluidMoveBehavior(panel, ResourceHelper.GetResource<FluidMoveBehavior>(ResourceToken.BehaviorXY400));
-        }
-
-        private void Update()
-        {
-            if (ActionBeforeClose != null)
-            {
-                _staysOpen = true;
-                _showCloseButton = false;
-                _panelMore.IsEnabled = true;
-                _panelMore.Show();
-            }
-
-            var transform = new TranslateTransform
-            {
-                X = MaxWidth
-            };
-            _gridMain.RenderTransform = transform;
-            transform.BeginAnimation(TranslateTransform.XProperty, AnimationHelper.CreateAnimation(0));
-            if (!_staysOpen) StartTimer();
-        }
-
-        /// <summary>
-        ///     显示信息
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        private static void Show(GrowlInfo growlInfo)
-        {
-            Application.Current.Dispatcher.Invoke(new Action(() =>
-            {
-                var ctl = new Growl
-                {
-                    Message = growlInfo.Message,
-                    Time = DateTime.Now,
-                    Icon = ResourceHelper.GetResource<Geometry>(growlInfo.IconKey),
-                    IconBrush = ResourceHelper.GetResource<Brush>(growlInfo.IconBrushKey),
-                    _showCloseButton = growlInfo.ShowCloseButton,
-                    ActionBeforeClose = growlInfo.ActionBeforeClose,
-                    _staysOpen = growlInfo.StaysOpen,
-                    ShowDateTime = growlInfo.ShowDateTime,
-                    ConfirmStr = growlInfo.ConfirmStr,
-                    CancelStr = growlInfo.CancelStr,
-                    Type = growlInfo.Type,
-                    _waitTime = Math.Max(growlInfo.WaitTime, 2)
-                };
-                if (!string.IsNullOrEmpty(growlInfo.Token))
-                {
-                    if (PanelDic.TryGetValue(growlInfo.Token, out var panel))
-                    {
-                        panel?.Children.Insert(0, ctl);
-                    }
-                }
-                else
-                {
-                    GrowlPanel.Children.Insert(0, ctl);
-                }
-            }));
-        }
-
-        /// <summary>
-        ///     成功
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="token"></param>
-        public static void Success(string message, string token = "") => Success(new GrowlInfo
-        {
-            Message = message,
-            Token = token
-        });
-
-        /// <summary>
-        ///     成功
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void Success(GrowlInfo growlInfo)
-        {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.SuccessGeometry;
-                growlInfo.IconBrushKey = ResourceToken.SuccessBrush;
-                growlInfo.Type = InfoType.Success;
-            }
-            Show(growlInfo);
-        }
-
-        /// <summary>
-        ///     消息
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="token"></param>
-        public static void Info(string message, string token = "") => Info(new GrowlInfo
-        {
-            Message = message,
-            Token = token
-        });
-
-        /// <summary>
-        ///     消息
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void Info(GrowlInfo growlInfo)
-        {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.InfoGeometry;
-                growlInfo.IconBrushKey = ResourceToken.InfoBrush;
-                growlInfo.Type = InfoType.Info;
-            }
-            Show(growlInfo);
-        }
-
-        /// <summary>
-        ///     警告
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="token"></param>
-        public static void Warning(string message, string token = "") => Warning(new GrowlInfo
-        {
-            Message = message,
-            Token = token
-        });
-
-        /// <summary>
-        ///     警告
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void Warning(GrowlInfo growlInfo)
-        {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.WarningGeometry;
-                growlInfo.IconBrushKey = ResourceToken.WarningBrush;
-                growlInfo.Type = InfoType.Warning;
-            }
-            Show(growlInfo);
-        }
-
-        /// <summary>
-        ///     错误
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="token"></param>
-        public static void Error(string message, string token = "") => Error(new GrowlInfo
-        {
-            Message = message,
-            Token = token
-        });
-
-        /// <summary>
-        ///     错误
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void Error(GrowlInfo growlInfo)
-        {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.ErrorGeometry;
-                growlInfo.IconBrushKey = ResourceToken.DangerBrush;
-                growlInfo.StaysOpen = true;
-                growlInfo.Type = InfoType.Error;
-            }
-            Show(growlInfo);
-        }
-
-        /// <summary>
-        ///     严重
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="token"></param>
-        public static void Fatal(string message, string token = "") => Fatal(new GrowlInfo
-        {
-            Message = message,
-            Token = token
-        });
-
-        /// <summary>
-        ///     严重
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void Fatal(GrowlInfo growlInfo)
-        {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.FatalGeometry;
-                growlInfo.IconBrushKey = ResourceToken.PrimaryTextBrush;
-                growlInfo.StaysOpen = true;
-                growlInfo.ShowCloseButton = false;
-                growlInfo.Type = InfoType.Fatal;
-                if (GrowlPanel.ContextMenu != null) GrowlPanel.ContextMenu.Opacity = 0;
-            }
-            Show(growlInfo);
-        }
-
-        /// <summary>
-        ///     询问
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="actionBeforeClose"></param>
-        /// <param name="token"></param>
-        public static void Ask(string message, Func<bool, bool> actionBeforeClose, string token = "") => Ask(new GrowlInfo
-        {
-            Message = message,
-            ActionBeforeClose = actionBeforeClose,
-            Token = token
-        });
-
-        /// <summary>
-        ///     询问
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void Ask(GrowlInfo growlInfo)
-        {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.AskGeometry;
-                growlInfo.IconBrushKey = ResourceToken.AccentBrush;
-                growlInfo.StaysOpen = true;
-                growlInfo.ShowCloseButton = false;
-                growlInfo.Type = InfoType.Ask;
-            }
-            Show(growlInfo);
-        }
-
-        private void ButtonClose_OnClick(object sender, RoutedEventArgs e) => Close();
-
-        /// <summary>
-        ///     关闭
-        /// </summary>
-        private void Close()
-        {
-            _timerClose?.Stop();
-            var transform = new TranslateTransform();
-            _gridMain.RenderTransform = transform;
-            var animation = AnimationHelper.CreateAnimation(MaxWidth);
-            animation.Completed += (s, e) =>
-            {
-                if (Parent is Panel panel)
-                {
-                    panel.Children.Remove(this);
-                }
-            };
-            transform.BeginAnimation(TranslateTransform.XProperty, animation);
-        }
-
-        /// <summary>
-        ///     清除
-        /// </summary>
-        /// <param name="token"></param>
-        public static void Clear(string token = "")
-        {
-            if (!string.IsNullOrEmpty(token))
-            {
-                if (PanelDic.TryGetValue(token, out var panel))
-                {
-                    Clear(panel);
-                }
-            }
-            else
-            {
-                Clear(GrowlPanel);
-            }
-        }
-
-        /// <summary>
-        ///     清除
-        /// </summary>
-        /// <param name="panel"></param>
-        private static void Clear(Panel panel)
-        {
-            panel.Children.Clear();
-            if (panel.ContextMenu != null)
-            {
-                panel.ContextMenu.IsOpen = false;
-                panel.ContextMenu.Opacity = 1;
-            }
-        }
-
-        private void ButtonCancel_OnClick(object sender, RoutedEventArgs e)
-        {
-            if (ActionBeforeClose?.Invoke(false) == true)
-            {
-                Close();
-            }
-        }
-
-        private void ButtonOk_OnClick(object sender, RoutedEventArgs e)
-        {
-            if (ActionBeforeClose?.Invoke(true) == true)
-            {
-                Close();
-            }
-        }
-    }
-}

src/Net_40/HandyControl_Net_40/Controls/Window/MessageBox.cs

@@ -1,390 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Shapes;
-using HandyControl.Data;
-using HandyControl.Interactivity;
-using HandyControl.Tools;
-using HandyControl.Tools.Extension;
-
-namespace HandyControl.Controls
-{
-    /// <summary>
-    ///     消息框
-    /// </summary>
-    public sealed class MessageBox : Window
-    {
-        #region Constants
-
-        private const string ElementImage = "PART_Image";
-
-        private const string ElementMessage = "PART_Message";
-
-        #endregion Constants
-
-        private MessageBoxResult _messageBoxResult = MessageBoxResult.Cancel;
-
-        private bool _showOk;
-
-        private bool _showCancel;
-
-        private bool _showYes;
-
-        private bool _showNo;
-
-        private string _message;
-
-        private Geometry _image;
-
-        private Brush _imageBrush;
-
-        private bool _showImage;
-
-        private MessageBox()
-        {
-            CommandBindings.Add(new CommandBinding(ControlCommands.Confirm, (s, e) =>
-            {
-                _messageBoxResult = MessageBoxResult.OK;
-                Close();
-            }, (s, e) => e.CanExecute = _showOk));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Cancel, (s, e) =>
-            {
-                _messageBoxResult = MessageBoxResult.Cancel;
-                Close();
-            }, (s, e) => e.CanExecute = _showCancel));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Yes, (s, e) =>
-            {
-                _messageBoxResult = MessageBoxResult.Yes;
-                Close();
-            }, (s, e) => e.CanExecute = _showYes));
-            CommandBindings.Add(new CommandBinding(ControlCommands.No, (s, e) =>
-            {
-                _messageBoxResult = MessageBoxResult.No;
-                Close();
-            }, (s, e) => e.CanExecute = _showNo));
-        }
-
-        protected override void OnSourceInitialized(EventArgs e)
-        {
-            base.OnSourceInitialized(e);
-
-            if (LogicalTreeHelper.FindLogicalNode(this, ElementMessage) is TextBlock message) message.Text = _message;
-
-            if (_showImage)
-            {
-                if (LogicalTreeHelper.FindLogicalNode(this, ElementImage) is Path image)
-                {
-                    image.Data = _image;
-                    image.Fill = _imageBrush;
-                    image.Show();
-                }
-            }
-        }
-
-        /// <summary>
-        ///     成功
-        /// </summary>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        public static MessageBoxResult Success(string messageBoxText, string caption = null)
-        {
-            MessageBox messageBox = null;
-            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();
-            }));
-
-            return messageBox._messageBoxResult;
-        }
-
-        /// <summary>
-        ///     消息
-        /// </summary>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        public static MessageBoxResult Info(string messageBoxText, string caption = null)
-        {
-            MessageBox messageBox = null;
-            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();
-            }));
-
-            return messageBox._messageBoxResult;
-        }
-
-        /// <summary>
-        ///     警告
-        /// </summary>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        public static MessageBoxResult Warning(string messageBoxText, string caption = null)
-        {
-            MessageBox messageBox = null;
-            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();
-            }));
-
-            return messageBox._messageBoxResult;
-        }
-
-        /// <summary>
-        ///     错误
-        /// </summary>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        public static MessageBoxResult Error(string messageBoxText, string caption = null)
-        {
-            MessageBox messageBox = null;
-            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();
-            }));
-
-            return messageBox._messageBoxResult;
-        }
-
-        /// <summary>
-        ///     严重
-        /// </summary>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        public static MessageBoxResult Fatal(string messageBoxText, string caption = null)
-        {
-            MessageBox messageBox = null;
-            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();
-            }));
-
-            return messageBox._messageBoxResult;
-        }
-
-        /// <summary>
-        ///     询问
-        /// </summary>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        public static MessageBoxResult Ask(string messageBoxText, string caption = null)
-        {
-            MessageBox messageBox = null;
-            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();
-            }));
-
-            return messageBox._messageBoxResult;
-        }
-
-        /// <summary>
-        ///     自定义信息展示
-        /// </summary>
-        /// <param name="info"></param>
-        /// <returns></returns>
-        public static MessageBoxResult Show(MessageBoxInfo info)
-        {
-            MessageBox messageBox = null;
-            Application.Current.Dispatcher.Invoke(new Action(() =>
-            {
-                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);
-                }
-
-                messageBox.Style = info.Style;
-                messageBox.ShowDialog();
-            }));
-
-            return messageBox._messageBoxResult;
-        }
-
-        /// <summary>
-        ///     信息展示
-        /// </summary>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        /// <param name="button"></param>
-        /// <param name="icon"></param>
-        /// <param name="defaultResult"></param>
-        /// <returns></returns>
-        public static MessageBoxResult Show(string messageBoxText, string caption = null,
-            MessageBoxButton button = MessageBoxButton.OK, MessageBoxImage icon = MessageBoxImage.None,
-            MessageBoxResult defaultResult = MessageBoxResult.None) =>
-            Show(null, messageBoxText, caption, button, icon, defaultResult);
-
-        /// <summary>
-        ///     信息展示
-        /// </summary>
-        /// <param name="owner"></param>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        /// <param name="button"></param>
-        /// <param name="icon"></param>
-        /// <param name="defaultResult"></param>
-        /// <returns></returns>
-        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;
-            Application.Current.Dispatcher.Invoke(new Action(() =>
-            {
-                messageBox = CreateMessageBox(owner, messageBoxText, caption, button, icon, defaultResult);
-                SetButtonStatus(messageBox, button);
-                SetImage(messageBox, icon);
-                messageBox.ShowDialog();
-            }));
-
-            return messageBox._messageBoxResult;
-        }
-
-        private static MessageBox CreateMessageBox(
-            System.Windows.Window owner,
-            string messageBoxText,
-            string caption,
-            MessageBoxButton button,
-            MessageBoxImage icon,
-            MessageBoxResult defaultResult)
-        {
-            if (!IsValidMessageBoxButton(button))
-            {
-                throw new InvalidEnumArgumentException(nameof(button), (int)button, typeof(MessageBoxButton));
-            }
-            if (!IsValidMessageBoxImage(icon))
-            {
-                throw new InvalidEnumArgumentException(nameof(icon), (int)icon, typeof(MessageBoxImage));
-            }
-            if (!IsValidMessageBoxResult(defaultResult))
-            {
-                throw new InvalidEnumArgumentException(nameof(defaultResult), (int)defaultResult, typeof(MessageBoxResult));
-            }
-
-            var ownerWindow = owner ?? VisualHelper.GetActiveWindow();
-            var ownerIsNull = ownerWindow is null;
-
-            return new MessageBox
-            {
-                _message = messageBoxText,
-                Owner = ownerWindow,
-                WindowStartupLocation = ownerIsNull ? WindowStartupLocation.CenterScreen : WindowStartupLocation.CenterOwner,
-                ShowTitle = true,
-                Title = caption ?? string.Empty,
-                Topmost = ownerIsNull,
-                _messageBoxResult = defaultResult
-            };
-        }
-
-        private static void SetButtonStatus(MessageBox messageBox, MessageBoxButton messageBoxButton)
-        {
-            switch (messageBoxButton)
-            {
-                case MessageBoxButton.OK:
-                    messageBox._showOk = true;
-                    break;
-                case MessageBoxButton.OKCancel:
-                    messageBox._showOk = true;
-                    messageBox._showCancel = true;
-                    break;
-                case MessageBoxButton.YesNo:
-                    messageBox._showYes = true;
-                    messageBox._showNo = true;
-                    break;
-                case MessageBoxButton.YesNoCancel:
-                    messageBox._showYes = true;
-                    messageBox._showNo = true;
-                    messageBox._showCancel = true;
-                    break;
-            }
-        }
-
-        private static void SetImage(MessageBox messageBox, MessageBoxImage messageBoxImage)
-        {
-            var iconKey = string.Empty;
-            var iconBrushKey = string.Empty;
-
-            switch (messageBoxImage)
-            {
-                case MessageBoxImage.Error:
-                    iconKey = ResourceToken.ErrorGeometry;
-                    iconBrushKey = ResourceToken.DangerBrush;
-                    break;
-                case MessageBoxImage.Question:
-                    iconKey = ResourceToken.AskGeometry;
-                    iconBrushKey = ResourceToken.AccentBrush;
-                    break;
-                case MessageBoxImage.Warning:
-                    iconKey = ResourceToken.WarningGeometry;
-                    iconBrushKey = ResourceToken.WarningBrush;
-                    break;
-                case MessageBoxImage.Information:
-                    iconKey = ResourceToken.InfoGeometry;
-                    iconBrushKey = ResourceToken.InfoBrush;
-                    break;
-            }
-
-            if (string.IsNullOrEmpty(iconKey)) return;
-            messageBox._showImage = true;
-            messageBox._image = ResourceHelper.GetResource<Geometry>(iconKey);
-            messageBox._imageBrush = ResourceHelper.GetResource<Brush>(iconBrushKey);
-        }
-
-        private static bool IsValidMessageBoxButton(MessageBoxButton value)
-        {
-            return value == MessageBoxButton.OK
-                   || value == MessageBoxButton.OKCancel
-                   || value == MessageBoxButton.YesNo
-                   || value == MessageBoxButton.YesNoCancel;
-        }
-
-        private static bool IsValidMessageBoxImage(MessageBoxImage value)
-        {
-            return value == MessageBoxImage.Asterisk
-                   || value == MessageBoxImage.Error
-                   || value == MessageBoxImage.Exclamation
-                   || value == MessageBoxImage.Hand
-                   || value == MessageBoxImage.Information
-                   || value == MessageBoxImage.None
-                   || value == MessageBoxImage.Question
-                   || value == MessageBoxImage.Stop
-                   || value == MessageBoxImage.Warning;
-        }
-
-        private static bool IsValidMessageBoxResult(MessageBoxResult value)
-        {
-            return value == MessageBoxResult.Cancel
-                   || value == MessageBoxResult.No
-                   || value == MessageBoxResult.None
-                   || value == MessageBoxResult.OK
-                   || value == MessageBoxResult.Yes;
-        }
-    }
-}

src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj

@@ -70,10 +70,6 @@
       <Generator>XamlIntelliSenseFileGenerator</Generator>
     </Page>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Controls\Other\Growl.cs" />
-    <Compile Include="Controls\Window\MessageBox.cs" />
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Windows.Shell">
       <Version>3.0.1</Version>

src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj

@@ -93,21 +93,6 @@
     <Compile Include="UserControl\Main\NoUserContent.xaml.cs">
       <DependentUpon>NoUserContent.xaml</DependentUpon>
     </Compile>
-    <Compile Include="ViewModel\Basic\ChatBoxViewModel.cs" />
-    <Compile Include="ViewModel\Basic\InteractiveDialogViewModel.cs" />
-    <Compile Include="ViewModel\Controls\BadgeDemoViewModel.cs" />
-    <Compile Include="ViewModel\Controls\DialogDemoViewModel.cs" />
-    <Compile Include="ViewModel\Controls\GrowlDemoViewModel.cs" />
-    <Compile Include="ViewModel\Controls\ImageBrowserDemoViewModel.cs" />
-    <Compile Include="ViewModel\Controls\NotifyIconDemoViewModel.cs" />
-    <Compile Include="ViewModel\Controls\PaginationDemoViewModel.cs" />
-    <Compile Include="ViewModel\Controls\SearchBarDemoViewModel.cs" />
-    <Compile Include="ViewModel\Controls\StepBarDemoViewModel.cs" />
-    <Compile Include="ViewModel\Controls\WindowDemoViewModel.cs" />
-    <Compile Include="ViewModel\DemoViewModelBase!1.cs" />
-    <Compile Include="ViewModel\Main\ContributorsViewModel.cs" />
-    <Compile Include="ViewModel\Main\MainViewModel.cs" />
-    <Compile Include="ViewModel\ViewModelLocator.cs" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\1.jpg">

src/Net_GE45/HandyControlDemo_Net_GE45/ViewModel/Basic/ChatBoxViewModel.cs

@@ -1,172 +0,0 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.IO;
-using System.Media;
-using System.Windows;
-using System.Windows.Input;
-using System.Windows.Media.Imaging;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.CommandWpf;
-using GalaSoft.MvvmLight.Messaging;
-using HandyControl.Controls;
-using HandyControl.Data;
-using HandyControl.Tools;
-using HandyControlDemo.Data;
-using HandyControlDemo.Tools;
-using Microsoft.Win32;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class ChatBoxViewModel : ViewModelBase
-    {
-        private static readonly string AudioCachePath = $"{AppDomain.CurrentDomain.BaseDirectory}Cache";
-
-        private readonly string _id = Guid.NewGuid().ToString();
-
-        private readonly Stopwatch _stopwatch = new Lazy<Stopwatch>(() => new Stopwatch()).Value;
-
-        public ChatBoxViewModel()
-        {
-            Messenger.Default.Register<ChatInfoModel>(this, MessageToken.SendChatMessage, ReceiveMessage);
-        }
-
-        private void ReceiveMessage(ChatInfoModel info)
-        {
-            if (_id.Equals(info.SenderId)) return;
-            info.Role = ChatRoleType.Receiver;
-            ChatInfos.Add(info);
-        }
-
-        private string _chatString;
-
-        public string ChatString
-        {
-            get => _chatString;
-            set => Set(ref _chatString, value);
-        }
-
-        public ObservableCollection<ChatInfoModel> ChatInfos { get; set; } = new ObservableCollection<ChatInfoModel>();
-
-        public RelayCommand<KeyEventArgs> SendStringCmd => new Lazy<RelayCommand<KeyEventArgs>>(() =>
-            new RelayCommand<KeyEventArgs>(SendString)).Value;
-
-        private void SendString(KeyEventArgs e)
-        {
-            if (e.Key == Key.Enter)
-            {
-                if (string.IsNullOrEmpty(ChatString)) return;
-                var info = new ChatInfoModel
-                {
-                    Message = ChatString,
-                    SenderId = _id,
-                    Type = ChatMessageType.String,
-                    Role = ChatRoleType.Sender
-                };
-                ChatInfos.Add(info);
-                Messenger.Default.Send(info, MessageToken.SendChatMessage);
-                ChatString = string.Empty;
-            }
-        }
-
-        public RelayCommand<RoutedEventArgs> ReadMessageCmd => new Lazy<RelayCommand<RoutedEventArgs>>(() =>
-            new RelayCommand<RoutedEventArgs>(ReadMessage)).Value;
-
-        private void ReadMessage(RoutedEventArgs e)
-        {
-            if (e.OriginalSource is FrameworkElement element && element.Tag is ChatInfoModel info)
-            {
-                if (info.Type == ChatMessageType.Image)
-                {
-                    new ImageBrowser(new Uri(info.Enclosure.ToString()))
-                    {
-                        Owner = VisualHelper.GetActiveWindow()
-                    }.Show();
-                }
-                else if (info.Type == ChatMessageType.Audio)
-                {
-                    var player = new SoundPlayer(info.Enclosure.ToString());
-                    player.PlaySync();
-                }
-            }
-        }
-
-        public RelayCommand StartRecordCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(StartRecord)).Value;
-
-        private void StartRecord()
-        {
-            ExternDllHelper.MciSendString("set wave bitpersample 8", "", 0, 0);
-            ExternDllHelper.MciSendString("set wave samplespersec 20000", "", 0, 0);
-            ExternDllHelper.MciSendString("set wave channels 2", "", 0, 0);
-            ExternDllHelper.MciSendString("set wave format tag pcm", "", 0, 0);
-            ExternDllHelper.MciSendString("open new type WAVEAudio alias movie", "", 0, 0);
-            ExternDllHelper.MciSendString("record movie", "", 0, 0);
-
-            _stopwatch.Reset();
-            _stopwatch.Start();
-        }
-
-        public RelayCommand StopRecordCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(StopRecord)).Value;
-
-        private void StopRecord()
-        {
-            if (!Directory.Exists(AudioCachePath))
-            {
-                try
-                {
-                    Directory.CreateDirectory(AudioCachePath);
-                }
-                catch (Exception e)
-                {
-                    Growl.Error(e.Message);
-                    return;
-                }
-            }
-
-            var cachePath = $"{AudioCachePath}\\{Guid.NewGuid().ToString()}";
-            ExternDllHelper.MciSendString("stop movie", "", 0, 0);
-            ExternDllHelper.MciSendString($"save movie {cachePath}", "", 0, 0);
-            ExternDllHelper.MciSendString("close movie", "", 0, 0);
-
-            _stopwatch.Stop();
-
-            var info = new ChatInfoModel
-            {
-                Message = $"{_stopwatch.Elapsed.Seconds.ToString()} {Properties.Langs.Lang.Second}",
-                SenderId = _id,
-                Type = ChatMessageType.Audio,
-                Role = ChatRoleType.Sender,
-                Enclosure = cachePath
-            };
-            ChatInfos.Add(info);
-            Messenger.Default.Send(info, MessageToken.SendChatMessage);
-        }
-
-        public RelayCommand OpenImageCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(OpenImage)).Value;
-
-        private void OpenImage()
-        {
-            var dialog = new OpenFileDialog();
-            if (dialog.ShowDialog() == true)
-            {
-                var fileName = dialog.FileName;
-                if (File.Exists(fileName))
-                {
-                    var info = new ChatInfoModel
-                    {
-                        Message = BitmapFrame.Create(new Uri(fileName)),
-                        SenderId = _id,
-                        Type = ChatMessageType.Image,
-                        Role = ChatRoleType.Sender,
-                        Enclosure = fileName
-                    };
-                    ChatInfos.Add(info);
-                    Messenger.Default.Send(info, MessageToken.SendChatMessage);
-                }
-            }
-        }
-    }
-}

src/Net_GE45/HandyControlDemo_Net_GE45/ViewModel/Basic/InteractiveDialogViewModel.cs

@@ -1,30 +0,0 @@
-using System;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.CommandWpf;
-using HandyControl.Tools.Extension;
-
-namespace HandyControlDemo.ViewModel.Basic
-{
-    public class InteractiveDialogViewModel : ViewModelBase, IDialogResultable<string>
-    {
-        public Action CloseAction { get; set; }
-
-        private string _result;
-
-        public string Result
-        {
-            get => _result;
-            set => Set(ref _result, value);
-        }
-
-        private string _message;
-
-        public string Message
-        {
-            get => _message;
-            set => Set(ref _message, value);
-        }
-
-        public RelayCommand CloseCmd => new Lazy<RelayCommand>(() => new RelayCommand(() => CloseAction?.Invoke())).Value;
-    }
-}

src/Net_GE45/HandyControlDemo_Net_GE45/ViewModel/Controls/BadgeDemoViewModel.cs

@@ -1,20 +0,0 @@
-using System;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.CommandWpf;
-
-namespace HandyControlDemo.ViewModel.Controls
-{
-    public class BadgeDemoViewModel : ViewModelBase
-    {
-        private int _count = 1;
-
-        public int Count
-        {
-            get => _count;
-            set => Set(ref _count, value);
-        }
-
-        public RelayCommand CountCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() => Count++)).Value;
-    }
-}

src/Net_GE45/HandyControlDemo_Net_GE45/ViewModel/Controls/DialogDemoViewModel.cs

@@ -1,41 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.CommandWpf;
-using HandyControl.Controls;
-using HandyControl.Tools.Extension;
-using HandyControlDemo.UserControl;
-using HandyControlDemo.UserControl.Basic;
-using HandyControlDemo.ViewModel.Basic;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class DialogDemoViewModel : ViewModelBase
-    {
-        private string _dialogResult;
-
-        public string DialogResult
-        {
-            get => _dialogResult;
-            set => Set(ref _dialogResult, value);
-        }
-
-        public RelayCommand ShowTextCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(ShowText)).Value;
-
-        private void ShowText()
-        {
-            Dialog.Show(new TextDialog());
-        }
-
-        public RelayCommand ShowInteractiveDialogCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(async () => await ShowInteractiveDialog())).Value;
-
-        private async Task ShowInteractiveDialog()
-        {
-            DialogResult = await Dialog.Show<InteractiveDialog>()
-                .Initialize<InteractiveDialogViewModel>(vm => vm.Message = DialogResult)
-                .GetResultAsync<string>();
-        }
-    }
-}

src/Net_GE45/HandyControlDemo_Net_GE45/ViewModel/Controls/GrowlDemoViewModel.cs

@@ -1,66 +0,0 @@
-using System;
-using GalaSoft.MvvmLight.CommandWpf;
-using HandyControl.Controls;
-using HandyControl.Data;
-using HandyControlDemo.Window;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class GrowlDemoViewModel
-    {
-        private readonly string _token;
-
-        public GrowlDemoViewModel()
-        {
-            
-        }
-
-        public GrowlDemoViewModel(string token)
-        {
-            _token = token;
-        }
-
-        public RelayCommand InfoCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() => Growl.Info(Properties.Langs.Lang.GrowlInfo, _token))).Value;
-
-        public RelayCommand SuccessCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() => Growl.Success(Properties.Langs.Lang.GrowlSuccess, _token))).Value;
-
-        public RelayCommand WarningCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() => Growl.Warning(new GrowlInfo
-            {
-                Message = Properties.Langs.Lang.GrowlWarning,
-                CancelStr = Properties.Langs.Lang.Ignore,
-                ActionBeforeClose = isConfirmed =>
-                {
-                    Growl.Info(isConfirmed.ToString());
-                    return true;
-                },
-                Token = _token
-            }))).Value;
-
-        public RelayCommand ErrorCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() => Growl.Error(Properties.Langs.Lang.GrowlError, _token))).Value;
-
-        public RelayCommand AskCmd => new Lazy<RelayCommand>(() => 
-            new RelayCommand(() => Growl.Ask(Properties.Langs.Lang.GrowlAsk, isConfirmed =>
-            {
-                Growl.Info(isConfirmed.ToString());
-                return true;
-            }, _token))).Value;
-
-        public RelayCommand FatalCmd => new Lazy<RelayCommand>(() => 
-            new RelayCommand(() => Growl.Fatal(new GrowlInfo
-            {
-                Message = Properties.Langs.Lang.GrowlFatal,
-                ShowDateTime = false,
-                Token = _token
-            }))).Value;
-
-        public RelayCommand ClearCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() => Growl.Clear(_token))).Value;
-
-        public RelayCommand NewWindowCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() => new GrowlDemoWindow().Show())).Value;
-    }
-}

src/Net_GE45/HandyControlDemo_Net_GE45/ViewModel/Controls/ImageBrowserDemoViewModel.cs

@@ -1,13 +0,0 @@
-using System;
-using GalaSoft.MvvmLight.CommandWpf;
-using HandyControl.Controls;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class ImageBrowserDemoViewModel
-    {
-        public RelayCommand OpenImgCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() =>
-                new ImageBrowser(new Uri("pack://application:,,,/Resources/Img/1.jpg")).Show())).Value;
-    }
-}

src/Net_GE45/HandyControlDemo_Net_GE45/ViewModel/Controls/NotifyIconDemoViewModel.cs

@@ -1,54 +0,0 @@
-using System;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.CommandWpf;
-using HandyControl.Controls;
-using HandyControlDemo.Data;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class NotifyIconDemoViewModel : ViewModelBase
-    {
-        private bool _contextMenuIsShow;
-
-        public bool ContextMenuIsShow
-        {
-            get => _contextMenuIsShow;
-            set
-            {
-                Set(ref _contextMenuIsShow, value);
-                GlobalData.NotifyIconIsShow = ContextMenuIsShow || ContextContentIsShow;
-            }
-        }
-
-        private bool _contextMenuIsBlink;
-
-        public bool ContextMenuIsBlink
-        {
-            get => _contextMenuIsBlink;
-            set => Set(ref _contextMenuIsBlink, value);
-        }
-
-        private bool _contextContentIsShow;
-
-        public bool ContextContentIsShow
-        {
-            get => _contextContentIsShow;
-            set
-            {
-                Set(ref _contextContentIsShow, value);
-                GlobalData.NotifyIconIsShow = ContextMenuIsShow || ContextContentIsShow;
-            }
-        }
-
-        private bool _contextContentIsBlink;
-
-        public bool ContextContentIsBlink
-        {
-            get => _contextContentIsBlink;
-            set => Set(ref _contextContentIsBlink, value);
-        }
-
-        public RelayCommand<object> MouseCmd => new Lazy<RelayCommand<object>>(() =>
-            new RelayCommand<object>(str=> Growl.Info(str.ToString()))).Value;
-    }
-}

src/Net_GE45/HandyControlDemo_Net_GE45/ViewModel/Controls/PaginationDemoViewModel.cs

@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using GalaSoft.MvvmLight.CommandWpf;
-using HandyControl.Data;
-using HandyControlDemo.Data;
-using HandyControlDemo.Service;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class PaginationDemoViewModel : DemoViewModelBase<DemoDataModel>
-    {
-        /// <summary>
-        ///     所有数据
-        /// </summary>
-        private readonly List<DemoDataModel> _totalDataList;
-
-        /// <summary>
-        ///     页码
-        /// </summary>
-        private int _pageIndex = 1;
-
-        /// <summary>
-        ///     页码
-        /// </summary>
-        public int PageIndex
-        {
-            get => _pageIndex;
-            set => Set(ref _pageIndex, value);
-        }
-
-        public PaginationDemoViewModel(DataService dataService)
-        {
-            _totalDataList = dataService.GetDemoDataList(100);
-            DataList = _totalDataList.Take(10).ToList();
-        }
-
-        /// <summary>
-        ///     页码改变命令
-        /// </summary>
-        public RelayCommand<FunctionEventArgs<int>> PageUpdatedCmd =>
-            new Lazy<RelayCommand<FunctionEventArgs<int>>>(() =>
-                new RelayCommand<FunctionEventArgs<int>>(PageUpdated)).Value;
-
-        /// <summary>
-        ///     页码改变
-        /// </summary>
-        private void PageUpdated(FunctionEventArgs<int> info)
-        {
-            DataList = _totalDataList.Skip((info.Info - 1) * 10).Take(10).ToList();
-        }
-    }
-}

src/Net_GE45/HandyControlDemo_Net_GE45/ViewModel/Controls/SearchBarDemoViewModel.cs

@@ -1,18 +0,0 @@
-using System;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.CommandWpf;
-using HandyControl.Controls;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class SearchBarDemoViewModel : ViewModelBase
-    {
-        public RelayCommand<string> SearchCmd => new Lazy<RelayCommand<string>>(() =>
-            new RelayCommand<string>(Search)).Value;
-
-        private void Search(string key)
-        {
-            Growl.Info(key);
-        }
-    }
-}

src/Net_GE45/HandyControlDemo_Net_GE45/ViewModel/Controls/StepBarDemoViewModel.cs

@@ -1,41 +0,0 @@
-using System;
-using System.Linq;
-using System.Windows.Controls;
-using GalaSoft.MvvmLight.CommandWpf;
-using HandyControl.Controls;
-using HandyControlDemo.Data;
-using HandyControlDemo.Service;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class StepBarDemoViewModel : DemoViewModelBase<StepBarDemoModel>
-    {
-        public StepBarDemoViewModel(DataService dataService) => DataList = dataService.GetStepBarDemoDataList();
-
-        /// <summary>
-        ///     下一步
-        /// </summary>
-        public RelayCommand<Panel> NextCmd => new Lazy<RelayCommand<Panel>>(() => new RelayCommand<Panel>(Next)).Value;
-
-        /// <summary>
-        ///     上一步
-        /// </summary>
-        public RelayCommand<Panel> PrevCmd => new Lazy<RelayCommand<Panel>>(() => new RelayCommand<Panel>(Prev)).Value;
-
-        private void Next(Panel panel)
-        {
-            foreach (var stepBar in panel.Children.OfType<StepBar>())
-            {
-                stepBar.Next();
-            }
-        }
-
-        private void Prev(Panel panel)
-        {
-            foreach (var stepBar in panel.Children.OfType<StepBar>())
-            {
-                stepBar.Prev();
-            }
-        }
-    }
-}

src/Net_GE45/HandyControlDemo_Net_GE45/ViewModel/Controls/WindowDemoViewModel.cs

@@ -1,21 +0,0 @@
-using System;
-using System.Windows;
-using GalaSoft.MvvmLight.CommandWpf;
-using HandyControlDemo.Tools;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class WindowDemoViewModel
-    {
-        public RelayCommand<string> OpenWindowCmd => new Lazy<RelayCommand<string>>(() => new RelayCommand<string>(OpenWindow)).Value;
-
-        private void OpenWindow(string windowTag)
-        {
-            if (AssemblyHelper.CreateInternalInstance($"Window.{windowTag}") is System.Windows.Window window)
-            {
-                window.Owner = Application.Current.MainWindow;
-                window.ShowDialog();
-            }
-        }
-    }
-}

src/Net_GE45/HandyControlDemo_Net_GE45/ViewModel/DemoViewModelBase!1.cs

@@ -1,22 +0,0 @@
-using System.Collections.Generic;
-using GalaSoft.MvvmLight;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class DemoViewModelBase<T> : ViewModelBase
-    {
-        /// <summary>
-        ///     数据列表
-        /// </summary>
-        private IList<T> _dataList;
-
-        /// <summary>
-        ///     数据列表
-        /// </summary>
-        public IList<T> DataList
-        {
-            get => _dataList;
-            set => Set(ref _dataList, value);
-        }
-    }
-}

src/Net_GE45/HandyControlDemo_Net_GE45/ViewModel/Main/ContributorsViewModel.cs

@@ -1,17 +0,0 @@
-using System.Threading.Tasks;
-using HandyControlDemo.Data;
-using HandyControlDemo.Service;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class ContributorsViewModel : DemoViewModelBase<ContributorModel>
-    {
-        public ContributorsViewModel(DataService dataService)
-        {
-            Task.Run(() =>
-            {
-                DataList = dataService.GetContributorDataList();
-            });
-        }
-    }
-}

src/Net_GE45/HandyControlDemo_Net_GE45/ViewModel/Main/MainViewModel.cs

@@ -1,113 +0,0 @@
-using System;
-using System.Windows.Controls;
-using GalaSoft.MvvmLight.CommandWpf;
-using GalaSoft.MvvmLight.Messaging;
-using HandyControlDemo.Data;
-using HandyControlDemo.Service;
-using HandyControlDemo.Tools;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class MainViewModel : DemoViewModelBase<DemoDataModel>
-    {
-        #region 字段
-
-        /// <summary>
-        ///     内容标题
-        /// </summary>
-        private object _contentTitle;
-
-        /// <summary>
-        ///     子内容
-        /// </summary>
-        private object _subContent;
-
-        /// <summary>
-        ///     当前选中的列表项
-        /// </summary>
-        private ListBoxItem _listBoxItemCurrent;
-
-        #endregion
-
-        public MainViewModel(DataService dataService)
-        {
-            Messenger.Default.Register<object>(this, MessageToken.LoadShowContent, obj =>
-            {
-                if (SubContent is IDisposable disposable)
-                {
-                    disposable.Dispose();
-                }
-                SubContent = obj;
-            });
-            Messenger.Default.Register<object>(this, MessageToken.ClearLeftSelected, obj =>
-            {
-                if (_listBoxItemCurrent == null) return;
-                _listBoxItemCurrent.IsSelected = false;
-                _listBoxItemCurrent = null;
-            });
-            DataList = dataService.GetDemoDataList();
-        }
-
-        #region 属性
-
-        /// <summary>
-        ///     子内容
-        /// </summary>
-        public object SubContent
-        {
-            get => _subContent;
-            set => Set(ref _subContent, value);
-        }
-
-        /// <summary>
-        ///     内容标题
-        /// </summary>
-        public object ContentTitle
-        {
-            get => _contentTitle;
-            set => Set(ref _contentTitle, value);
-        }
-
-        #endregion
-
-        #region 命令
-
-        /// <summary>
-        ///     切换例子命令
-        /// </summary>
-        public RelayCommand<SelectionChangedEventArgs> SwitchDemoCmd =>
-            new Lazy<RelayCommand<SelectionChangedEventArgs>>(() =>
-                new RelayCommand<SelectionChangedEventArgs>(SwitchDemo)).Value;
-
-        #endregion
-
-        #region 方法
-
-        /// <summary>
-        ///     切换例子
-        /// </summary>
-        private void SwitchDemo(SelectionChangedEventArgs e)
-        {
-            if (e.AddedItems.Count == 0) return;
-            if (e.AddedItems[0] is ListBoxItem item)
-            {
-                if (item.Tag is string tag)
-                {
-                    if (Equals(_listBoxItemCurrent, item)) return;
-                    _listBoxItemCurrent = item;
-                    ContentTitle = item.Content;
-                    Messenger.Default.Send(false, MessageToken.FullSwitch);
-                    Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{tag}"), MessageToken.LoadShowContent);
-                }
-                else
-                {
-                    _listBoxItemCurrent = null;
-                    ContentTitle = null;
-                    SubContent = null;
-                }
-            }
-        }
-
-        #endregion
-    }
-}

src/Net_GE45/HandyControlDemo_Net_GE45/ViewModel/ViewModelLocator.cs

@@ -1,76 +0,0 @@
-using System;
-using System.Windows;
-using CommonServiceLocator;
-using GalaSoft.MvvmLight.Ioc;
-using HandyControlDemo.Data;
-using HandyControlDemo.Service;
-using HandyControlDemo.ViewModel.Basic;
-using HandyControlDemo.ViewModel.Controls;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class ViewModelLocator
-    {
-        public ViewModelLocator()
-        {
-            ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);
-
-            SimpleIoc.Default.Register<DataService>();
-
-            SimpleIoc.Default.Register<MainViewModel>();
-            SimpleIoc.Default.Register(() => new GrowlDemoViewModel(), "GrowlDemo");
-            SimpleIoc.Default.Register(() => new GrowlDemoViewModel(MessageToken.GrowlDemoPanel), "GrowlDemoWithToken");
-            SimpleIoc.Default.Register<ImageBrowserDemoViewModel>();
-            SimpleIoc.Default.Register<ComboBoxDemoViewModel>();
-            SimpleIoc.Default.Register<WindowDemoViewModel>();
-            SimpleIoc.Default.Register<ContributorsViewModel>();
-            SimpleIoc.Default.Register<StepBarDemoViewModel>();
-            SimpleIoc.Default.Register<PaginationDemoViewModel>();
-            SimpleIoc.Default.Register<ChatBoxViewModel>();
-            SimpleIoc.Default.Register<CoverViewModel>();
-            SimpleIoc.Default.Register<DialogDemoViewModel>();
-            SimpleIoc.Default.Register<SearchBarDemoViewModel>();
-            SimpleIoc.Default.Register<NotifyIconDemoViewModel>();
-            SimpleIoc.Default.Register<InteractiveDialogViewModel>();
-            SimpleIoc.Default.Register<BadgeDemoViewModel>();
-        }
-
-        public static ViewModelLocator Instance => new Lazy<ViewModelLocator>(() =>
-            Application.Current.TryFindResource("Locator") as ViewModelLocator).Value;
-
-        #region Vm
-
-        public MainViewModel Main => ServiceLocator.Current.GetInstance<MainViewModel>();
-
-        public GrowlDemoViewModel GrowlDemo => ServiceLocator.Current.GetInstance<GrowlDemoViewModel>("GrowlDemo");
-
-        public GrowlDemoViewModel GrowlDemoWithToken => ServiceLocator.Current.GetInstance<GrowlDemoViewModel>("GrowlDemoWithToken");
-
-        public ImageBrowserDemoViewModel ImageBrowserDemo => ServiceLocator.Current.GetInstance<ImageBrowserDemoViewModel>();
-
-        public ComboBoxDemoViewModel ComboBoxDemo => ServiceLocator.Current.GetInstance<ComboBoxDemoViewModel>();
-
-        public WindowDemoViewModel WindowDemo => ServiceLocator.Current.GetInstance<WindowDemoViewModel>();
-
-        public ContributorsViewModel ContributorsView => ServiceLocator.Current.GetInstance<ContributorsViewModel>();
-
-        public StepBarDemoViewModel StepBarDemo => ServiceLocator.Current.GetInstance<StepBarDemoViewModel>();
-
-        public PaginationDemoViewModel PaginationDemo => ServiceLocator.Current.GetInstance<PaginationDemoViewModel>();
-
-        public ChatBoxViewModel ChatBox => new ChatBoxViewModel();
-
-        public CoverViewModel CoverView => ServiceLocator.Current.GetInstance<CoverViewModel>();
-
-        public DialogDemoViewModel DialogDemo => ServiceLocator.Current.GetInstance<DialogDemoViewModel>();
-
-        public SearchBarDemoViewModel SearchBarDemo => ServiceLocator.Current.GetInstance<SearchBarDemoViewModel>();
-
-        public NotifyIconDemoViewModel NotifyIconDemo => ServiceLocator.Current.GetInstance<NotifyIconDemoViewModel>();
-
-        public InteractiveDialogViewModel InteractiveDialog => ServiceLocator.Current.GetInstance<InteractiveDialogViewModel>();
-
-        public BadgeDemoViewModel BadgeDemo => ServiceLocator.Current.GetInstance<BadgeDemoViewModel>();
-        #endregion
-    }
-}

src/Net_GE45/HandyControl_Net_GE45/Controls/Other/Growl.cs

@@ -1,601 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Threading;
-using HandyControl.Data;
-using HandyControl.Interactivity;
-using HandyControl.Tools;
-using HandyControl.Tools.Extension;
-
-namespace HandyControl.Controls
-{
-    /// <summary>
-    ///     消息提醒
-    /// </summary>
-    [TemplatePart(Name = ElementPanelMore, Type = typeof(Panel))]
-    [TemplatePart(Name = ElementGridMain, Type = typeof(Grid))]
-    [TemplatePart(Name = ElementButtonClose, Type = typeof(Button))]
-    public class Growl : Control
-    {
-        #region Constants
-
-        private const string ElementPanelMore = "PART_PanelMore";
-        private const string ElementGridMain = "PART_GridMain";
-        private const string ElementButtonClose = "PART_ButtonClose";
-
-        #endregion Constants
-
-        #region Data
-
-        private Panel _panelMore;
-
-        private Grid _gridMain;
-
-        private Button _buttonClose;
-
-        private bool _showCloseButton;
-
-        private bool _staysOpen;
-
-        private int _waitTime = 6;
-
-        /// <summary>
-        ///     计数
-        /// </summary>
-        private int _tickCount;
-
-        /// <summary>
-        ///     关闭计时器
-        /// </summary>
-        private DispatcherTimer _timerClose;
-
-        private static readonly Dictionary<string, Panel> PanelDic = new Dictionary<string, Panel>();
-
-        #endregion Data
-
-        public Growl()
-        {
-            CommandBindings.Add(new CommandBinding(ControlCommands.Close, ButtonClose_OnClick));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Cancel, ButtonCancel_OnClick));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Confirm, ButtonOk_OnClick));
-        }
-
-        public static void Register(string token, Panel panel)
-        {
-            if (string.IsNullOrEmpty(token) || panel == null) return;
-            PanelDic[token] = panel;
-            InitGrowlPanel(panel);
-        }
-
-        public static void Unregister(string token, Panel panel)
-        {
-            if (string.IsNullOrEmpty(token) || panel == null) return;
-
-            if (PanelDic.ContainsKey(token))
-            {
-                if (ReferenceEquals(PanelDic[token], panel))
-                {
-                    PanelDic.Remove(token);
-                    panel.ContextMenu = null;
-                    panel.SetCurrentValue(PanelElement.FluidMoveBehaviorProperty, DependencyProperty.UnsetValue);
-                }
-            }
-        }
-
-        public static void Unregister(Panel panel)
-        {
-            if (panel == null) return;
-            var first = PanelDic.FirstOrDefault(item => ReferenceEquals(panel, item.Value));
-            if (!string.IsNullOrEmpty(first.Key))
-            {
-                PanelDic.Remove(first.Key);
-                panel.ContextMenu = null;
-                panel.SetCurrentValue(PanelElement.FluidMoveBehaviorProperty, DependencyProperty.UnsetValue);
-            }
-        }
-
-        protected override void OnMouseEnter(MouseEventArgs e)
-        {
-            base.OnMouseEnter(e);
-
-            _buttonClose.Show(_showCloseButton);
-        }
-
-        protected override void OnMouseLeave(MouseEventArgs e)
-        {
-            base.OnMouseLeave(e);
-
-            _buttonClose.Collapse();
-        }
-
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-
-            _panelMore = GetTemplateChild(ElementPanelMore) as Panel;
-            _gridMain = GetTemplateChild(ElementGridMain) as Grid;
-            _buttonClose = GetTemplateChild(ElementButtonClose) as Button;
-
-            CheckNull();
-            Update();
-        }
-
-        private void CheckNull()
-        {
-            if (_panelMore == null || _gridMain == null || _buttonClose == null) throw new Exception();
-        }
-
-        private Func<bool, bool> ActionBeforeClose { get; set; }
-
-        /// <summary>
-        ///     消息容器
-        /// </summary>
-        public static Panel GrowlPanel { get; set; }
-
-        internal static readonly DependencyProperty CancelStrProperty = DependencyProperty.Register(
-            "CancelStr", typeof(string), typeof(Growl), new PropertyMetadata(default(string)));
-
-        internal static readonly DependencyProperty ConfirmStrProperty = DependencyProperty.Register(
-            "ConfirmStr", typeof(string), typeof(Growl), new PropertyMetadata(default(string)));
-
-        public static readonly DependencyProperty ShowDateTimeProperty = DependencyProperty.Register(
-            "ShowDateTime", typeof(bool), typeof(Growl), new PropertyMetadata(ValueBoxes.TrueBox));
-
-        public static readonly DependencyProperty MessageProperty = DependencyProperty.Register(
-            "Message", typeof(string), typeof(Growl), new PropertyMetadata(default(string)));
-
-        public static readonly DependencyProperty TimeProperty = DependencyProperty.Register(
-            "Time", typeof(DateTime), typeof(Growl), new PropertyMetadata(default(DateTime)));
-
-        public static readonly DependencyProperty IconProperty = DependencyProperty.Register(
-            "Icon", typeof(Geometry), typeof(Growl), new PropertyMetadata(default(Geometry)));
-
-        public static readonly DependencyProperty IconBrushProperty = DependencyProperty.Register(
-            "IconBrush", typeof(Brush), typeof(Growl), new PropertyMetadata(default(Brush)));
-
-        public static readonly DependencyProperty TypeProperty = DependencyProperty.Register(
-            "Type", typeof(InfoType), typeof(Growl), new PropertyMetadata(default(InfoType)));
-
-        public static readonly DependencyProperty GrowlParentProperty = DependencyProperty.RegisterAttached(
-            "GrowlParent", typeof(bool), typeof(Growl), new PropertyMetadata(ValueBoxes.FalseBox, (o, args) =>
-            {
-                if ((bool)args.NewValue && o is Panel panel)
-                {
-                    SetGrowlPanel(panel);
-                }
-            }));
-
-        public static readonly DependencyProperty TokenProperty = DependencyProperty.RegisterAttached(
-            "Token", typeof(string), typeof(Growl), new PropertyMetadata(default(string), OnTokenChanged));
-
-        private static void OnTokenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is Panel panel)
-            {
-                if (e.NewValue == null)
-                {
-                    Unregister(panel);
-                }
-                else
-                {
-                    Register(e.NewValue.ToString(), panel);
-                }
-            }
-        }
-
-        public static void SetToken(DependencyObject element, string value)
-            => element.SetValue(TokenProperty, value);
-
-        public static string GetToken(DependencyObject element)
-            => (string) element.GetValue(TokenProperty);
-
-        public static void SetGrowlParent(DependencyObject element, bool value) => element.SetValue(GrowlParentProperty, value);
-
-        public static bool GetGrowlParent(DependencyObject element) => (bool)element.GetValue(GrowlParentProperty);
-
-        public InfoType Type
-        {
-            get => (InfoType)GetValue(TypeProperty);
-            set => SetValue(TypeProperty, value);
-        }
-
-        internal string CancelStr
-        {
-            get => (string)GetValue(CancelStrProperty);
-            set => SetValue(CancelStrProperty, value);
-        }
-
-        internal string ConfirmStr
-        {
-            get => (string)GetValue(ConfirmStrProperty);
-            set => SetValue(ConfirmStrProperty, value);
-        }
-
-        public bool ShowDateTime
-        {
-            get => (bool)GetValue(ShowDateTimeProperty);
-            set => SetValue(ShowDateTimeProperty, value);
-        }
-
-        public string Message
-        {
-            get => (string)GetValue(MessageProperty);
-            set => SetValue(MessageProperty, value);
-        }
-
-        public DateTime Time
-        {
-            get => (DateTime)GetValue(TimeProperty);
-            set => SetValue(TimeProperty, value);
-        }
-
-        public Geometry Icon
-        {
-            get => (Geometry)GetValue(IconProperty);
-            set => SetValue(IconProperty, value);
-        }
-
-        public Brush IconBrush
-        {
-            get => (Brush)GetValue(IconBrushProperty);
-            set => SetValue(IconBrushProperty, value);
-        }
-
-        /// <summary>
-        ///     开始计时器
-        /// </summary>
-        private void StartTimer()
-        {
-            _timerClose = new DispatcherTimer
-            {
-                Interval = TimeSpan.FromSeconds(1)
-            };
-            _timerClose.Tick += delegate
-            {
-                if (IsMouseOver)
-                {
-                    _tickCount = 0;
-                    return;
-                }
-
-                _tickCount++;
-                if (_tickCount >= _waitTime) Close();
-            };
-            _timerClose.Start();
-        }
-
-        /// <summary>
-        ///     消息容器
-        /// </summary>
-        /// <param name="panel"></param>
-        private static void SetGrowlPanel(Panel panel)
-        {
-            GrowlPanel = panel;
-            InitGrowlPanel(panel);
-        }
-
-        private static void InitGrowlPanel(Panel panel)
-        {
-            var menuItem = new MenuItem
-            {
-                Header = Properties.Langs.Lang.Clear
-            };
-            menuItem.Click += (s, e) =>
-            {
-                foreach (var item in panel.Children.OfType<Growl>())
-                {
-                    item.Close();
-                }
-            };
-            panel.ContextMenu = new ContextMenu
-            {
-                Items =
-                {
-                    menuItem
-                }
-            };
-
-            PanelElement.SetFluidMoveBehavior(panel, ResourceHelper.GetResource<FluidMoveBehavior>(ResourceToken.BehaviorXY400));
-        }
-
-        private void Update()
-        {
-            if (ActionBeforeClose != null)
-            {
-                _staysOpen = true;
-                _showCloseButton = false;
-                _panelMore.IsEnabled = true;
-                _panelMore.Show();
-            }
-
-            var transform = new TranslateTransform
-            {
-                X = MaxWidth
-            };
-            _gridMain.RenderTransform = transform;
-            transform.BeginAnimation(TranslateTransform.XProperty, AnimationHelper.CreateAnimation(0));
-            if (!_staysOpen) StartTimer();
-        }
-
-        /// <summary>
-        ///     显示信息
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        private static void Show(GrowlInfo growlInfo)
-        {
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                var ctl = new Growl
-                {
-                    Message = growlInfo.Message,
-                    Time = DateTime.Now,
-                    Icon = ResourceHelper.GetResource<Geometry>(growlInfo.IconKey),
-                    IconBrush = ResourceHelper.GetResource<Brush>(growlInfo.IconBrushKey),
-                    _showCloseButton = growlInfo.ShowCloseButton,
-                    ActionBeforeClose = growlInfo.ActionBeforeClose,
-                    _staysOpen = growlInfo.StaysOpen,
-                    ShowDateTime = growlInfo.ShowDateTime,
-                    ConfirmStr = growlInfo.ConfirmStr,
-                    CancelStr = growlInfo.CancelStr,
-                    Type = growlInfo.Type,
-                    _waitTime = Math.Max(growlInfo.WaitTime, 2)
-                };
-                if (!string.IsNullOrEmpty(growlInfo.Token))
-                {
-                    if (PanelDic.TryGetValue(growlInfo.Token, out var panel))
-                    {
-                        panel?.Children.Insert(0, ctl);
-                    }
-                }
-                else
-                {
-                    GrowlPanel.Children.Insert(0, ctl);
-                }
-            });
-        }
-
-        /// <summary>
-        ///     成功
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="token"></param>
-        public static void Success(string message, string token = "") => Success(new GrowlInfo
-        {
-            Message = message,
-            Token = token
-        });
-
-        /// <summary>
-        ///     成功
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void Success(GrowlInfo growlInfo)
-        {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.SuccessGeometry;
-                growlInfo.IconBrushKey = ResourceToken.SuccessBrush;
-                growlInfo.Type = InfoType.Success;
-            }
-            Show(growlInfo);
-        }
-
-        /// <summary>
-        ///     消息
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="token"></param>
-        public static void Info(string message, string token = "") => Info(new GrowlInfo
-        {
-            Message = message,
-            Token = token
-        });
-
-        /// <summary>
-        ///     消息
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void Info(GrowlInfo growlInfo)
-        {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.InfoGeometry;
-                growlInfo.IconBrushKey = ResourceToken.InfoBrush;
-                growlInfo.Type = InfoType.Info;
-            }
-            Show(growlInfo);
-        }
-
-        /// <summary>
-        ///     警告
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="token"></param>
-        public static void Warning(string message, string token = "") => Warning(new GrowlInfo
-        {
-            Message = message,
-            Token = token
-        });
-
-        /// <summary>
-        ///     警告
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void Warning(GrowlInfo growlInfo)
-        {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.WarningGeometry;
-                growlInfo.IconBrushKey = ResourceToken.WarningBrush;
-                growlInfo.Type = InfoType.Warning;
-            }
-            Show(growlInfo);
-        }
-
-        /// <summary>
-        ///     错误
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="token"></param>
-        public static void Error(string message, string token = "") => Error(new GrowlInfo
-        {
-            Message = message,
-            Token = token
-        });
-
-        /// <summary>
-        ///     错误
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void Error(GrowlInfo growlInfo)
-        {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.ErrorGeometry;
-                growlInfo.IconBrushKey = ResourceToken.DangerBrush;
-                growlInfo.StaysOpen = true;
-                growlInfo.Type = InfoType.Error;
-            }
-            Show(growlInfo);
-        }
-
-        /// <summary>
-        ///     严重
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="token"></param>
-        public static void Fatal(string message, string token = "") => Fatal(new GrowlInfo
-        {
-            Message = message,
-            Token = token
-        });
-
-        /// <summary>
-        ///     严重
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void Fatal(GrowlInfo growlInfo)
-        {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.FatalGeometry;
-                growlInfo.IconBrushKey = ResourceToken.PrimaryTextBrush;
-                growlInfo.StaysOpen = true;
-                growlInfo.ShowCloseButton = false;
-                growlInfo.Type = InfoType.Fatal;
-                if (GrowlPanel.ContextMenu != null) GrowlPanel.ContextMenu.Opacity = 0;
-            }
-            Show(growlInfo);
-        }
-
-        /// <summary>
-        ///     询问
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="actionBeforeClose"></param>
-        /// <param name="token"></param>
-        public static void Ask(string message, Func<bool, bool> actionBeforeClose, string token = "") => Ask(new GrowlInfo
-        {
-            Message = message,
-            ActionBeforeClose = actionBeforeClose,
-            Token = token
-        });
-
-        /// <summary>
-        ///     询问
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void Ask(GrowlInfo growlInfo)
-        {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            if (!growlInfo.IsCustom)
-            {
-                growlInfo.IconKey = ResourceToken.AskGeometry;
-                growlInfo.IconBrushKey = ResourceToken.AccentBrush;
-                growlInfo.StaysOpen = true;
-                growlInfo.ShowCloseButton = false;
-                growlInfo.Type = InfoType.Ask;
-            }
-            Show(growlInfo);
-        }
-
-        private void ButtonClose_OnClick(object sender, RoutedEventArgs e) => Close();
-
-        /// <summary>
-        ///     关闭
-        /// </summary>
-        private void Close()
-        {
-            _timerClose?.Stop();
-            var transform = new TranslateTransform();
-            _gridMain.RenderTransform = transform;
-            var animation = AnimationHelper.CreateAnimation(MaxWidth);
-            animation.Completed += (s, e) =>
-            {
-                if (Parent is Panel panel)
-                {
-                    panel.Children.Remove(this);
-                }
-            };
-            transform.BeginAnimation(TranslateTransform.XProperty, animation);
-        }
-
-        /// <summary>
-        ///     清除
-        /// </summary>
-        /// <param name="token"></param>
-        public static void Clear(string token = "")
-        {
-            if (!string.IsNullOrEmpty(token))
-            {
-                if (PanelDic.TryGetValue(token, out var panel))
-                {
-                    Clear(panel);
-                }
-            }
-            else
-            {
-                Clear(GrowlPanel);
-            }
-        }
-
-        /// <summary>
-        ///     清除
-        /// </summary>
-        /// <param name="panel"></param>
-        private static void Clear(Panel panel)
-        {
-            panel.Children.Clear();
-            if (panel.ContextMenu != null)
-            {
-                panel.ContextMenu.IsOpen = false;
-                panel.ContextMenu.Opacity = 1;
-            }
-        }
-
-        private void ButtonCancel_OnClick(object sender, RoutedEventArgs e)
-        {
-            if (ActionBeforeClose?.Invoke(false) == true)
-            {
-                Close();
-            }
-        }
-
-        private void ButtonOk_OnClick(object sender, RoutedEventArgs e)
-        {
-            if (ActionBeforeClose?.Invoke(true) == true)
-            {
-                Close();
-            }
-        }
-    }
-}

src/Net_GE45/HandyControl_Net_GE45/Controls/Window/MessageBox.cs

@@ -1,436 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Text;
-using System.Windows;
-using System.Windows.Input;
-using System.Windows.Media;
-using HandyControl.Data;
-using HandyControl.Interactivity;
-using HandyControl.Tools;
-
-namespace HandyControl.Controls
-{
-    /// <summary>
-    ///     消息框
-    /// </summary>
-    public sealed class MessageBox : Window
-    {
-        private MessageBoxResult _messageBoxResult = MessageBoxResult.Cancel;
-
-        private bool _showOk;
-
-        private bool _showCancel;
-
-        private bool _showYes;
-
-        private bool _showNo;
-
-        public static readonly DependencyProperty MessageProperty = DependencyProperty.Register(
-            "Message", typeof(string), typeof(MessageBox), new PropertyMetadata(default(string)));
-
-        public string Message
-        {
-            get => (string) GetValue(MessageProperty);
-            set => SetValue(MessageProperty, value);
-        }
-
-        public static readonly DependencyProperty ImageProperty = DependencyProperty.Register(
-            "Image", typeof(Geometry), typeof(MessageBox), new PropertyMetadata(default(Geometry)));
-
-        public Geometry Image
-        {
-            get => (Geometry) GetValue(ImageProperty);
-            set => SetValue(ImageProperty, value);
-        }
-
-        public static readonly DependencyProperty ImageBrushProperty = DependencyProperty.Register(
-            "ImageBrush", typeof(Brush), typeof(MessageBox), new PropertyMetadata(default(Brush)));
-
-        public Brush ImageBrush
-        {
-            get => (Brush) GetValue(ImageBrushProperty);
-            set => SetValue(ImageBrushProperty, value);
-        }
-
-        public static readonly DependencyProperty ShowImageProperty = DependencyProperty.Register(
-            "ShowImage", typeof(bool), typeof(MessageBox), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool ShowImage
-        {
-            get => (bool) GetValue(ShowImageProperty);
-            set => SetValue(ShowImageProperty, value);
-        }
-
-        private MessageBox()
-        {
-            CommandBindings.Add(new CommandBinding(ControlCommands.Confirm, (s, e) =>
-            {
-                _messageBoxResult = MessageBoxResult.OK;
-                Close();
-            }, (s, e) => e.CanExecute = _showOk));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Cancel, (s, e) =>
-            {
-                _messageBoxResult = MessageBoxResult.Cancel;
-                Close();
-            }, (s, e) => e.CanExecute = _showCancel));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Yes, (s, e) =>
-            {
-                _messageBoxResult = MessageBoxResult.Yes;
-                Close();
-            }, (s, e) => e.CanExecute = _showYes));
-            CommandBindings.Add(new CommandBinding(ControlCommands.No, (s, e) =>
-            {
-                _messageBoxResult = MessageBoxResult.No;
-                Close();
-            }, (s, e) => e.CanExecute = _showNo));
-        }
-
-        protected override void OnPreviewKeyDown(KeyEventArgs e)
-        {
-            base.OnPreviewKeyDown(e);
-
-            if (e.KeyboardDevice.Modifiers == ModifierKeys.Control && e.Key == Key.C)
-            {
-                var builder = new StringBuilder();
-                var line = new string('-', 27);
-                builder.Append(line);
-                builder.Append(Environment.NewLine);
-                builder.Append(Title);
-                builder.Append(Environment.NewLine);
-                builder.Append(line);
-                builder.Append(Environment.NewLine);
-                builder.Append(Message);
-                builder.Append(Environment.NewLine);
-                builder.Append(line);
-                builder.Append(Environment.NewLine);
-                if (_showOk)
-                {
-                    builder.Append(Properties.Langs.Lang.Confirm);
-                    builder.Append("   ");
-                }
-                if (_showYes)
-                {
-                    builder.Append(Properties.Langs.Lang.Yes);
-                    builder.Append("   ");
-                }
-                if (_showNo)
-                {
-                    builder.Append(Properties.Langs.Lang.No);
-                    builder.Append("   ");
-                }
-                if (_showCancel)
-                {
-                    builder.Append(Properties.Langs.Lang.Cancel);
-                    builder.Append("   ");
-                }
-                builder.Append(Environment.NewLine);
-                builder.Append(line);
-                builder.Append(Environment.NewLine);
-                Clipboard.SetText(builder.ToString());
-            }
-        }
-
-        /// <summary>
-        ///     成功
-        /// </summary>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        public static MessageBoxResult Success(string messageBoxText, string caption = null)
-        {
-            MessageBox messageBox = null;
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                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();
-            });
-
-            return messageBox._messageBoxResult;
-        }
-
-        /// <summary>
-        ///     消息
-        /// </summary>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        public static MessageBoxResult Info(string messageBoxText, string caption = null)
-        {
-            MessageBox messageBox = null;
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK);
-                SetButtonStatus(messageBox, MessageBoxButton.OK);
-                SetImage(messageBox, MessageBoxImage.Information);
-                messageBox.ShowDialog();
-            });
-
-            return messageBox._messageBoxResult;
-        }
-
-        /// <summary>
-        ///     警告
-        /// </summary>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        public static MessageBoxResult Warning(string messageBoxText, string caption = null)
-        {
-            MessageBox messageBox = null;
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Warning, MessageBoxResult.OK);
-                SetButtonStatus(messageBox, MessageBoxButton.OK);
-                SetImage(messageBox, MessageBoxImage.Warning);
-                messageBox.ShowDialog();
-            });
-
-            return messageBox._messageBoxResult;
-        }
-
-        /// <summary>
-        ///     错误
-        /// </summary>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        public static MessageBoxResult Error(string messageBoxText, string caption = null)
-        {
-            MessageBox messageBox = null;
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK);
-                SetButtonStatus(messageBox, MessageBoxButton.OK);
-                SetImage(messageBox, MessageBoxImage.Error);
-                messageBox.ShowDialog();
-            });
-
-            return messageBox._messageBoxResult;
-        }
-
-        /// <summary>
-        ///     严重
-        /// </summary>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        public static MessageBoxResult Fatal(string messageBoxText, string caption = null)
-        {
-            MessageBox messageBox = null;
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                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();
-            });
-
-            return messageBox._messageBoxResult;
-        }
-
-        /// <summary>
-        ///     询问
-        /// </summary>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        public static MessageBoxResult Ask(string messageBoxText, string caption = null)
-        {
-            MessageBox messageBox = null;
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OKCancel, MessageBoxImage.Question, MessageBoxResult.Cancel);
-                SetButtonStatus(messageBox, MessageBoxButton.OKCancel);
-                SetImage(messageBox, MessageBoxImage.Question);
-                messageBox.ShowDialog();
-            });
-
-            return messageBox._messageBoxResult;
-        }
-
-        /// <summary>
-        ///     自定义信息展示
-        /// </summary>
-        /// <param name="info"></param>
-        /// <returns></returns>
-        public static MessageBoxResult Show(MessageBoxInfo info)
-        {
-            MessageBox messageBox = null;
-            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);
-                }
-
-                messageBox.Style = info.Style;
-                messageBox.ShowDialog();
-            });
-
-            return messageBox._messageBoxResult;
-        }
-
-        /// <summary>
-        ///     信息展示
-        /// </summary>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        /// <param name="button"></param>
-        /// <param name="icon"></param>
-        /// <param name="defaultResult"></param>
-        /// <returns></returns>
-        public static MessageBoxResult Show(string messageBoxText, string caption = null,
-            MessageBoxButton button = MessageBoxButton.OK, MessageBoxImage icon = MessageBoxImage.None,
-            MessageBoxResult defaultResult = MessageBoxResult.None) =>
-            Show(null, messageBoxText, caption, button, icon, defaultResult);
-
-        /// <summary>
-        ///     信息展示
-        /// </summary>
-        /// <param name="owner"></param>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        /// <param name="button"></param>
-        /// <param name="icon"></param>
-        /// <param name="defaultResult"></param>
-        /// <returns></returns>
-        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;
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                messageBox = CreateMessageBox(owner, messageBoxText, caption, button, icon, defaultResult);
-                SetButtonStatus(messageBox, button);
-                SetImage(messageBox, icon);
-                messageBox.ShowDialog();
-            });
-
-            return messageBox._messageBoxResult;
-        }
-
-        private static MessageBox CreateMessageBox(
-            System.Windows.Window owner,
-            string messageBoxText,
-            string caption,
-            MessageBoxButton button,
-            MessageBoxImage icon,
-            MessageBoxResult defaultResult)
-        {
-            if (!IsValidMessageBoxButton(button))
-            {
-                throw new InvalidEnumArgumentException(nameof(button), (int)button, typeof(MessageBoxButton));
-            }
-            if (!IsValidMessageBoxImage(icon))
-            {
-                throw new InvalidEnumArgumentException(nameof(icon), (int)icon, typeof(MessageBoxImage));
-            }
-            if (!IsValidMessageBoxResult(defaultResult))
-            {
-                throw new InvalidEnumArgumentException(nameof(defaultResult), (int)defaultResult, typeof(MessageBoxResult));
-            }
-
-            var ownerWindow = owner ?? VisualHelper.GetActiveWindow();
-            var ownerIsNull = ownerWindow is null;
-
-            return new MessageBox
-            {
-                Message = messageBoxText,
-                Owner = ownerWindow,
-                WindowStartupLocation = WindowStartupLocation.CenterScreen,
-                ShowTitle = true,
-                Title = caption ?? string.Empty,
-                Topmost = ownerIsNull,
-                _messageBoxResult = defaultResult
-            };
-        }
-
-        private static void SetButtonStatus(MessageBox messageBox, MessageBoxButton messageBoxButton)
-        {
-            switch (messageBoxButton)
-            {
-                case MessageBoxButton.OK:
-                    messageBox._showOk = true;
-                    break;
-                case MessageBoxButton.OKCancel:
-                    messageBox._showOk = true;
-                    messageBox._showCancel = true;
-                    break;
-                case MessageBoxButton.YesNo:
-                    messageBox._showYes = true;
-                    messageBox._showNo = true;
-                    break;
-                case MessageBoxButton.YesNoCancel:
-                    messageBox._showYes = true;
-                    messageBox._showNo = true;
-                    messageBox._showCancel = true;
-                    break;
-            }
-        }
-
-        private static void SetImage(MessageBox messageBox, MessageBoxImage messageBoxImage)
-        {
-            var iconKey = string.Empty;
-            var iconBrushKey = string.Empty;
-
-            switch (messageBoxImage)
-            {
-                case MessageBoxImage.Error:
-                    iconKey = ResourceToken.ErrorGeometry;
-                    iconBrushKey = ResourceToken.DangerBrush;
-                    break;
-                case MessageBoxImage.Question:
-                    iconKey = ResourceToken.AskGeometry;
-                    iconBrushKey = ResourceToken.AccentBrush;
-                    break;
-                case MessageBoxImage.Warning:
-                    iconKey = ResourceToken.WarningGeometry;
-                    iconBrushKey = ResourceToken.WarningBrush;
-                    break;
-                case MessageBoxImage.Information:
-                    iconKey = ResourceToken.InfoGeometry;
-                    iconBrushKey = ResourceToken.InfoBrush;
-                    break;
-            }
-
-            if (string.IsNullOrEmpty(iconKey)) return;
-            messageBox.ShowImage = true;
-            messageBox.Image = ResourceHelper.GetResource<Geometry>(iconKey);
-            messageBox.ImageBrush = ResourceHelper.GetResource<Brush>(iconBrushKey);
-        }
-
-        private static bool IsValidMessageBoxButton(MessageBoxButton value)
-        {
-            return value == MessageBoxButton.OK
-                   || value == MessageBoxButton.OKCancel
-                   || value == MessageBoxButton.YesNo
-                   || value == MessageBoxButton.YesNoCancel;
-        }
-
-        private static bool IsValidMessageBoxImage(MessageBoxImage value)
-        {
-            return value == MessageBoxImage.Asterisk
-                   || value == MessageBoxImage.Error
-                   || value == MessageBoxImage.Exclamation
-                   || value == MessageBoxImage.Hand
-                   || value == MessageBoxImage.Information
-                   || value == MessageBoxImage.None
-                   || value == MessageBoxImage.Question
-                   || value == MessageBoxImage.Stop
-                   || value == MessageBoxImage.Warning;
-        }
-
-        private static bool IsValidMessageBoxResult(MessageBoxResult value)
-        {
-            return value == MessageBoxResult.Cancel
-                   || value == MessageBoxResult.No
-                   || value == MessageBoxResult.None
-                   || value == MessageBoxResult.OK
-                   || value == MessageBoxResult.Yes;
-        }
-    }
-}

src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj

@@ -116,10 +116,6 @@
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Controls\Other\Growl.cs" />
-    <Compile Include="Controls\Window\MessageBox.cs" />
-  </ItemGroup>
   <Import Project="..\..\Shared\HandyControl_Shared\HandyControl_Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems

@@ -273,8 +273,23 @@
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Styles\TreeViewDemoCtl.xaml.cs">
       <DependentUpon>TreeViewDemoCtl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Basic\ChatBoxViewModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Basic\InteractiveDialogViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Common\ComboBoxDemoViewModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\BadgeDemoViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\CoverViewModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\DialogDemoViewModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\GrowlDemoViewModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\ImageBrowserDemoViewModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\NotifyIconDemoViewModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\PaginationDemoViewModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\SearchBarDemoViewModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\StepBarDemoViewModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\WindowDemoViewModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ViewModel\DemoViewModelBase!1.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Main\ContributorsViewModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Main\MainViewModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ViewModel\ViewModelLocator.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Window\AboutWindow.xaml.cs">
       <DependentUpon>AboutWindow.xaml</DependentUpon>
     </Compile>

src/Shared/HandyControlDemo_Shared/UserControl/Main/NoUserContent.xaml

@@ -1,98 +0,0 @@
-<Grid x:Class="HandyControlDemo.UserControl.NoUserContent"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:interactivity="clr-namespace:HandyControl.Interactivity;assembly=HandyControl"
-      xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-      Height="29"
-      xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
-      xmlns:enum="clr-namespace:HandyControl.Data;assembly=HandyControl">
-    <Grid.ColumnDefinitions>
-        <ColumnDefinition/>
-        <ColumnDefinition Width="Auto"/>
-    </Grid.ColumnDefinitions>
-    <StackPanel VerticalAlignment="Stretch" Orientation="Horizontal">
-        <Button Margin="4,0,0,0" Width="28" Height="29" Style="{StaticResource ButtonCustom}">
-            <interactivity:Interaction.Triggers>
-                <interactivity:EventTrigger EventName="Click">
-                    <interactivity:InvokeCommandAction Command="{x:Static SystemCommands.ShowSystemMenuCommand}" />
-                </interactivity:EventTrigger>
-                <interactivity:EventTrigger EventName="MouseDoubleClick">
-                    <interactivity:InvokeCommandAction Command="{x:Static SystemCommands.CloseWindowCommand}" />
-                </interactivity:EventTrigger>
-            </interactivity:Interaction.Triggers>
-            <Path Height="16" Fill="White" Stretch="Uniform" Data="{StaticResource LogoGeometry}"/>
-        </Button>
-        <Menu MenuItem.Click="MenuItemLinks_OnClick"  Margin="10,0,0,0" Background="Transparent">
-            <MenuItem Foreground="White" Header="{x:Static langs:Lang.Repository}">
-                <MenuItem Tag="https://github.com/NaBian/HandyControl" Header="GitHub">
-                    <MenuItem.Icon>
-                        <Path Data="{StaticResource GithubGeometry}" Fill="{DynamicResource PrimaryTextBrush}"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Tag="https://www.nuget.org/packages/HandyControl" Header="NuGet">
-                    <MenuItem.Icon>
-                        <Path Data="{StaticResource NugetGeometry}" Fill="#30a5dd"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-            </MenuItem>
-            <MenuItem Foreground="White" Header="{x:Static langs:Lang.About}">
-                <MenuItem Click="MenuItemQQGroup_OnClick" Header="{x:Static langs:Lang.QQGroup}">
-                    <MenuItem.Icon>
-                        <Path Data="{StaticResource QqGeometry}" Fill="{DynamicResource PrimaryBrush}"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Tag="mailto:836904362@qq.com" Header="{x:Static langs:Lang.Email}">
-                    <MenuItem.Icon>
-                        <Path Data="{StaticResource EmailGeometry}" Fill="{DynamicResource WarningBrush}"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Tag="https://gitter.im/HandyControl/Lobby" Header="{x:Static langs:Lang.Chatroom}">
-                    <MenuItem.Icon>
-                        <Path Data="{StaticResource GitterGeometry}" Fill="#e52e64"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Tag="https://www.cnblogs.com/nabian" Header="{x:Static langs:Lang.Blog}">
-                    <MenuItem.Icon>
-                        <Path Data="{StaticResource CnblogsGeometry}" Fill="{DynamicResource PrimaryTextBrush}"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Header="{x:Static langs:Lang.About}" Click="MenuAbout_OnClick">
-                    <MenuItem.Icon>
-                        <Path Data="{StaticResource InfoGeometry}" Fill="{DynamicResource SuccessBrush}"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-            </MenuItem>
-            <MenuItem Click="MenuItemContributors_OnClick" Foreground="White" Header="{x:Static langs:Lang.Contributors}">
-                <MenuItem.Icon>
-                    <Path Data="{StaticResource ContributorsGeometry}" Fill="#ef6c00"/>
-                </MenuItem.Icon>
-            </MenuItem>
-        </Menu>
-    </StackPanel>
-    <Button Grid.Column="1" Click="ButtonConfig_OnClick" Name="ButtonConfig" Style="{StaticResource ButtonIcon}" controls:IconElement.Geometry="{StaticResource ConfigGeometry}"/>
-    <Popup AllowsTransparency="True" Grid.Column="1" PlacementTarget="{Binding ElementName=ButtonConfig}" HorizontalOffset="-25" Name="PopupConfig" VerticalOffset="6" StaysOpen="False">
-        <Border Background="{DynamicResource SecondaryRegionBrush}" CornerRadius="4" Margin="16" Effect="{StaticResource EffectShadow2}">
-            <StackPanel Orientation="Horizontal">
-                <StackPanel Button.Click="ButtonLangs_OnClick" Margin="10,10,0,10">
-                    <Button Tag="zh-cn" Style="{StaticResource ButtonCustom}">
-                        <Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/cn.png"/>
-                    </Button>
-                    <Button Tag="en" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
-                        <Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/en.png"/>
-                    </Button>
-                </StackPanel>
-                <StackPanel Button.Click="ButtonSkins_OnClick"  Margin="10,10,10,10">
-                    <Button Tag="{x:Static enum:SkinType.Default}" Style="{StaticResource ButtonCustom}">
-                        <Border Background="White" Width="32" Height="21" CornerRadius="2" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}"/>
-                    </Button>
-                    <Button Tag="{x:Static enum:SkinType.Dark}" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
-                        <Border Background="Black" Width="32" Height="21" CornerRadius="2" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}"/>
-                    </Button>
-                    <Button Tag="{x:Static enum:SkinType.Violet}" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
-                        <Border Background="DarkViolet" Width="32" Height="21" CornerRadius="2" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}"/>
-                    </Button>
-                </StackPanel>
-            </StackPanel>
-        </Border>
-    </Popup>
-</Grid>

src/Shared/HandyControlDemo_Shared/UserControl/Main/NoUserContent.xaml.cs

@@ -1,84 +0,0 @@
-using System.Diagnostics;
-using System.Reflection;
-using System.Windows;
-using System.Windows.Controls;
-using GalaSoft.MvvmLight.Messaging;
-using HandyControl.Controls;
-using HandyControl.Data;
-using HandyControlDemo.Data;
-using HandyControlDemo.Tools;
-using HandyControlDemo.Window;
-
-
-namespace HandyControlDemo.UserControl
-{
-    public partial class NoUserContent
-    {
-        public NoUserContent()
-        {
-            InitializeComponent();
-        }
-
-        private void ButtonLangs_OnClick(object sender, RoutedEventArgs e)
-        {
-            if (e.OriginalSource is Button button && button.Tag is string tag)
-            {
-                PopupConfig.IsOpen = false;
-                if (tag.Equals(GlobalData.Config.Lang)) return;
-                Growl.Ask(Properties.Langs.Lang.ChangeLangAsk, b =>
-                {
-                    if (!b) return true;
-                    GlobalData.Config.Lang = tag;
-                    GlobalData.Save();
-                    Process.Start(Process.GetCurrentProcess().MainModule.FileName);
-                    Application.Current.Shutdown();
-                    return true;
-                });
-            }
-        }
-
-        private void ButtonConfig_OnClick(object sender, RoutedEventArgs e) => PopupConfig.IsOpen = true;
-
-        private void ButtonSkins_OnClick(object sender, RoutedEventArgs e)
-        {
-            if (e.OriginalSource is Button button && button.Tag is SkinType tag)
-            {
-                PopupConfig.IsOpen = false;
-                if (tag.Equals(GlobalData.Config.Skin)) return;
-                GlobalData.Config.Skin = tag;
-                GlobalData.Save();
-                ((App)Application.Current).UpdateSkin(tag);
-            }
-        }
-
-        private void MenuItemLinks_OnClick(object sender, RoutedEventArgs e)
-        {
-            if (e.OriginalSource is MenuItem menuItem && menuItem.Tag is string tag)
-            {
-                Process.Start(tag);
-            }
-        }
-
-        private void MenuItemQQGroup_OnClick(object sender, RoutedEventArgs e)
-        {
-            Messenger.Default.Send<object>(null, MessageToken.ClearLeftSelected);
-            Messenger.Default.Send(true, MessageToken.FullSwitch);
-            Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{MessageToken.QQGroupView}"), MessageToken.LoadShowContent);
-        }
-
-        private void MenuItemContributors_OnClick(object sender, RoutedEventArgs e)
-        {
-            Messenger.Default.Send<object>(null, MessageToken.ClearLeftSelected);
-            Messenger.Default.Send(true, MessageToken.FullSwitch);
-            Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{MessageToken.ContributorsView}"), MessageToken.LoadShowContent);
-        }
-
-        private void MenuAbout_OnClick(object sender, RoutedEventArgs e)
-        {
-            new AboutWindow
-            {
-                Owner = Application.Current.MainWindow
-            }.ShowDialog();
-        }
-    }
-}

src/Shared/HandyControlDemo_Shared/ViewModel/Basic/ChatBoxViewModel.cs

@@ -7,7 +7,11 @@ using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media.Imaging;
 using GalaSoft.MvvmLight;
+#if netle40
+using GalaSoft.MvvmLight.Command;
+#else
 using GalaSoft.MvvmLight.CommandWpf;
+#endif
 using GalaSoft.MvvmLight.Messaging;
 using HandyControl.Controls;
 using HandyControl.Data;
@@ -43,7 +47,11 @@ namespace HandyControlDemo.ViewModel
         public string ChatString
         {
             get => _chatString;
+#if netle40
+            set => Set(nameof(ChatString), ref _chatString, value);
+#else
             set => Set(ref _chatString, value);
+#endif
         }
 
         public ObservableCollection<ChatInfoModel> ChatInfos { get; set; } = new ObservableCollection<ChatInfoModel>();

src/Shared/HandyControlDemo_Shared/ViewModel/Basic/InteractiveDialogViewModel.cs

@@ -1,6 +1,10 @@
 using System;
 using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.CommandWpf;
+#if netle40
+using GalaSoft.MvvmLight.Command;
+#else
+using GalaSoft.MvvmLight.CommandWpf;       
+#endif
 using HandyControl.Tools.Extension;
 
 namespace HandyControlDemo.ViewModel.Basic
@@ -14,7 +18,11 @@ namespace HandyControlDemo.ViewModel.Basic
         public string Result
         {
             get => _result;
-            set => Set(ref _result, value);
+#if netle40
+            set => Set(nameof(Result), ref _result, value);
+#else
+            set => Set(ref _result, value);  
+#endif
         }
 
         private string _message;
@@ -22,7 +30,11 @@ namespace HandyControlDemo.ViewModel.Basic
         public string Message
         {
             get => _message;
+#if netle40
+            set => Set(nameof(Message), ref _message, value);
+#else
             set => Set(ref _message, value);
+#endif
         }
 
         public RelayCommand CloseCmd => new Lazy<RelayCommand>(() => new RelayCommand(() => CloseAction?.Invoke())).Value;

src/Shared/HandyControlDemo_Shared/ViewModel/Controls/BadgeDemoViewModel.cs

@@ -1,6 +1,10 @@
 using System;
 using GalaSoft.MvvmLight;
+#if netle40
+using GalaSoft.MvvmLight.Command;
+#else
 using GalaSoft.MvvmLight.CommandWpf;
+#endif
 
 namespace HandyControlDemo.ViewModel.Controls
 {
@@ -11,7 +15,11 @@ namespace HandyControlDemo.ViewModel.Controls
         public int Count
         {
             get => _count;
+#if netle40
+            set => Set(nameof(Count), ref _count, value);
+#else
             set => Set(ref _count, value);
+#endif
         }
 
         public RelayCommand CountCmd => new Lazy<RelayCommand>(() =>

src/Shared/HandyControlDemo_Shared/ViewModel/Controls/DialogDemoViewModel.cs

@@ -1,7 +1,11 @@
 using System;
-using System.Threading.Tasks;
 using GalaSoft.MvvmLight;
+#if netle40
+using GalaSoft.MvvmLight.Command;
+#else
+using System.Threading.Tasks;
 using GalaSoft.MvvmLight.CommandWpf;
+#endif
 using HandyControl.Controls;
 using HandyControl.Tools.Extension;
 using HandyControlDemo.UserControl;
@@ -17,7 +21,11 @@ namespace HandyControlDemo.ViewModel
         public string DialogResult
         {
             get => _dialogResult;
+#if netle40
+            set => Set(nameof(DialogResult), ref _dialogResult, value);
+#else
             set => Set(ref _dialogResult, value);
+#endif
         }
 
         public RelayCommand ShowTextCmd => new Lazy<RelayCommand>(() =>
@@ -28,6 +36,17 @@ namespace HandyControlDemo.ViewModel
             Dialog.Show(new TextDialog());
         }
 
+#if netle40
+        public RelayCommand ShowInteractiveDialogCmd => new Lazy<RelayCommand>(() =>
+            new RelayCommand(ShowInteractiveDialog)).Value;
+
+        private void ShowInteractiveDialog()
+        {
+            Dialog.Show<InteractiveDialog>()
+                .Initialize<InteractiveDialogViewModel>(vm => vm.Message = DialogResult)
+                .GetResultAsync<string>().ContinueWith(str => DialogResult = str.Result);
+        }
+#else
         public RelayCommand ShowInteractiveDialogCmd => new Lazy<RelayCommand>(() =>
             new RelayCommand(async () => await ShowInteractiveDialog())).Value;
 
@@ -37,5 +56,6 @@ namespace HandyControlDemo.ViewModel
                 .Initialize<InteractiveDialogViewModel>(vm => vm.Message = DialogResult)
                 .GetResultAsync<string>();
         }
+#endif
     }
 }

src/Shared/HandyControlDemo_Shared/ViewModel/Controls/GrowlDemoViewModel.cs

@@ -1,5 +1,9 @@
 using System;
+#if netle40
+using GalaSoft.MvvmLight.Command;
+#else
 using GalaSoft.MvvmLight.CommandWpf;
+# endif
 using HandyControl.Controls;
 using HandyControl.Data;
 using HandyControlDemo.Window;

src/Shared/HandyControlDemo_Shared/ViewModel/Controls/ImageBrowserDemoViewModel.cs

@@ -1,5 +1,9 @@
 using System;
+#if netle40
+using GalaSoft.MvvmLight.Command;
+#else
 using GalaSoft.MvvmLight.CommandWpf;
+# endif
 using HandyControl.Controls;
 
 namespace HandyControlDemo.ViewModel

src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotifyIconDemoViewModel.cs

@@ -1,6 +1,10 @@
 using System;
 using GalaSoft.MvvmLight;
+#if netle40
+using GalaSoft.MvvmLight.Command;
+#else
 using GalaSoft.MvvmLight.CommandWpf;
+# endif
 using HandyControl.Controls;
 using HandyControlDemo.Data;
 
@@ -15,7 +19,11 @@ namespace HandyControlDemo.ViewModel
             get => _contextMenuIsShow;
             set
             {
+#if netle40
+                Set(nameof(ContextMenuIsShow), ref _contextMenuIsShow, value);
+#else
                 Set(ref _contextMenuIsShow, value);
+#endif
                 GlobalData.NotifyIconIsShow = ContextMenuIsShow || ContextContentIsShow;
             }
         }
@@ -25,7 +33,11 @@ namespace HandyControlDemo.ViewModel
         public bool ContextMenuIsBlink
         {
             get => _contextMenuIsBlink;
+#if netle40
+            set => Set(nameof(ContextMenuIsBlink), ref _contextMenuIsBlink, value);
+#else
             set => Set(ref _contextMenuIsBlink, value);
+#endif
         }
 
         private bool _contextContentIsShow;
@@ -35,7 +47,11 @@ namespace HandyControlDemo.ViewModel
             get => _contextContentIsShow;
             set
             {
+#if netle40
+                Set(nameof(ContextContentIsShow), ref _contextContentIsShow, value);
+#else
                 Set(ref _contextContentIsShow, value);
+#endif
                 GlobalData.NotifyIconIsShow = ContextMenuIsShow || ContextContentIsShow;
             }
         }
@@ -45,7 +61,11 @@ namespace HandyControlDemo.ViewModel
         public bool ContextContentIsBlink
         {
             get => _contextContentIsBlink;
+#if netle40
+            set => Set(nameof(ContextContentIsBlink), ref _contextContentIsBlink, value);
+#else
             set => Set(ref _contextContentIsBlink, value);
+#endif
         }
 
         public RelayCommand<object> MouseCmd => new Lazy<RelayCommand<object>>(() =>

src/Shared/HandyControlDemo_Shared/ViewModel/Controls/PaginationDemoViewModel.cs

@@ -1,7 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+#if netle40
+using GalaSoft.MvvmLight.Command;
+#else
 using GalaSoft.MvvmLight.CommandWpf;
+# endif
 using HandyControl.Data;
 using HandyControlDemo.Data;
 using HandyControlDemo.Service;
@@ -26,7 +30,11 @@ namespace HandyControlDemo.ViewModel
         public int PageIndex
         {
             get => _pageIndex;
+#if netle40
+            set => Set(nameof(PageIndex), ref _pageIndex, value);
+#else
             set => Set(ref _pageIndex, value);
+#endif
         }
 
         public PaginationDemoViewModel(DataService dataService)

src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SearchBarDemoViewModel.cs

@@ -1,6 +1,10 @@
 using System;
 using GalaSoft.MvvmLight;
+#if netle40
+using GalaSoft.MvvmLight.Command;
+#else
 using GalaSoft.MvvmLight.CommandWpf;
+# endif
 using HandyControl.Controls;
 
 namespace HandyControlDemo.ViewModel

src/Shared/HandyControlDemo_Shared/ViewModel/Controls/StepBarDemoViewModel.cs

@@ -1,7 +1,11 @@
 using System;
 using System.Linq;
 using System.Windows.Controls;
+#if netle40
+using GalaSoft.MvvmLight.Command;
+#else
 using GalaSoft.MvvmLight.CommandWpf;
+# endif
 using HandyControl.Controls;
 using HandyControlDemo.Data;
 using HandyControlDemo.Service;

src/Shared/HandyControlDemo_Shared/ViewModel/Controls/WindowDemoViewModel.cs

@@ -1,6 +1,10 @@
 using System;
 using System.Windows;
+#if netle40
+using GalaSoft.MvvmLight.Command;
+#else
 using GalaSoft.MvvmLight.CommandWpf;
+# endif
 using HandyControlDemo.Tools;
 
 namespace HandyControlDemo.ViewModel

src/Shared/HandyControlDemo_Shared/ViewModel/DemoViewModelBase!1.cs

@@ -16,7 +16,11 @@ namespace HandyControlDemo.ViewModel
         public IList<T> DataList
         {
             get => _dataList;
+#if netle40
+            set => Set(nameof(DataList), ref _dataList, value);
+#else
             set => Set(ref _dataList, value);
+#endif       
         }
     }
 }

src/Shared/HandyControlDemo_Shared/ViewModel/Main/ContributorsViewModel.cs

@@ -8,10 +8,17 @@ namespace HandyControlDemo.ViewModel
     {
         public ContributorsViewModel(DataService dataService)
         {
+#if netle40
+            Task.Factory.StartNew(() =>
+            {
+                DataList = dataService.GetContributorDataList();
+            });
+#else
             Task.Run(() =>
             {
                 DataList = dataService.GetContributorDataList();
             });
+#endif
         }
     }
 }

src/Shared/HandyControlDemo_Shared/ViewModel/Main/MainViewModel.cs

@@ -1,6 +1,10 @@
 using System;
 using System.Windows.Controls;
+#if netle40
+using GalaSoft.MvvmLight.Command;
+#else
 using GalaSoft.MvvmLight.CommandWpf;
+#endif
 using GalaSoft.MvvmLight.Messaging;
 using HandyControlDemo.Data;
 using HandyControlDemo.Service;
@@ -10,7 +14,7 @@ namespace HandyControlDemo.ViewModel
 {
     public class MainViewModel : DemoViewModelBase<DemoDataModel>
     {
-        #region 字段
+#region 字段
 
         /// <summary>
         ///     内容标题
@@ -27,7 +31,7 @@ namespace HandyControlDemo.ViewModel
         /// </summary>
         private ListBoxItem _listBoxItemCurrent;
 
-        #endregion
+#endregion
 
         public MainViewModel(DataService dataService)
         {
@@ -48,7 +52,7 @@ namespace HandyControlDemo.ViewModel
             DataList = dataService.GetDemoDataList();
         }
 
-        #region 属性
+#region 属性
 
         /// <summary>
         ///     子内容
@@ -56,7 +60,11 @@ namespace HandyControlDemo.ViewModel
         public object SubContent
         {
             get => _subContent;
+#if netle40
+            set => Set(nameof(SubContent), ref _subContent, value);
+#else
             set => Set(ref _subContent, value);
+#endif
         }
 
         /// <summary>
@@ -65,7 +73,11 @@ namespace HandyControlDemo.ViewModel
         public object ContentTitle
         {
             get => _contentTitle;
+#if netle40
+            set => Set(nameof(ContentTitle), ref _contentTitle, value);
+#else
             set => Set(ref _contentTitle, value);
+#endif
         }
 
         #endregion
@@ -79,9 +91,9 @@ namespace HandyControlDemo.ViewModel
             new Lazy<RelayCommand<SelectionChangedEventArgs>>(() =>
                 new RelayCommand<SelectionChangedEventArgs>(SwitchDemo)).Value;
 
-        #endregion
+#endregion
 
-        #region 方法
+#region 方法
 
         /// <summary>
         ///     切换例子
@@ -108,6 +120,6 @@ namespace HandyControlDemo.ViewModel
             }
         }
 
-        #endregion
+#endregion
     }
 }

src/Shared/HandyControl_Shared/Controls/Other/Growl.cs

@@ -327,6 +327,37 @@ namespace HandyControl.Controls
         /// <param name="growlInfo"></param>
         private static void Show(GrowlInfo growlInfo)
         {
+#if netle40
+            Application.Current.Dispatcher.Invoke(new Action(() =>
+            {
+                var ctl = new Growl
+                {
+                    Message = growlInfo.Message,
+                    Time = DateTime.Now,
+                    Icon = ResourceHelper.GetResource<Geometry>(growlInfo.IconKey),
+                    IconBrush = ResourceHelper.GetResource<Brush>(growlInfo.IconBrushKey),
+                    _showCloseButton = growlInfo.ShowCloseButton,
+                    ActionBeforeClose = growlInfo.ActionBeforeClose,
+                    _staysOpen = growlInfo.StaysOpen,
+                    ShowDateTime = growlInfo.ShowDateTime,
+                    ConfirmStr = growlInfo.ConfirmStr,
+                    CancelStr = growlInfo.CancelStr,
+                    Type = growlInfo.Type,
+                    _waitTime = Math.Max(growlInfo.WaitTime, 2)
+                };
+                if (!string.IsNullOrEmpty(growlInfo.Token))
+                {
+                    if (PanelDic.TryGetValue(growlInfo.Token, out var panel))
+                    {
+                        panel?.Children.Insert(0, ctl);
+                    }
+                }
+                else
+                {
+                    GrowlPanel.Children.Insert(0, ctl);
+                }
+            }));
+#else
             Application.Current.Dispatcher.Invoke(() =>
             {
                 var ctl = new Growl
@@ -356,6 +387,7 @@ namespace HandyControl.Controls
                     GrowlPanel.Children.Insert(0, ctl);
                 }
             });
+#endif           
         }
 
         /// <summary>

src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs

@@ -138,6 +138,17 @@ namespace HandyControl.Controls
         public static MessageBoxResult Success(string messageBoxText, string caption = null)
         {
             MessageBox messageBox = null;
+#if netle40
+            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);
@@ -147,6 +158,7 @@ namespace HandyControl.Controls
                 messageBox.ImageBrush = ResourceHelper.GetResource<Brush>(ResourceToken.SuccessBrush);
                 messageBox.ShowDialog();
             });
+#endif
 
             return messageBox._messageBoxResult;
         }
@@ -159,6 +171,15 @@ namespace HandyControl.Controls
         public static MessageBoxResult Info(string messageBoxText, string caption = null)
         {
             MessageBox messageBox = null;
+#if netle40
+            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);
@@ -166,6 +187,7 @@ namespace HandyControl.Controls
                 SetImage(messageBox, MessageBoxImage.Information);
                 messageBox.ShowDialog();
             });
+#endif
 
             return messageBox._messageBoxResult;
         }
@@ -178,6 +200,15 @@ namespace HandyControl.Controls
         public static MessageBoxResult Warning(string messageBoxText, string caption = null)
         {
             MessageBox messageBox = null;
+#if netle40
+            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);
@@ -185,6 +216,7 @@ namespace HandyControl.Controls
                 SetImage(messageBox, MessageBoxImage.Warning);
                 messageBox.ShowDialog();
             });
+#endif
 
             return messageBox._messageBoxResult;
         }
@@ -197,6 +229,15 @@ namespace HandyControl.Controls
         public static MessageBoxResult Error(string messageBoxText, string caption = null)
         {
             MessageBox messageBox = null;
+#if netle40
+            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);
@@ -204,6 +245,7 @@ namespace HandyControl.Controls
                 SetImage(messageBox, MessageBoxImage.Error);
                 messageBox.ShowDialog();
             });
+#endif
 
             return messageBox._messageBoxResult;
         }
@@ -216,6 +258,17 @@ namespace HandyControl.Controls
         public static MessageBoxResult Fatal(string messageBoxText, string caption = null)
         {
             MessageBox messageBox = null;
+#if netle40
+            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);
@@ -225,6 +278,7 @@ namespace HandyControl.Controls
                 messageBox.ImageBrush = ResourceHelper.GetResource<Brush>(ResourceToken.PrimaryTextBrush);
                 messageBox.ShowDialog();
             });
+#endif
 
             return messageBox._messageBoxResult;
         }
@@ -237,6 +291,15 @@ namespace HandyControl.Controls
         public static MessageBoxResult Ask(string messageBoxText, string caption = null)
         {
             MessageBox messageBox = null;
+#if netle40
+            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);
@@ -244,6 +307,7 @@ namespace HandyControl.Controls
                 SetImage(messageBox, MessageBoxImage.Question);
                 messageBox.ShowDialog();
             });
+#endif
 
             return messageBox._messageBoxResult;
         }
@@ -256,6 +320,23 @@ namespace HandyControl.Controls
         public static MessageBoxResult Show(MessageBoxInfo info)
         {
             MessageBox messageBox = null;
+#if netle40
+            Application.Current.Dispatcher.Invoke(new Action(() =>
+            {
+                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);
+                }
+
+                messageBox.Style = info.Style;
+                messageBox.ShowDialog();
+            }));
+#else
             Application.Current.Dispatcher.Invoke(() =>
             {
                 messageBox = CreateMessageBox(null, info.MessageBoxText, info.Caption, info.Button, MessageBoxImage.None, info.DefaultResult);
@@ -271,6 +352,7 @@ namespace HandyControl.Controls
                 messageBox.Style = info.Style;
                 messageBox.ShowDialog();
             });
+#endif
 
             return messageBox._messageBoxResult;
         }
@@ -302,6 +384,15 @@ 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)
         {
             MessageBox messageBox = null;
+#if netle40
+            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);
@@ -309,6 +400,7 @@ namespace HandyControl.Controls
                 SetImage(messageBox, icon);
                 messageBox.ShowDialog();
             });
+#endif
 
             return messageBox._messageBoxResult;
         }

src/Shared/HandyControl_Shared/HandyControl_Shared.projitems

@@ -63,6 +63,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Other\Dialog.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Other\GotoTop.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Other\Gravatar.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Other\Growl.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Other\NotifyIcon.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Other\Pagination.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Other\RadioGroup.cs" />
@@ -99,6 +100,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Transfer\TransferItem.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Window\BlurWindow.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Window\ImageBrowser.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Window\MessageBox.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Window\PopupWindow.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Window\Window.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Args\CancelRoutedEventArgs.cs" />

src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml

@@ -1,279 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:controls="clr-namespace:HandyControl.Controls">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="Base/ScrollViewerBaseStyle.xaml"/>
-        <ResourceDictionary Source="Button.xaml"/>
-        <ResourceDictionary Source="ToggleButton.xaml"/>
-        <ResourceDictionary Source="TextBox.xaml"/>
-        <ResourceDictionary Source="ComboBox.xaml"/>
-        <ResourceDictionary Source="CheckBox.xaml"/>
-    </ResourceDictionary.MergedDictionaries>
-
-    <Style x:Key="RowHeaderGripperStyle" TargetType="Thumb">
-        <Setter Property="Height" Value="8"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Cursor" Value="SizeNS"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Thumb">
-                    <Border Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}"/>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="DataGridCellStyle" TargetType="DataGridCell">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="BorderBrush" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="HorizontalContentAlignment" Value="Left"/>
-        <Setter Property="Padding" Value="10,6"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="DataGridCell">
-                    <Border Padding="{TemplateBinding Padding}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <MultiTrigger>
-                <MultiTrigger.Conditions>
-                    <Condition Property="IsSelected" Value="true"/>
-                    <Condition Property="Selector.IsSelectionActive" Value="false"/>
-                </MultiTrigger.Conditions>
-                <Setter Property="Foreground" Value="White"/>
-            </MultiTrigger>
-        </Style.Triggers>
-    </Style>
-    <Style x:Key="DataGridRowStyle" TargetType="DataGridRow">
-        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="SnapsToDevicePixels" Value="true"/>
-        <Setter Property="Margin" Value="0,0,0,4"/>
-        <Setter Property="Padding" Value="0,6"/>
-        <Setter Property="MinHeight" Value="44"/>
-        <Setter Property="Validation.ErrorTemplate" Value="{x:Null}"/>
-        <Setter Property="ValidationErrorTemplate">
-            <Setter.Value>
-                <ControlTemplate>
-                    <TextBlock Foreground="Red" Margin="2,0,0,0" Text="!" VerticalAlignment="Center"/>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="DataGridRow">
-                    <SelectiveScrollingGrid>
-                        <SelectiveScrollingGrid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="*"/>
-                        </SelectiveScrollingGrid.ColumnDefinitions>
-                        <SelectiveScrollingGrid.RowDefinitions>
-                            <RowDefinition Height="*"/>
-                            <RowDefinition Height="Auto"/>
-                        </SelectiveScrollingGrid.RowDefinitions>
-                        <Border CornerRadius="4" Grid.ColumnSpan="2" x:Name="DGR_Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True"/>
-                        <DataGridCellsPresenter MinHeight="{TemplateBinding MinHeight}" VerticalContentAlignment="Center" Grid.Row="0" Grid.Column="1" ItemsPanel="{TemplateBinding ItemsPanel}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        <DataGridDetailsPresenter Margin="0,6" Grid.Column="1" Grid.Row="1" SelectiveScrollingGrid.SelectiveScrollingOrientation="{Binding AreRowDetailsFrozen, ConverterParameter={x:Static SelectiveScrollingOrientation.Vertical}, Converter={x:Static DataGrid.RowDetailsScrollingConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" Visibility="{TemplateBinding DetailsVisibility}"/>
-                        <DataGridRowHeader Grid.Row="0" Grid.Column="0" SelectiveScrollingGrid.SelectiveScrollingOrientation="Vertical" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Row}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
-                    </SelectiveScrollingGrid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <Trigger Property="IsSelected" Value="True">
-                <Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
-                <Setter Property="TextElement.Foreground" Value="White"/>
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-    <Style x:Key="ColumnHeaderGripperStyle" TargetType="Thumb">
-        <Setter Property="Width" Value="8"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Cursor" Value="SizeWE"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Thumb">
-                    <Border Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}"/>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <Style x:Key="DataGridColumnHeaderStyle" TargetType="DataGridColumnHeader">
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="Padding" Value="12,6,12,12"/>
-        <Setter Property="MinHeight" Value="44"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="DataGridColumnHeader">
-                    <controls:SimplePanel>
-                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" Padding="{TemplateBinding Padding}">
-                            <StackPanel Orientation="Horizontal">
-                                <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                                <ToggleButton Height="20" Padding="4" Width="20" IsEnabled="False" Opacity="1" Foreground="{DynamicResource PrimaryBrush}" x:Name="ToggleButtonSortDirection" Style="{StaticResource ToggleButtonIconTransparent}" controls:IconSwitchElement.Geometry="{StaticResource DownGeometry}" controls:IconSwitchElement.GeometrySelected="{StaticResource UpGeometry}"/>
-                            </StackPanel>
-                        </Border>
-                        <Thumb x:Name="PART_LeftHeaderGripper" HorizontalAlignment="Left" Style="{StaticResource ColumnHeaderGripperStyle}"/>
-                        <Thumb x:Name="PART_RightHeaderGripper" HorizontalAlignment="Right" Style="{StaticResource ColumnHeaderGripperStyle}"/>
-                    </controls:SimplePanel>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="SortDirection" Value="{x:Null}">
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="ToggleButtonSortDirection"/>
-                        </Trigger>
-                        <Trigger Property="SortDirection" Value="Ascending">
-                            <Setter Property="IsChecked" Value="True" TargetName="ToggleButtonSortDirection"/>
-                        </Trigger>
-                        <Trigger Property="SortDirection" Value="Descending">
-                            <Setter Property="IsChecked" Value="False" TargetName="ToggleButtonSortDirection"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <Trigger Property="SortDirection" Value="Ascending">
-                <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}"/>
-            </Trigger>
-            <Trigger Property="SortDirection" Value="Descending">
-                <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}"/>
-                <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}"/>
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-    <Style x:Key="DataGridRowHeaderStyle" TargetType="DataGridRowHeader">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="DataGridRowHeader">
-                    <controls:SimplePanel HorizontalAlignment="Center">
-                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" Padding="{TemplateBinding Padding}" >
-                            <StackPanel Orientation="Horizontal">
-                                <ContentPresenter RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center"/>
-                            </StackPanel>
-                        </Border>
-                        <Thumb x:Name="PART_TopHeaderGripper" Style="{StaticResource RowHeaderGripperStyle}" VerticalAlignment="Top"/>
-                        <Thumb x:Name="PART_BottomHeaderGripper" Style="{StaticResource RowHeaderGripperStyle}" VerticalAlignment="Bottom"/>
-                    </controls:SimplePanel>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <Style x:Key="TextBlockComboBoxStyle" TargetType="ComboBox">
-        <Setter Property="Focusable" Value="True"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ComboBox">
-                    <TextBlock IsHitTestVisible="False" Text="{TemplateBinding Text}" Focusable="True" TextTrimming="CharacterEllipsis"/>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <Style x:Key="DataGridTextColumnStyle" TargetType="TextBlock">
-        <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
-    </Style>
-    <Style TargetType="DataGrid">
-        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
-        <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="GridLinesVisibility" Value="None"/>
-        <Setter Property="RowDetailsVisibilityMode" Value="VisibleWhenSelected"/>
-        <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
-        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-        <Setter Property="EnableRowVirtualization" Value="True"/>
-        <Setter Property="CanUserAddRows" Value="False"/>
-        <Setter Property="CanUserDeleteRows" Value="False"/>
-        <Setter Property="CanUserReorderColumns" Value="False"/>
-        <Setter Property="CanUserResizeRows" Value="False"/>
-        <Setter Property="ColumnHeaderStyle" Value="{StaticResource DataGridColumnHeaderStyle}"/>
-        <Setter Property="RowHeaderStyle" Value="{StaticResource DataGridRowHeaderStyle}"/>
-        <Setter Property="RowStyle" Value="{StaticResource DataGridRowStyle}"/>
-        <Setter Property="CellStyle" Value="{StaticResource DataGridCellStyle}"/>
-        <Setter Property="Padding" Value="6"/>
-        <Setter Property="ColumnWidth" Value="*"/>
-        <Setter Property="controls:DataGridAttach.TextColumnStyle" Value="{StaticResource DataGridTextColumnStyle}"/>
-        <Setter Property="controls:DataGridAttach.EditingTextColumnStyle" Value="{StaticResource TextBoxBaseStyle}"/>
-        <Setter Property="controls:DataGridAttach.ComboBoxColumnStyle" Value="{StaticResource TextBlockComboBoxStyle}"/>
-        <Setter Property="controls:DataGridAttach.EditingComboBoxColumnStyle" Value="{StaticResource ComboBoxBaseStyle}"/>
-        <Setter Property="controls:DataGridAttach.CheckBoxColumnStyle" Value="{StaticResource CheckBoxBaseStyle}"/>
-        <Setter Property="controls:DataGridAttach.EditingCheckBoxColumnStyle" Value="{StaticResource CheckBoxBaseStyle}"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="DataGrid">
-                    <ControlTemplate.Resources>
-                        <Storyboard x:Key="Storyboard1">
-                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
-                                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".8"/>
-                            </DoubleAnimationUsingKeyFrames>
-                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
-                                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".8"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                        <Storyboard x:Key="Storyboard2">
-                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
-                                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
-                                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                    </ControlTemplate.Resources>
-                    <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
-                        <ScrollViewer x:Name="DG_ScrollViewer" Focusable="false">
-                            <ScrollViewer.Template>
-                                <ControlTemplate TargetType="ScrollViewer">
-                                    <Grid>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto"/>
-                                            <ColumnDefinition Width="*"/>
-                                            <ColumnDefinition Width="Auto"/>
-                                        </Grid.ColumnDefinitions>
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="Auto"/>
-                                            <RowDefinition Height="*"/>
-                                        </Grid.RowDefinitions>
-                                        <Button Command="{x:Static DataGrid.SelectAllCommand}" Margin="0,0,0,6" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid}}" Style="{StaticResource ButtonIcon}" controls:IconElement.Geometry="{StaticResource AllGeometry}" Foreground="{DynamicResource PrimaryBrush}"/>
-                                        <DataGridColumnHeadersPresenter x:Name="PART_ColumnHeadersPresenter" Grid.ColumnSpan="2" Grid.Row="0" Grid.Column="1" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
-                                        <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" Grid.ColumnSpan="3" Grid.Column="0" Grid.Row="1"/>
-                                        <ScrollBar Style="{StaticResource ScrollBarBaseStyle}" Opacity="0" x:Name="PART_VerticalScrollBar" Grid.Column="2" Maximum="{TemplateBinding ScrollableHeight}" Orientation="Vertical" Grid.Row="1" Visibility="{TemplateBinding VerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}"/>
-                                        <Grid Grid.Column="1" Grid.Row="1">
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="{Binding NonFrozenColumnsViewportHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
-                                                <ColumnDefinition Width="*"/>
-                                            </Grid.ColumnDefinitions>
-                                            <ScrollBar Style="{StaticResource ScrollBarBaseStyle}" Opacity="0" VerticalAlignment="Bottom" x:Name="PART_HorizontalScrollBar" Grid.Column="1" Maximum="{TemplateBinding ScrollableWidth}" Orientation="Horizontal" Visibility="{TemplateBinding HorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}"/>
-                                        </Grid>
-                                    </Grid>
-                                    <ControlTemplate.Triggers>
-                                        <EventTrigger RoutedEvent="MouseEnter">
-                                            <BeginStoryboard Storyboard="{StaticResource Storyboard1}"/>
-                                        </EventTrigger>
-                                        <EventTrigger RoutedEvent="MouseLeave">
-                                            <BeginStoryboard Storyboard="{StaticResource Storyboard2}"/>
-                                        </EventTrigger>
-                                    </ControlTemplate.Triggers>
-                                </ControlTemplate>
-                            </ScrollViewer.Template>
-                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        </ScrollViewer>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <MultiTrigger>
-                <MultiTrigger.Conditions>
-                    <Condition Property="IsGrouping" Value="true"/>
-                    <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>
-                </MultiTrigger.Conditions>
-                <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
-            </MultiTrigger>
-        </Style.Triggers>
-    </Style>
-
-</ResourceDictionary>

src/Shared/HandyControl_Shared/Themes/Styles/Growl.xaml

@@ -1,60 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:controls="clr-namespace:HandyControl.Controls"
-                    xmlns:interactivity="clr-namespace:HandyControl.Interactivity">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="../Basic/Converters.xaml"/>
-        <ResourceDictionary Source="../Basic/Geometries.xaml"/>
-        <ResourceDictionary Source="../Basic/Effects.xaml"/>
-        <ResourceDictionary Source="TextBlock.xaml"/>
-        <ResourceDictionary Source="Button.xaml"/>
-    </ResourceDictionary.MergedDictionaries>
-
-    <Style TargetType="controls:Growl">
-        <Setter Property="MinHeight" Value="60"/>
-        <Setter Property="Width" Value="320"/>
-        <Setter Property="Margin" Value="10,0,0,10"/>
-        <Setter Property="MaxWidth" Value="320"/>
-        <Setter Property="Background" Value="{DynamicResource ThirdlyRegionBrush}"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="controls:Growl">
-                    <Grid Name="PART_GridMain" RenderTransformOrigin="0.5,0.5">
-                        <Grid.RenderTransform>
-                            <TransformGroup>
-                                <TranslateTransform X="{TemplateBinding MaxWidth}"/>
-                            </TransformGroup>
-                        </Grid.RenderTransform>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="50"/>
-                            <ColumnDefinition/>
-                            <ColumnDefinition Width="Auto"/>
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition/>
-                            <RowDefinition Height="Auto"/>
-                        </Grid.RowDefinitions>
-                        <Border Grid.ColumnSpan="3" Grid.RowSpan="2" Effect="{StaticResource EffectShadow2}" Background="{TemplateBinding Background}" CornerRadius="8" Width="320"/>
-                        <Path Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" Margin="0,15,0,0" Width="30" Height="30" Data="{TemplateBinding Icon}" Stretch="Uniform" Fill="{TemplateBinding IconBrush}"/>
-                        <StackPanel VerticalAlignment="Center" Grid.Row="0" Grid.Column="1" Margin="0,10,10,10">
-                            <TextBlock Text="{TemplateBinding Message}" Style="{StaticResource TextBlockDefault}" HorizontalAlignment="Left" TextWrapping="Wrap"/>
-                            <TextBlock Visibility="{Binding ShowDateTime,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" Text="{Binding Time,RelativeSource={RelativeSource AncestorType=controls:Growl},StringFormat=yyyy/MM/dd HH:mm:ss}" Style="{StaticResource TextBlockDefault}" Foreground="{DynamicResource SecondaryTextBrush}" HorizontalAlignment="Left" Margin="0,4,0,0"/>
-                        </StackPanel>
-                        <Button Grid.Row="0" Visibility="Collapsed" Margin="11,0" Name="PART_ButtonClose" Command="interactivity:ControlCommands.Close" Grid.Column="2" Background="Transparent" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center" HorizontalAlignment="Center" Width="18" Height="18">
-                            <Path Data="{StaticResource ErrorGeometry}" Stretch="Uniform" Fill="{DynamicResource SecondaryTextBrush}"/>
-                        </Button>
-                        <StackPanel Name="PART_PanelMore" IsEnabled="False" Visibility="Collapsed" Orientation="Horizontal" Grid.Row="1" Grid.ColumnSpan="3" Height="28" Grid.Column="0">
-                            <Button Command="interactivity:ControlCommands.Cancel" Style="{StaticResource ButtonCustom}" Width="160">
-                                <TextBlock Text="{Binding CancelStr,RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Center" Foreground="{DynamicResource DangerBrush}"/>
-                            </Button>
-                            <Button Command="interactivity:ControlCommands.Confirm" Style="{StaticResource ButtonCustom}" Width="160">
-                                <TextBlock Text="{Binding ConfirmStr,RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Center" Foreground="{DynamicResource PrimaryBrush}"/>
-                            </Button>
-                        </StackPanel>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-</ResourceDictionary>

src/Shared/HandyControl_Shared/Themes/Styles/ListView.xaml

@@ -1,178 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:controls="clr-namespace:HandyControl.Controls">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="Base/ScrollViewerBaseStyle.xaml"/>
-    </ResourceDictionary.MergedDictionaries>
-
-    <Style x:Key="GridViewColumnHeaderGripper" TargetType="Thumb">
-        <Setter Property="Canvas.Right" Value="-9"/>
-        <Setter Property="Width" Value="18"/>
-        <Setter Property="Height" Value="{Binding ActualHeight, RelativeSource={RelativeSource TemplatedParent}}"/>
-        <Setter Property="Padding" Value="0"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Thumb">
-                    <Border Background="Transparent" Padding="{TemplateBinding Padding}">
-                        <Rectangle Fill="{TemplateBinding Background}" HorizontalAlignment="Center" Width="1"/>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="GridViewColumnHeader">
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="HorizontalContentAlignment" Value="Left"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="Padding" Value="12,6,12,12"/>
-        <Setter Property="MinHeight" Value="44"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="GridViewColumnHeader">
-                    <controls:SimplePanel SnapsToDevicePixels="true">
-                        <Border x:Name="HeaderBorder" BorderBrush="{TemplateBinding BorderBrush}" Background="Transparent">
-                            <Grid>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition MaxHeight="7"/>
-                                    <RowDefinition/>
-                                </Grid.RowDefinitions>
-                                <Border Padding="{TemplateBinding Padding}" Grid.RowSpan="2">
-                                    <ContentPresenter x:Name="HeaderContent" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="0,0,0,1" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                                </Border>
-                            </Grid>
-                        </Border>
-                        <Canvas>
-                            <Thumb x:Name="PART_HeaderGripper" Style="{StaticResource GridViewColumnHeaderGripper}"/>
-                        </Canvas>
-                    </controls:SimplePanel>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="ListViewItemBaseStyle" TargetType="ListViewItem">
-        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
-        <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="SnapsToDevicePixels" Value="true"/>
-        <Setter Property="Margin" Value="0,0,0,4"/>
-        <Setter Property="Padding" Value="8,6"/>
-        <Setter Property="MinHeight" Value="44"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ListViewItem">
-                    <Border CornerRadius="4" x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-                        <GridViewRowPresenter Content="{TemplateBinding Content}" Columns="{TemplateBinding GridView.ColumnCollection}"/>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsSelected" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <Trigger Property="IsSelected" Value="True">
-                <Setter Property="Foreground" Value="White"/>
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
-    <Style x:Key="ListViewScrollViewerStyle" TargetType="ScrollViewer">
-        <Setter Property="Focusable" Value="False"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ScrollViewer">
-                    <ControlTemplate.Resources>
-                        <Storyboard x:Key="Storyboard1">
-                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
-                                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".8"/>
-                            </DoubleAnimationUsingKeyFrames>
-                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
-                                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".8"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                        <Storyboard x:Key="Storyboard2">
-                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
-                                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
-                                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                    </ControlTemplate.Resources>
-                    <Grid Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*"/>
-                            <ColumnDefinition Width="Auto"/>
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="*"/>
-                            <RowDefinition Height="Auto"/>
-                        </Grid.RowDefinitions>
-                        <DockPanel Margin="{TemplateBinding Padding}" Grid.RowSpan="2" Grid.ColumnSpan="2">
-                            <ScrollViewer DockPanel.Dock="Top" Focusable="False" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
-                                <GridViewHeaderRowPresenter AllowsColumnReorder="{Binding TemplatedParent.View.AllowsColumnReorder, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderContainerStyle="{Binding TemplatedParent.View.ColumnHeaderContainerStyle, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderToolTip="{Binding TemplatedParent.View.ColumnHeaderToolTip, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderContextMenu="{Binding TemplatedParent.View.ColumnHeaderContextMenu, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderTemplate="{Binding TemplatedParent.View.ColumnHeaderTemplate, RelativeSource={RelativeSource TemplatedParent}}" Columns="{Binding TemplatedParent.View.Columns, RelativeSource={RelativeSource TemplatedParent}}" Margin="2,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                            </ScrollViewer>
-                            <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" KeyboardNavigation.DirectionalNavigation="Local" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        </DockPanel>
-                        <ScrollBar x:Name="PART_VerticalScrollBar" Opacity="0" Style="{StaticResource ScrollBarBaseStyle}" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}"/>
-                        <ScrollBar x:Name="PART_HorizontalScrollBar" Opacity="0" Style="{StaticResource ScrollBarBaseStyle}" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}"/>
-                        <DockPanel Background="{Binding Background, ElementName=PART_VerticalScrollBar}" Grid.Column="1" LastChildFill="False" Grid.Row="1">
-                            <Rectangle DockPanel.Dock="Left" Fill="White" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Width="1"/>
-                            <Rectangle DockPanel.Dock="Top" Fill="White" Height="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"/>
-                        </DockPanel>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <EventTrigger RoutedEvent="MouseEnter">
-                            <BeginStoryboard Storyboard="{StaticResource Storyboard1}"/>
-                        </EventTrigger>
-                        <EventTrigger RoutedEvent="MouseLeave">
-                            <BeginStoryboard Storyboard="{StaticResource Storyboard2}"/>
-                        </EventTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="ListView">
-        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Padding" Value="6"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-        <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
-        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="ItemContainerStyle" Value="{StaticResource ListViewItemBaseStyle}"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ListView">
-                    <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
-                        <ScrollViewer Style="{StaticResource ListViewScrollViewerStyle}">
-                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        </ScrollViewer>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <MultiTrigger>
-                <MultiTrigger.Conditions>
-                    <Condition Property="IsGrouping" Value="true"/>
-                    <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>
-                </MultiTrigger.Conditions>
-                <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
-            </MultiTrigger>
-        </Style.Triggers>
-    </Style>
-
-</ResourceDictionary>

src/Shared/HandyControl_Shared/Themes/Styles/MessageBox.xaml

@@ -1,122 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:controls="clr-namespace:HandyControl.Controls"
-                    xmlns:langs="clr-namespace:HandyControl.Properties.Langs"
-                    xmlns:interactivity="clr-namespace:HandyControl.Interactivity">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="Window.xaml"/>
-    </ResourceDictionary.MergedDictionaries>
-
-    <Style TargetType="controls:MessageBox" BasedOn="{StaticResource WindowWin10}">
-        <Setter Property="MinHeight" Value="172"/>
-        <Setter Property="ShowInTaskbar" Value="False"/>
-        <Setter Property="MinWidth" Value="335"/>
-        <Setter Property="MaxWidth" Value="476"/>
-        <Setter Property="MaxHeight" Value="680"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="ResizeMode" Value="NoResize"/>
-        <Setter Property="SizeToContent" Value="WidthAndHeight"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="controls:MessageBox">
-                    <Border SnapsToDevicePixels="True" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-                        <Grid Margin="{TemplateBinding Padding}">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition/>
-                            </Grid.RowDefinitions>
-                            <Grid Background="{TemplateBinding NonClientAreaBackground}" Name="PART_NonClientArea" TextElement.Foreground="{TemplateBinding NonClientAreaForeground}">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition Width="Auto"/>
-                                </Grid.ColumnDefinitions>
-                                <StackPanel WindowChrome.IsHitTestVisibleInChrome="True" UseLayoutRounding="True" VerticalAlignment="Top" Grid.Column="1" HorizontalAlignment="Right" Orientation="Horizontal">
-                                    <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.MinimizeWindowCommand" IsTabStop="False" Name="ButtonMin" Height="29" Style="{StaticResource ButtonIcon}" Width="45" controls:IconElement.Geometry="{StaticResource WindowMinGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
-                                    <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.MaximizeWindowCommand" IsTabStop="False" Name="ButtonMax" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource WindowMaxGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
-                                    <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.RestoreWindowCommand" IsTabStop="False" Name="ButtonRestore" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource WindowRestoreGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
-                                    <Button Background="{TemplateBinding CloseButtonBackground}" Foreground="{TemplateBinding CloseButtonForeground}" Command="SystemCommands.CloseWindowCommand" IsTabStop="False" Name="ButtonClose" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource CloseGeometry}" BorderThickness="1,0,0,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
-                                </StackPanel>
-                                <Grid Grid.Column="0">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition/>
-                                    </Grid.ColumnDefinitions>
-                                    <Image Name="Icon" Margin="10,0,0,0" Source="{TemplateBinding Icon}" VerticalAlignment="Center" Width="16" Height="16"/>
-                                    <TextBlock Name="Title" Grid.Column="1" Text="{TemplateBinding Title}" Padding="10,0,0,0" VerticalAlignment="Center"/>
-                                    <ContentPresenter WindowChrome.IsHitTestVisibleInChrome="True" Grid.Column="2" x:Name="ContentPresenterMain" Content="{TemplateBinding NonClientAreaContent}"/>
-                                </Grid>
-                            </Grid>
-                            <Grid Grid.Row="1">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition/>
-                                </Grid.ColumnDefinitions>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition/>
-                                    <RowDefinition Height="Auto"/>
-                                </Grid.RowDefinitions>
-                                <Path Data="{TemplateBinding Image}" Fill="{TemplateBinding ImageBrush}" HorizontalAlignment="Center" Visibility="{TemplateBinding ShowImage,Converter={StaticResource Boolean2VisibilityConverter}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" Margin="20,32,0,0" Width="30" Height="30" Stretch="Uniform"/>
-                                <ScrollViewer Grid.Column="1" Grid.Row="0">
-                                    <TextBlock Margin="10,39,10,10" Text="{TemplateBinding Message}" TextWrapping="Wrap" HorizontalAlignment="Left" VerticalAlignment="Top"/>
-                                </ScrollViewer>
-                                <StackPanel Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center">
-                                    <Button Visibility="{Binding IsEnabled,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" IsCancel="True" MinWidth="88" Command="interactivity:ControlCommands.Cancel" Content="{x:Static langs:Lang.Cancel}" Margin="5,0"/>
-                                    <Button Visibility="{Binding IsEnabled,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" IsDefault="True" MinWidth="88" Command="interactivity:ControlCommands.Confirm" Content="{x:Static langs:Lang.Confirm}" Margin="5,0" Style="{StaticResource ButtonPrimary}"/>
-                                    <Button Visibility="{Binding IsEnabled,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" IsCancel="True" MinWidth="88" Command="interactivity:ControlCommands.No" Content="{x:Static langs:Lang.No}" Margin="5,0"/>
-                                    <Button Visibility="{Binding IsEnabled,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" IsDefault="True" MinWidth="88" Command="interactivity:ControlCommands.Yes" Content="{x:Static langs:Lang.Yes}" Margin="5,0" Style="{StaticResource ButtonPrimary}"/>
-                                </StackPanel>
-                            </Grid>
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsActive" Value="False">
-                            <Setter Property="Opacity" Value=".8" TargetName="ContentPresenterMain"/>
-                        </Trigger>
-                        <Trigger Property="Icon" Value="{x:Null}">
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="Icon"/>
-                        </Trigger>
-                        <Trigger Property="WindowState" Value="Maximized">
-                            <Setter Property="Padding" Value="8"/>
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonMax"/>
-                            <Setter Property="Visibility" Value="Visible" TargetName="ButtonRestore"/>
-                        </Trigger>
-                        <Trigger Property="WindowState" Value="Normal">
-                            <Setter Property="Visibility" Value="Visible" TargetName="ButtonMax"/>
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonRestore"/>
-                        </Trigger>
-                        <Trigger Property="ResizeMode" Value="NoResize">
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonMin"/>
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonMax"/>
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonRestore"/>
-                        </Trigger>
-                        <Trigger Property="ResizeMode" Value="CanMinimize">
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonMax"/>
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonRestore"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True" SourceName="ButtonClose">
-                            <Setter Property="Background" TargetName="ButtonClose" Value="{Binding CloseButtonHoverBackground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
-                            <Setter Property="Foreground" TargetName="ButtonClose" Value="{Binding CloseButtonHoverForeground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True" SourceName="ButtonMax">
-                            <Setter Property="Background" TargetName="ButtonMax" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
-                            <Setter Property="Foreground" TargetName="ButtonMax" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True" SourceName="ButtonRestore">
-                            <Setter Property="Background" TargetName="ButtonRestore" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
-                            <Setter Property="Foreground" TargetName="ButtonRestore" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True" SourceName="ButtonMin">
-                            <Setter Property="Background" TargetName="ButtonMin" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
-                            <Setter Property="Foreground" TargetName="ButtonMin" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
-                        </Trigger>
-                        <Trigger Property="ShowTitle" Value="False">
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="Title"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>

src/Shared/HandyControl_Shared/Themes/Styles/Window.xaml

@@ -1,223 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:controls="clr-namespace:HandyControl.Controls"
-                    xmlns:interactivity="clr-namespace:HandyControl.Interactivity">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="Button.xaml"/>
-        <ResourceDictionary Source="../Basic/Converters.xaml"/>
-        <ResourceDictionary Source="../Basic/Geometries.xaml"/>
-    </ResourceDictionary.MergedDictionaries>
-
-    <LinearGradientBrush x:Key="ResizeGripperForeground" EndPoint="1,0.75" StartPoint="0,0.25">
-        <GradientStop Color="#FFFFFF" Offset="0.3"/>
-        <GradientStop Color="#BBC5D7" Offset="0.75"/>
-        <GradientStop Color="#6D83A9" Offset="1"/>
-    </LinearGradientBrush>
-
-    <Style TargetType="ResizeGrip">
-        <Setter Property="MinWidth" Value="11"/>
-        <Setter Property="MinHeight" Value="11"/>
-        <Setter Property="Width" Value="11"/>
-        <Setter Property="Height" Value="11"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ResizeGrip">
-                    <controls:SimplePanel Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
-                        <Path Width="11" Height="11" Data="M 9,0 L 11,0 L 11,11 L 0,11 L 0,9 L 3,9 L 3,6 L 6,6 L 6,3 L 9,3 z" HorizontalAlignment="Right" VerticalAlignment="Bottom">
-                            <Path.Fill>
-                                <DrawingBrush TileMode="Tile" Viewbox="0,0,3,3" Viewport="0,0,3,3" ViewportUnits="Absolute" ViewboxUnits="Absolute">
-                                    <DrawingBrush.Drawing>
-                                        <DrawingGroup>
-                                            <GeometryDrawing Brush="{StaticResource ResizeGripperForeground}">
-                                                <GeometryDrawing.Geometry>
-                                                    <RectangleGeometry Rect="0,0,2,2"/>
-                                                </GeometryDrawing.Geometry>
-                                            </GeometryDrawing>
-                                        </DrawingGroup>
-                                    </DrawingBrush.Drawing>
-                                </DrawingBrush>
-                            </Path.Fill>
-                        </Path>
-                    </controls:SimplePanel>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="WindowDefault" TargetType="Window">
-        <Setter Property="Background" Value="{DynamicResource BackgroundBrush}"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-    </Style>
-
-    <Style x:Key="WindowWin10" TargetType="controls:Window">
-        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource ReverseTextBrush}"/>
-        <Setter Property="UseLayoutRounding" Value="True"/>
-        <Setter Property="NonClientAreaBackground" Value="{DynamicResource RegionBrush}"/>
-        <Setter Property="NonClientAreaForeground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="CloseButtonBackground" Value="Transparent"/>
-        <Setter Property="CloseButtonForeground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="CloseButtonHoverBackground" Value="#e81123"/>
-        <Setter Property="CloseButtonHoverForeground" Value="White"/>
-        <Setter Property="OtherButtonBackground" Value="Transparent"/>
-        <Setter Property="OtherButtonForeground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="OtherButtonHoverBackground" Value="#e5e5e5"/>
-        <Setter Property="OtherButtonHoverForeground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="controls:Window">
-                    <Border SnapsToDevicePixels="True" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-                        <Grid Margin="{TemplateBinding Padding}">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition/>
-                            </Grid.RowDefinitions>
-                            <Grid Background="{TemplateBinding NonClientAreaBackground}" Name="PART_NonClientArea" TextElement.Foreground="{TemplateBinding NonClientAreaForeground}">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition Width="Auto"/>
-                                </Grid.ColumnDefinitions>
-                                <StackPanel WindowChrome.IsHitTestVisibleInChrome="True" UseLayoutRounding="True" VerticalAlignment="Top" Grid.Column="1" HorizontalAlignment="Right" Orientation="Horizontal">
-                                    <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.MinimizeWindowCommand" IsTabStop="False" Name="ButtonMin" Height="29" Style="{StaticResource ButtonIcon}" Width="45" controls:IconElement.Geometry="{StaticResource WindowMinGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
-                                    <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.MaximizeWindowCommand" IsTabStop="False" Name="ButtonMax" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource WindowMaxGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
-                                    <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.RestoreWindowCommand" IsTabStop="False" Name="ButtonRestore" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource WindowRestoreGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
-                                    <Button Background="{TemplateBinding CloseButtonBackground}" Foreground="{TemplateBinding CloseButtonForeground}" Command="SystemCommands.CloseWindowCommand" IsTabStop="False" Name="ButtonClose" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource CloseGeometry}" BorderThickness="1,0,0,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
-                                </StackPanel>
-                                <Grid Grid.Column="0">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition/>
-                                    </Grid.ColumnDefinitions>
-                                    <Image Name="Icon" Margin="10,0,0,0" Source="{TemplateBinding Icon}" VerticalAlignment="Center" Width="16" Height="16"/>
-                                    <TextBlock Name="Title" Grid.Column="1" Text="{TemplateBinding Title}" Padding="10,0,0,0" VerticalAlignment="Center"/>
-                                    <ContentPresenter WindowChrome.IsHitTestVisibleInChrome="True" Grid.Column="2" x:Name="ContentPresenterMain" Content="{TemplateBinding NonClientAreaContent}"/>
-                                </Grid>
-                            </Grid>
-                            <AdornerDecorator Grid.Row="1">
-                                <ContentPresenter/>
-                            </AdornerDecorator>
-                            <ResizeGrip Width="10" Height="10" x:Name="ResizeGrip" HorizontalAlignment="Right" VerticalAlignment="Bottom" Grid.Row="1" IsTabStop="False" Visibility="Collapsed" WindowChrome.ResizeGripDirection="BottomRight" />
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsActive" Value="False">
-                            <Setter Property="Opacity" Value=".8" TargetName="ContentPresenterMain"/>
-                        </Trigger>
-                        <Trigger Property="Icon" Value="{x:Null}">
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="Icon"/>
-                        </Trigger>
-                        <Trigger Property="WindowState" Value="Maximized">
-                            <Setter Property="Padding" Value="8"/>
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonMax"/>
-                            <Setter Property="Visibility" Value="Visible" TargetName="ButtonRestore"/>
-                        </Trigger>
-                        <Trigger Property="WindowState" Value="Normal">
-                            <Setter Property="Visibility" Value="Visible" TargetName="ButtonMax"/>
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonRestore"/>
-                        </Trigger>
-                        <Trigger Property="ResizeMode" Value="NoResize">
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonMin"/>
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonMax"/>
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonRestore"/>
-                        </Trigger>
-                        <Trigger Property="ResizeMode" Value="CanMinimize">
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonMax"/>
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonRestore"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True" SourceName="ButtonClose">
-                            <Setter Property="Background" TargetName="ButtonClose" Value="{Binding CloseButtonHoverBackground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
-                            <Setter Property="Foreground" TargetName="ButtonClose" Value="{Binding CloseButtonHoverForeground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True" SourceName="ButtonMax">
-                            <Setter Property="Background" TargetName="ButtonMax" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
-                            <Setter Property="Foreground" TargetName="ButtonMax" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True" SourceName="ButtonRestore">
-                            <Setter Property="Background" TargetName="ButtonRestore" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
-                            <Setter Property="Foreground" TargetName="ButtonRestore" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True" SourceName="ButtonMin">
-                            <Setter Property="Background" TargetName="ButtonMin" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
-                            <Setter Property="Foreground" TargetName="ButtonMin" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
-                        </Trigger>
-                        <Trigger Property="ShowTitle" Value="False">
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="Title"/>
-                        </Trigger>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="ResizeMode" Value="CanResizeWithGrip"/>
-                                <Condition Property="WindowState" Value="Normal" />
-                            </MultiTrigger.Conditions>
-                            <Setter TargetName="ResizeGrip" Property="Visibility" Value="Visible" />
-                        </MultiTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="WindowBlur" BasedOn="{StaticResource WindowWin10}" TargetType="controls:BlurWindow">
-        <Setter Property="Background" Value="Transparent"/>
-    </Style>
-
-    <Style TargetType="controls:ImageBrowser">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="MinWidth" Value="400"/>
-        <Setter Property="MinHeight" Value="250"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="BorderBrush" Value="Black"/>
-        <Setter Property="ResizeMode" Value="NoResize"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="controls:ImageBrowser">
-                    <ControlTemplate.Resources>
-                        <Storyboard x:Key="Storyboard1">
-                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_PanelTop">
-                                <EasingDoubleKeyFrame KeyTime="0:0:.1" Value="1"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                        <Storyboard x:Key="Storyboard2">
-                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_PanelTop">
-                                <EasingDoubleKeyFrame KeyTime="0:0:.4" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                    </ControlTemplate.Resources>
-                    <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition/>
-                            <RowDefinition Height="Auto"/>
-                        </Grid.RowDefinitions>
-                        <controls:ImageViewer x:Name="PART_ImageViewer" ShowImgMap="True" BorderThickness="0" Background="#dd000000"/>
-                        <controls:SimplePanel x:Name="PART_PanelTop" Opacity="0" Background="{DynamicResource DarkOpacityBrush}" VerticalAlignment="Top" Grid.Row="0">
-                            <StackPanel HorizontalAlignment="Left" VerticalAlignment="Center" Orientation="Horizontal">
-                                <TextBlock Text="{Binding ImgPath,ElementName=PART_ImageViewer}" Foreground="White" Margin="10,0,0,0"/>
-                                <TextBlock Text="{Binding ImgSize,ElementName=PART_ImageViewer,Converter={StaticResource Long2FileSizeConverter}}" Foreground="White" Margin="30,0,0,0"/>
-                            </StackPanel>
-                            <Button Command="interactivity:ControlCommands.Close" WindowChrome.IsHitTestVisibleInChrome="True" Background="Red" Padding="14" controls:IconElement.Geometry="{StaticResource DeleteGeometry}" Style="{StaticResource ButtonIcon}" HorizontalAlignment="Right" VerticalAlignment="Top" Width="40" Height="40"/>
-                        </controls:SimplePanel>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger SourceName="PART_ImageViewer" Property="ShowCloseButton" Value="True">
-                            <Trigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource Storyboard1}"/>
-                            </Trigger.EnterActions>
-                            <Trigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource Storyboard2}"/>
-                            </Trigger.ExitActions>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <Trigger Property="IsFullScreen" Value="True">
-                <Setter Property="WindowState" Value="Maximized"/>
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
-</ResourceDictionary>