diff --git a/Wox/MainWindow.xaml b/Wox/MainWindow.xaml index 2c7421081f..d6a6dc5a38 100644 --- a/Wox/MainWindow.xaml +++ b/Wox/MainWindow.xaml @@ -21,7 +21,7 @@ Visibility="{Binding IsVisible,Converter={converters:VisibilityConverter}}" PreviewKeyDown="Window_PreviewKeyDown" d:DataContext="{d:DesignInstance vm:MainViewModel, IsDesignTimeCreatable=True}"> - + diff --git a/Wox/ResultListBox.xaml b/Wox/ResultListBox.xaml index 890c36cc37..0962b7df25 100644 --- a/Wox/ResultListBox.xaml +++ b/Wox/ResultListBox.xaml @@ -6,7 +6,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:converters="clr-namespace:Wox.Converters" xmlns:vm ="clr-namespace:Wox.ViewModel" - mc:Ignorable="d" d:DesignWidth="100" d:DesignHeight="100" d:DataContext="{d:DesignInstance vm:ResultPanelViewModel}"> + mc:Ignorable="d" d:DesignWidth="100" d:DesignHeight="100" d:DataContext="{d:DesignInstance vm:ResultsViewModel}"> newResults, string resultId) { - var vm = this.DataContext as ResultPanelViewModel; + var vm = this.DataContext as ResultsViewModel; vm.AddResults(newResults, resultId); } diff --git a/Wox/SettingWindow.xaml.cs b/Wox/SettingWindow.xaml.cs index ed76e8c523..7eeaa464bb 100644 --- a/Wox/SettingWindow.xaml.cs +++ b/Wox/SettingWindow.xaml.cs @@ -37,7 +37,7 @@ namespace Wox { this._api = api; InitializeComponent(); - this.ResultListBoxPreview.DataContext = new ResultPanelViewModel(); + this.ResultListBoxPreview.DataContext = new ResultsViewModel(); Loaded += Setting_Loaded; } diff --git a/Wox/ViewModel/MainViewModel.cs b/Wox/ViewModel/MainViewModel.cs index 9793a36966..3584041385 100644 --- a/Wox/ViewModel/MainViewModel.cs +++ b/Wox/ViewModel/MainViewModel.cs @@ -21,7 +21,7 @@ namespace Wox.ViewModel { #region Private Fields - private ResultPanelViewModel _actionPanel; + private ResultsViewModel _actionPanel; private string _queryText; private bool _isVisible; private bool _isResultListBoxVisible; @@ -56,9 +56,9 @@ namespace Wox.ViewModel #region ViewModel Properties - public ResultPanelViewModel Results { get; private set; } + public ResultsViewModel Results { get; private set; } - public ResultPanelViewModel ActionPanel + public ResultsViewModel ActionPanel { get { @@ -408,7 +408,7 @@ namespace Wox.ViewModel private void InitializeResultListBox() { - this.Results = new ResultPanelViewModel(); + this.Results = new ResultsViewModel(); this.IsResultListBoxVisible = false; } @@ -478,7 +478,7 @@ namespace Wox.ViewModel private void InitializeActionPanel() { - this._actionPanel = new ResultPanelViewModel(); + this._actionPanel = new ResultsViewModel(); this.IsActionPanelVisible = false; } diff --git a/Wox/ViewModel/ResultsViewModel.cs b/Wox/ViewModel/ResultsViewModel.cs index 2cc946df62..04a1e43fce 100644 --- a/Wox/ViewModel/ResultsViewModel.cs +++ b/Wox/ViewModel/ResultsViewModel.cs @@ -13,7 +13,7 @@ using Wox.Storage; namespace Wox.ViewModel { - public class ResultPanelViewModel : BaseViewModel + public class ResultsViewModel : BaseViewModel { #region Private Fields @@ -28,7 +28,7 @@ namespace Wox.ViewModel #region Constructor - public ResultPanelViewModel() + public ResultsViewModel() { this._results = new ResultCollection(); } diff --git a/Wox/Wox.csproj b/Wox/Wox.csproj index 13edf3ec8c..164fdc5846 100644 --- a/Wox/Wox.csproj +++ b/Wox/Wox.csproj @@ -137,7 +137,7 @@ - + WoxUpdate.xaml