diff --git a/Correlator/ViewModels/MainWindowViewModel.cs b/Correlator/ViewModels/MainWindowViewModel.cs index 8dfaa73..414c76c 100644 --- a/Correlator/ViewModels/MainWindowViewModel.cs +++ b/Correlator/ViewModels/MainWindowViewModel.cs @@ -468,7 +468,6 @@ public DelegateCommand WindowLoadedCommand { set; get; } public DelegateCommand CloseWindowCommand { private set; get; } - public DelegateCommand OpenFolderCommand { private set; get; } public DelegateCommand OpenImageFileCommand { private set; get; } public DelegateCommand OpenAudioFileCommand { private set; get; } public DelegateCommand OpenListenAudioCommand { private set; get; } @@ -476,11 +475,9 @@ public DelegateCommand OpenNumericKeypadCommand { private set; get; } public DelegateCommand PipeItemSelectedCommand { set; get; } public DelegateCommand DetectNoiseCommand { private set; get; } - public DelegateCommand ExtensionsCommand { private set; get; } public DelegateCommand SoundSampleRateCommand { private set; get; } public DelegateCommand SoundSpeedCommand { private set; get; } public DelegateCommand ImportDataCommand { private set; get; } - public DelegateCommand HelpCenterCommand { private set; get; } public DelegateCommand ShowLogCommand { private set; get; } public DelegateCommand ShowApplicationInfoCommand { private set; get; } public DelegateCommand SaveAudioCommand { private set; get; } @@ -530,16 +527,13 @@ //界面加载完成 WindowLoadedCommand = new DelegateCommand(WindowLoaded); CloseWindowCommand = new DelegateCommand(CloseWindow); - OpenFolderCommand = new DelegateCommand(OpenFolder); OpenImageFileCommand = new DelegateCommand(OpenImageFile); OpenAudioFileCommand = new DelegateCommand(OpenAudioFile); OpenListenAudioCommand = new DelegateCommand(OpenListenAudio); DetectNoiseCommand = new DelegateCommand(DetectNoise); - ExtensionsCommand = new DelegateCommand(ShowExtensions); SoundSampleRateCommand = new DelegateCommand(ShowSoundSampleRate); SoundSpeedCommand = new DelegateCommand(ShowSoundSpeed); ImportDataCommand = new DelegateCommand(ImportData); - HelpCenterCommand = new DelegateCommand(ShowHelpCenter); ShowLogCommand = new DelegateCommand(ShowLog); ShowApplicationInfoCommand = new DelegateCommand(ShowApplicationInfo); ShowWaveCommand = new DelegateCommand(ShowWave); @@ -631,11 +625,6 @@ } } - private void OpenFolder(Popup popup) - { - popup.IsOpen = true; - } - private void OpenImageFile(Popup popup) { _dialogService.Show("ScreenImageFileDialog", null, delegate { }); @@ -670,11 +659,6 @@ _dialogService.Show("DetectNoiseDialog", null, delegate { }); } - private void ShowExtensions(Popup popup) - { - popup.IsOpen = true; - } - private void ShowSoundSampleRate(Popup popup) { _dialogService.Show("SoundSampleRateDialog", null, delegate { }); @@ -738,11 +722,6 @@ popup.IsOpen = false; } - private void ShowHelpCenter(Popup popup) - { - popup.IsOpen = true; - } - private void ShowLog(Popup popup) { try diff --git a/Correlator/ViewModels/MainWindowViewModel.cs b/Correlator/ViewModels/MainWindowViewModel.cs index 8dfaa73..414c76c 100644 --- a/Correlator/ViewModels/MainWindowViewModel.cs +++ b/Correlator/ViewModels/MainWindowViewModel.cs @@ -468,7 +468,6 @@ public DelegateCommand WindowLoadedCommand { set; get; } public DelegateCommand CloseWindowCommand { private set; get; } - public DelegateCommand OpenFolderCommand { private set; get; } public DelegateCommand OpenImageFileCommand { private set; get; } public DelegateCommand OpenAudioFileCommand { private set; get; } public DelegateCommand OpenListenAudioCommand { private set; get; } @@ -476,11 +475,9 @@ public DelegateCommand OpenNumericKeypadCommand { private set; get; } public DelegateCommand PipeItemSelectedCommand { set; get; } public DelegateCommand DetectNoiseCommand { private set; get; } - public DelegateCommand ExtensionsCommand { private set; get; } public DelegateCommand SoundSampleRateCommand { private set; get; } public DelegateCommand SoundSpeedCommand { private set; get; } public DelegateCommand ImportDataCommand { private set; get; } - public DelegateCommand HelpCenterCommand { private set; get; } public DelegateCommand ShowLogCommand { private set; get; } public DelegateCommand ShowApplicationInfoCommand { private set; get; } public DelegateCommand SaveAudioCommand { private set; get; } @@ -530,16 +527,13 @@ //界面加载完成 WindowLoadedCommand = new DelegateCommand(WindowLoaded); CloseWindowCommand = new DelegateCommand(CloseWindow); - OpenFolderCommand = new DelegateCommand(OpenFolder); OpenImageFileCommand = new DelegateCommand(OpenImageFile); OpenAudioFileCommand = new DelegateCommand(OpenAudioFile); OpenListenAudioCommand = new DelegateCommand(OpenListenAudio); DetectNoiseCommand = new DelegateCommand(DetectNoise); - ExtensionsCommand = new DelegateCommand(ShowExtensions); SoundSampleRateCommand = new DelegateCommand(ShowSoundSampleRate); SoundSpeedCommand = new DelegateCommand(ShowSoundSpeed); ImportDataCommand = new DelegateCommand(ImportData); - HelpCenterCommand = new DelegateCommand(ShowHelpCenter); ShowLogCommand = new DelegateCommand(ShowLog); ShowApplicationInfoCommand = new DelegateCommand(ShowApplicationInfo); ShowWaveCommand = new DelegateCommand(ShowWave); @@ -631,11 +625,6 @@ } } - private void OpenFolder(Popup popup) - { - popup.IsOpen = true; - } - private void OpenImageFile(Popup popup) { _dialogService.Show("ScreenImageFileDialog", null, delegate { }); @@ -670,11 +659,6 @@ _dialogService.Show("DetectNoiseDialog", null, delegate { }); } - private void ShowExtensions(Popup popup) - { - popup.IsOpen = true; - } - private void ShowSoundSampleRate(Popup popup) { _dialogService.Show("SoundSampleRateDialog", null, delegate { }); @@ -738,11 +722,6 @@ popup.IsOpen = false; } - private void ShowHelpCenter(Popup popup) - { - popup.IsOpen = true; - } - private void ShowLog(Popup popup) { try diff --git a/Correlator/Views/MainWindow.xaml b/Correlator/Views/MainWindow.xaml index dd0a4d4..a6dc8c4 100644 --- a/Correlator/Views/MainWindow.xaml +++ b/Correlator/Views/MainWindow.xaml @@ -73,11 +73,7 @@ - -