From cfcadc80b076153b55c502a1cbee55dcb580b5a1 Mon Sep 17 00:00:00 2001 From: Omar Date: Thu, 28 Oct 2021 17:54:10 -0400 Subject: [PATCH] Add log clear function --- src/nxDumpFuse/ViewModels/FuseViewModel.cs | 14 +++++++ src/nxDumpFuse/Views/FuseView.axaml | 47 +++++++++++++--------- 2 files changed, 42 insertions(+), 19 deletions(-) diff --git a/src/nxDumpFuse/ViewModels/FuseViewModel.cs b/src/nxDumpFuse/ViewModels/FuseViewModel.cs index 8a419dc..84dee2d 100644 --- a/src/nxDumpFuse/ViewModels/FuseViewModel.cs +++ b/src/nxDumpFuse/ViewModels/FuseViewModel.cs @@ -22,6 +22,7 @@ namespace nxDumpFuse.ViewModels SelectOutputFolderCommand = ReactiveCommand.Create(SelectOutputFolder); FuseCommand = ReactiveCommand.Create(FuseNxDump); StopCommand = ReactiveCommand.Create(StopDump); + ClearLogCommand = ReactiveCommand.Create(ClearLog); ProgressPartText = "Part 0/0"; } @@ -29,11 +30,14 @@ namespace nxDumpFuse.ViewModels public ReactiveCommand SelectOutputFolderCommand { get; } + public ReactiveCommand ClearLogCommand { get; } + public ReactiveCommand FuseCommand { get; } public ReactiveCommand StopCommand { get; } private string _inputFilePath = string.Empty; + public string InputFilePath { get => _inputFilePath; @@ -41,6 +45,7 @@ namespace nxDumpFuse.ViewModels } private string _outputDir = string.Empty; + public string OutputDir { get => _outputDir; @@ -48,6 +53,7 @@ namespace nxDumpFuse.ViewModels } private string _progressPartText = string.Empty; + public string ProgressPartText { get => _progressPartText; @@ -55,6 +61,7 @@ namespace nxDumpFuse.ViewModels } private double _progressPart; + public double ProgressPart { get => _progressPart; @@ -62,6 +69,7 @@ namespace nxDumpFuse.ViewModels } private double _progress; + public double Progress { get => _progress; @@ -69,6 +77,7 @@ namespace nxDumpFuse.ViewModels } private ObservableCollection _logItems = new(); + public ObservableCollection LogItems { get => _logItems; @@ -104,6 +113,11 @@ namespace nxDumpFuse.ViewModels _fuse?.StopFuse(); } + private void ClearLog() + { + LogItems.Clear(); + } + private void OnFuseUpdate(FuseUpdateInfo fuseUpdateInfo) { ProgressPart = fuseUpdateInfo.ProgressPart; diff --git a/src/nxDumpFuse/Views/FuseView.axaml b/src/nxDumpFuse/Views/FuseView.axaml index e617bfd..ff04443 100644 --- a/src/nxDumpFuse/Views/FuseView.axaml +++ b/src/nxDumpFuse/Views/FuseView.axaml @@ -37,25 +37,34 @@ - - - - - - - - + + + + + + + + + + + + +