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

Removed Vortex location from GUI

Browse Source
This commit is contained in:
Justin Swanson 2019-11-16 17:54:20 -06:00
parent 5cfc319822
commit 40d95cb034
2 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Wabbajack/View Models/Compilers/VortexCompilerVM.cs
View File

@ -30,9 +30,6 @@ namespace Wabbajack
[Reactive]
public FilePickerVM GameLocation { get; set; }
[Reactive]
public FilePickerVM VortexLocation { get; set; }
[Reactive]
public FilePickerVM DownloadsLocation { get; set; }
@ -47,12 +44,6 @@ namespace Wabbajack
PathType = FilePickerVM.PathTypeOptions.Folder,
PromptTitle = "Select Game Folder Location"
};
this.VortexLocation = new FilePickerVM()
{
DoExistsCheck = true,
PathType = FilePickerVM.PathTypeOptions.Folder,
PromptTitle = "Select Vortex Install Folder"
};
this.DownloadsLocation = new FilePickerVM()
{
DoExistsCheck = false,
@ -70,10 +61,9 @@ namespace Wabbajack
this.BeginCommand = ReactiveCommand.CreateFromTask(
canExecute: Observable.CombineLatest(
this.WhenAny(x => x.GameLocation.InError),
this.WhenAny(x => x.VortexLocation.InError),
this.WhenAny(x => x.DownloadsLocation.InError),
this.WhenAny(x => x.StagingLocation.InError),
resultSelector: (g, v, d, s) => !g && !v && !d && !s)
resultSelector: (g, d, s) => !g && !d && !s)
.ObserveOnGuiThread(),
execute: async () =>
{
@ -83,7 +73,7 @@ namespace Wabbajack
compiler = new VortexCompiler(
game: this.SelectedGame,
gamePath: this.GameLocation.TargetPath,
vortexFolder: this.VortexLocation.TargetPath,
vortexFolder: VortexCompiler.TypicalVortexFolder(),
downloadsFolder: this.DownloadsLocation.TargetPath,
stagingFolder: this.StagingLocation.TargetPath);
}

23
Wabbajack/Views/Compilers/VortexCompilerConfigView.xaml
View File

@ -61,28 +61,11 @@
HorizontalAlignment="Right"
VerticalAlignment="Center"
FontSize="14"
Text="Vortex Location"
TextAlignment="Center"
ToolTip="The Vortex program installation location" />
<local:FilePicker
Grid.Row="0"
Grid.Column="6"
Height="30"
VerticalAlignment="Center"
DataContext="{Binding VortexLocation}"
FontSize="14"
ToolTip="The Vortex program installation location" />
<TextBlock
Grid.Row="1"
Grid.Column="4"
HorizontalAlignment="Right"
VerticalAlignment="Center"
FontSize="14"
Text="Download Location"
TextAlignment="Center"
ToolTip="The folder to downloads your mods" />
<local:FilePicker
Grid.Row="1"
Grid.Row="0"
Grid.Column="6"
Height="30"
VerticalAlignment="Center"
@ -90,7 +73,7 @@
FontSize="14"
ToolTip="The folder to downloads your mods" />
<TextBlock
Grid.Row="2"
Grid.Row="1"
Grid.Column="4"
HorizontalAlignment="Right"
VerticalAlignment="Center"
@ -98,7 +81,7 @@
Text="Staging Location"
TextAlignment="Center" />
<local:FilePicker
Grid.Row="2"
Grid.Row="1"
Grid.Column="6"
Height="30"
VerticalAlignment="Center"