DrakiaXYZ/SPT-AKI-Installer
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'impr/cache-info-display' (#68) from waffle.lord/SPT-AKI-Installer:impr/cache-info-display into master

Browse Source 
Reviewed-on: CWX/SPT-AKI-Installer#68
This commit is contained in:
IsWaffle 2024-03-25 23:21:35 +00:00
commit ef487334fb
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SPTInstaller/CustomControls/CacheInfo.axaml
View File

@ -10,22 +10,22 @@
<convt:StatusSpinnerIsProcessingConverter x:Key="IsInProcessingStateConverter"/> <convt:StatusSpinnerIsProcessingConverter x:Key="IsInProcessingStateConverter"/>
</UserControl.Resources> </UserControl.Resources>
<Grid ColumnDefinitions="AUTO,10,AUTO,10,AUTO"> <Grid RowDefinitions="Auto,Auto" ColumnDefinitions="*,AUTO,10,AUTO,*">
<cc:StatusSpinner State="{Binding State, RelativeSource={RelativeSource AncestorType=UserControl}}" <cc:StatusSpinner Grid.Column="1" State="{Binding State, RelativeSource={RelativeSource AncestorType=UserControl}}"
IsVisible="{Binding State, RelativeSource={RelativeSource AncestorType=UserControl}, IsVisible="{Binding State, RelativeSource={RelativeSource AncestorType=UserControl},
Converter={StaticResource IsInProcessingStateConverter}}" Converter={StaticResource IsInProcessingStateConverter}}"
/> />
<Path Data="{StaticResource Cache}" Fill="DodgerBlue" Margin="0 6 0 0" <Path Grid.Column="1" Data="{StaticResource Cache}" Fill="DodgerBlue" Margin="0 6 0 0"
IsVisible="{Binding State, RelativeSource={RelativeSource AncestorType=UserControl}, IsVisible="{Binding State, RelativeSource={RelativeSource AncestorType=UserControl},
Converter={StaticResource IsInProcessingStateConverter}, Converter={StaticResource IsInProcessingStateConverter},
ConverterParameter=invert}" ConverterParameter=invert}"
/> />
<Label Grid.Column="2" Content="{Binding InfoText, RelativeSource={RelativeSource AncestorType=UserControl}}" <Label Grid.Column="3" Content="{Binding InfoText, RelativeSource={RelativeSource AncestorType=UserControl}}"
Margin="0 2 0 0" Margin="0 2 0 0"
/> />
<Button Grid.Column="4" Content="What's this?" Classes="link" <Button Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Content="What's this?" Classes="link" HorizontalAlignment="Center"
Command="{Binding ShowCacheDialogCommand, RelativeSource={RelativeSource AncestorType=UserControl}}"/> Command="{Binding ShowCacheDialogCommand, RelativeSource={RelativeSource AncestorType=UserControl}}"/>
</Grid> </Grid>
</UserControl> </UserControl>

11
SPTInstaller/Helpers/FileHelper.cs
View File

@ -176,15 +176,16 @@ public static class FileHelper
var problemNames = new Dictionary<string, PathCheckType>() var problemNames = new Dictionary<string, PathCheckType>()
{ {
{ "Desktop", PathCheckType.EndsWith }, { "Desktop", PathCheckType.EndsWith },
{ "Downloads", PathCheckType.EndsWith }, { "Documents", PathCheckType.EndsWith },
{ "Documents", PathCheckType.EndsWith}, { "scoped_dir", PathCheckType.Contains },
{ "Downloads", PathCheckType.Contains },
{ "OneDrive", PathCheckType.Contains }, { "OneDrive", PathCheckType.Contains },
{ "NextCloud", PathCheckType.Contains }, { "NextCloud", PathCheckType.Contains },
{ "DropBox", PathCheckType.Contains }, { "DropBox", PathCheckType.Contains },
{ "Google", PathCheckType.Contains }, { "Google", PathCheckType.Contains },
{ "Program Files", PathCheckType.Contains}, { "Program Files", PathCheckType.Contains },
{ "Program Files (x86)", PathCheckType.Contains}, { "Program Files (x86)", PathCheckType.Contains },
{ "Drive Root", PathCheckType.DriveRoot} { "Drive Root", PathCheckType.DriveRoot }
}; };
foreach (var name in problemNames) foreach (var name in problemNames)

4
SPTInstaller/SPTInstaller.csproj
View File

@ -9,8 +9,8 @@
<PackageIcon>icon.ico</PackageIcon> <PackageIcon>icon.ico</PackageIcon>
<ApplicationIcon>Assets\icon.ico</ApplicationIcon> <ApplicationIcon>Assets\icon.ico</ApplicationIcon>
<Configurations>Debug;Release;TEST</Configurations> <Configurations>Debug;Release;TEST</Configurations>
<AssemblyVersion>2.52</AssemblyVersion> <AssemblyVersion>2.53</AssemblyVersion>
<FileVersion>2.52</FileVersion> <FileVersion>2.53</FileVersion>
<Company>SPT-AKI</Company> <Company>SPT-AKI</Company>
</PropertyGroup> </PropertyGroup>