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

Slideshow margin styling tweaks

Browse Source
This commit is contained in:
Justin Swanson 2019-10-13 15:24:33 -05:00
parent 3bbeedf2c9
commit 63f5ac2f65
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Wabbajack/NexusApi/NexusApi.cs
View File

@ -266,11 +266,11 @@ namespace Wabbajack.NexusApi
}
public static IEnumerable<UI.Slide> CachedSlideShow
public static IEnumerable<Slide> CachedSlideShow
{
get
{
if (!Directory.Exists(Consts.NexusCacheDirectory)) return new UI.Slide[] { };
if (!Directory.Exists(Consts.NexusCacheDirectory)) return new Slide[] { };
return Directory.EnumerateFiles(Consts.NexusCacheDirectory)
.Where(f => f.EndsWith(".json"))
@ -288,7 +288,7 @@ namespace Wabbajack.NexusApi
})
.Where(m => m != null)
.Where(m => m._internal_version == CACHED_VERSION_NUMBER && m.picture_url != null)
.Select(m => new UI.Slide(m.name,m.mod_id,m.summary,m.author,m.contains_adult_content,GetModURL(m.game_name,m.mod_id),m.picture_url));
.Select(m => new Slide(m.name,m.mod_id,m.summary,m.author,m.contains_adult_content,GetModURL(m.game_name,m.mod_id),m.picture_url));
}
}

1
Wabbajack/UI/MainWindow.xaml
View File

@ -50,6 +50,7 @@
Grid.Row="1"
Grid.Column="0"
Grid.ColumnSpan="2"
Margin="0,0,0,4"
DataContext="{Binding Slideshow}" />
<ProgressBar

2
Wabbajack/UI/SlideShow.cs
View File

@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using Wabbajack.Common;
using Wabbajack.NexusApi;
namespace Wabbajack.UI
namespace Wabbajack
{
public class Slide
{

19
Wabbajack/UI/SlideshowView.xaml
View File

@ -5,18 +5,19 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Wabbajack"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DataContext="{d:DesignInstance local:Slideshow}"
d:DesignHeight="450"
d:DesignWidth="800"
mc:Ignorable="d">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="4" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid
Grid.Row="1"
Grid.Column="0"
Margin="0,0,2,4">
Grid.Column="0">
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="30" />
@ -47,8 +48,7 @@
</Grid>
<Grid
Grid.Row="1"
Grid.Column="1"
Margin="2,0,0,4">
Grid.Column="2">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
@ -60,16 +60,20 @@
Grid.Row="0"
FontSize="30"
FontWeight="Bold"
Margin="6,0,0,0"
Text="{Binding SplashScreenModName}" />
<TextBlock
Grid.Row="1"
FontSize="15"
FontWeight="Bold"
Margin="6,0,0,6"
Text="{Binding SplashScreenAuthorName}" />
<TextBlock
Grid.Row="2"
FontSize="15"
FontWeight="Bold"
Padding="5"
Background="{StaticResource TextBoxBackground}"
Text="{Binding SplashScreenSummary}"
TextWrapping="Wrap" />
<Grid Grid.Row="3" VerticalAlignment="Bottom">
@ -80,15 +84,17 @@
</Grid.ColumnDefinitions>
<CheckBox
Name="EnableSlideShow"
Margin="6,0,0,0"
Grid.Column="0"
Margin="0,10,0,0"
VerticalAlignment="Center"
IsChecked="{Binding EnableSlideShow}">
Enable the Slideshow
</CheckBox>
<CheckBox
Name="ShowNSFWContent"
Grid.Column="1"
Margin="4,10,0,0"
Margin="15,0,0,0"
VerticalAlignment="Center"
IsChecked="{Binding SplashShowNSFW}">
Show NSFW Mods in the Slideshow
</CheckBox>
@ -96,6 +102,7 @@
Grid.Column="2"
Height="30"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Command="{Binding SlideShowNextItemCommand}"
ToolTip="Skip to next slide">
<DockPanel>