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

Made title/author/summary text derivative in InstallerVM

Browse Source 
So it will snap back to modlist info when slideshow not active
This commit is contained in:
Justin Swanson 2019-10-31 20:02:39 -05:00
parent 1c727909ce
commit b96ce29789
2 changed files with 46 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Wabbajack/View Models/InstallerVM.cs
View File

@ -77,6 +77,15 @@ namespace Wabbajack
private readonly ObservableAsPropertyHelper<BitmapImage> _Image;
public BitmapImage Image => _Image.Value;
private readonly ObservableAsPropertyHelper<string> _TitleText;
public string TitleText => _TitleText.Value;
private readonly ObservableAsPropertyHelper<string> _AuthorText;
public string AuthorText => _AuthorText.Value;
private readonly ObservableAsPropertyHelper<string> _Summary;
public string Summary => _Summary.Value;
// Command properties
public IReactiveCommand BeginCommand { get; }
public IReactiveCommand ShowReportCommand { get; }
@ -188,19 +197,34 @@ namespace Wabbajack
.Replay(1)
.RefCount();
// Set displayed image to modlist image if configuring, or to the current slideshow image if installing
// Set display items to modlist if configuring or complete,
// or to the current slideshow data if installing
this._Image = Observable.CombineLatest(
modListImage
.StartWith(default(BitmapImage)),
this.WhenAny(x => x.Slideshow.Image)
.StartWith(default(BitmapImage)),
this.WhenAny(x => x.Installing)
.StartWith(false),
resultSelector: (modList, slideshow, installing) =>
{
return installing ? slideshow : modList;
})
modListImage
.StartWith(default(BitmapImage)),
this.WhenAny(x => x.Slideshow.Image)
.StartWith(default(BitmapImage)),
this.WhenAny(x => x.Installing),
resultSelector: (modList, slideshow, installing) => installing ? slideshow : modList)
.ToProperty(this, nameof(this.Image));
this._TitleText = Observable.CombineLatest(
this.WhenAny(x => x.ModListName),
this.WhenAny(x => x.Slideshow.ModName),
this.WhenAny(x => x.Installing),
resultSelector: (modList, mod, installing) => installing ? mod : modList)
.ToProperty(this, nameof(this.TitleText));
this._AuthorText = Observable.CombineLatest(
this.WhenAny(x => x.ModListName),
this.WhenAny(x => x.Slideshow.AuthorName),
this.WhenAny(x => x.Installing),
resultSelector: (modList, mod, installing) => installing ? mod : modList)
.ToProperty(this, nameof(this.AuthorText));
this._Summary = Observable.CombineLatest(
this.WhenAny(x => x.ModListName),
this.WhenAny(x => x.Slideshow.Summary),
this.WhenAny(x => x.Installing),
resultSelector: (modList, mod, installing) => installing ? mod : modList)
.ToProperty(this, nameof(this.Summary));
// Define commands
this.ShowReportCommand = ReactiveCommand.Create(ShowReport);

22
Wabbajack/Views/InstallationView.xaml
View File

@ -56,7 +56,7 @@
<RowDefinition Height="*" MinHeight="150" />
</Grid.RowDefinitions>
<!-- Slideshow -->
<Grid Grid.Row="2" DataContext="{Binding Slideshow}" Margin="0,0,0,5" x:Name="Slideshow" >
<Grid Grid.Row="2" Margin="0,0,0,5" x:Name="Slideshow" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="5*" />
<ColumnDefinition Width="3*" />
@ -68,7 +68,7 @@
<Viewbox
Grid.Column="0"
Grid.ColumnSpan="2" Stretch="UniformToFill" HorizontalAlignment="Center" VerticalAlignment="Center" >
<Image Source="{Binding Installer.Image}" />
<Image Source="{Binding Image}" />
</Viewbox>
<Image
Grid.Column="0"
@ -77,7 +77,7 @@
Height="60"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Source="{Binding Installer.ModlistImage}" />
Source="{Binding ModlistImage}" />
<Grid Grid.Column="0" >
<Grid.RowDefinitions>
<RowDefinition Height="*" />
@ -93,7 +93,7 @@
Grid.Row="1"
Grid.Column="0"
VerticalAlignment="Bottom"
Text="{Binding ModName}"
Text="{Binding TitleText}"
FontSize="65"
Margin="20,25,20,0"
FontFamily="Lucida Sans"
@ -110,7 +110,7 @@
Margin="55,0,20,20"
FontFamily="Lucida Sans"
FontWeight="Bold"
Text="{Binding AuthorName}"
Text="{Binding AuthorText}"
TextWrapping="Wrap" >
<TextBlock.Effect>
<DropShadowEffect />
@ -142,7 +142,7 @@
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding IsMouseOver, ElementName=Slideshow}" Value="True" />
<Condition Binding="{Binding InstallingMode}" Value="True" />
<Condition Binding="{Binding Installing}" Value="True" />
</MultiDataTrigger.Conditions>
<MultiDataTrigger.EnterActions>
<BeginStoryboard>
@ -173,13 +173,13 @@
Background="{StaticResource BackgroundBrush}"
Height="60"
Width="60"
Command="{Binding SlideShowNextItemCommand}"
Command="{Binding Slideshow.SlideShowNextItemCommand}"
ToolTip="Skip to the next mod"
Margin="6,6,6,12">
<icon:PackIconFontAwesome Kind="ChevronRightSolid" Height="28" Width="28" />
</Button>
<ToggleButton Grid.Row="1"
IsChecked="{Binding Enable}"
IsChecked="{Binding Slideshow.Enable}"
Style="{StaticResource SlideshowButton}"
Background="{StaticResource BackgroundBrush}"
x:Name="PlayPauseButton"
@ -190,7 +190,7 @@
<Style TargetType="icon:PackIconMaterial">
<Setter Property="Kind" Value="Pause" />
<Style.Triggers>
<DataTrigger Binding="{Binding Enable}" Value="True" >
<DataTrigger Binding="{Binding Slideshow.Enable}" Value="True" >
<Setter Property="Kind" Value="Play" />
</DataTrigger>
</Style.Triggers>
@ -199,7 +199,7 @@
</icon:PackIconMaterial>
</ToggleButton>
<ToggleButton Grid.Row="2"
IsChecked="{Binding ShowNSFW}"
IsChecked="{Binding Slideshow.ShowNSFW}"
Style="{StaticResource SlideshowButton}"
ToolTip="Show NSFW mods"
Background="{StaticResource BackgroundBrush}">
@ -217,7 +217,7 @@
Height="40"
Width="40"
Kind="CircleSlash"
Visibility="{Binding ShowNSFW, Converter={StaticResource bool2VisibilityConverter}, ConverterParameter=False}" />
Visibility="{Binding Slideshow.ShowNSFW, Converter={StaticResource bool2VisibilityConverter}, ConverterParameter=False}" />
</Grid>
</ToggleButton>
</Grid>