Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move Resource usage display

Browse Source
This commit is contained in:
Timothy Baldridge
2022-05-20 16:33:09 -06:00
parent 7ab7565d16
commit ec4586cd82
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Wabbajack.App.Wpf/View Models/MainWindowVM.cs
View File

@ -67,6 +67,9 @@ namespace Wabbajack
[Reactive] [Reactive]
public string ResourceStatus { get; set; } public string ResourceStatus { get; set; }
[Reactive]
public string AppName { get; set; }
[Reactive] [Reactive]
public bool UpdateAvailable { get; private set; } public bool UpdateAvailable { get; private set; }
@ -130,6 +133,7 @@ namespace Wabbajack
var fvi = FileVersionInfo.GetVersionInfo(assembly.Location); var fvi = FileVersionInfo.GetVersionInfo(assembly.Location);
Consts.CurrentMinimumWabbajackVersion = Version.Parse(fvi.FileVersion); Consts.CurrentMinimumWabbajackVersion = Version.Parse(fvi.FileVersion);
VersionDisplay = $"v{fvi.FileVersion}"; VersionDisplay = $"v{fvi.FileVersion}";
AppName = "WABBAJACK " + VersionDisplay;
_logger.LogInformation("Wabbajack Version: {FileVersion}", fvi.FileVersion); _logger.LogInformation("Wabbajack Version: {FileVersion}", fvi.FileVersion);
Task.Run(() => _wjClient.SendMetric("started_wabbajack", fvi.FileVersion)).FireAndForget(); Task.Run(() => _wjClient.SendMetric("started_wabbajack", fvi.FileVersion)).FireAndForget();

17
Wabbajack.App.Wpf/Views/MainWindow.xaml
View File

@ -31,12 +31,19 @@
<RowDefinition Height="*"></RowDefinition> <RowDefinition Height="*"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition> <RowDefinition Height="Auto"></RowDefinition>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal"> <Grid Grid.Row="0" Margin="5">
<TextBlock FontSize="16" Margin="0, 0, 8, 0">WABBAJACK 3.0.0</TextBlock> <Grid.ColumnDefinitions>
<Button Name="SettingsButton"> <ColumnDefinition Width="Auto"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="Auto"></ColumnDefinition>
<ColumnDefinition Width="140"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" FontSize="16" Margin="0, 0, 8, 0" Name="AppName"></TextBlock>
<TextBlock Grid.Column="1" Margin="5, 0" Name="ResourceUsage" HorizontalAlignment="Right"></TextBlock>
<Button Grid.Column="2" Name="SettingsButton">
<icon:Material Kind="Cog"></icon:Material> <icon:Material Kind="Cog"></icon:Material>
</Button> </Button>
</StackPanel> </Grid>
<ContentPresenter Grid.Row="1" Content="{Binding ActivePane}"> <ContentPresenter Grid.Row="1" Content="{Binding ActivePane}">
<ContentPresenter.Resources> <ContentPresenter.Resources>
<DataTemplate DataType="{x:Type local:CompilerVM}"> <DataTemplate DataType="{x:Type local:CompilerVM}">
@ -62,7 +69,7 @@
</DataTemplate> </DataTemplate>
</ContentPresenter.Resources> </ContentPresenter.Resources>
</ContentPresenter> </ContentPresenter>
<TextBlock Grid.Row="1" Margin="5, 0" Name="ResourceUsage" HorizontalAlignment="Right"></TextBlock>
</Grid> </Grid>
<mahapps:MetroWindow.RightWindowCommands> <mahapps:MetroWindow.RightWindowCommands>

11
Wabbajack.App.Wpf/Views/MainWindow.xaml.cs
View File

@ -119,15 +119,12 @@ namespace Wabbajack
_logger.LogError(ex, "During Main Window Startup"); _logger.LogError(ex, "During Main Window Startup");
Environment.Exit(-1); Environment.Exit(-1);
} }
/*
vm.WhenAnyValue(vm => vm.ResourceStatus) vm.WhenAnyValue(vm => vm.ResourceStatus)
.BindToStrict(this, view => view.ResourceUsage.Text); .BindToStrict(this, view => view.ResourceUsage.Text);
vm.WhenAnyValue(vm => vm.AppName)
vm.WhenAnyValue(vm => vm.ResourceStatus) .BindToStrict(this, view => view.AppName.Text);
.Select(x => string.IsNullOrWhiteSpace(x) ? Visibility.Collapsed : Visibility.Visible)
.BindToStrict(this, view => view.ResourceUsage.Visibility);*/
} }
public void Init(MainWindowVM vm, MainSettings settings) public void Init(MainWindowVM vm, MainSettings settings)