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 "SplashScreen" naming prefix

Browse Source
This commit is contained in:
Justin Swanson 2019-10-13 17:08:50 -05:00
parent 63f5ac2f65
commit 2f5b789d11
4 changed files with 38 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Wabbajack/AppState.cs
View File

@ -237,9 +237,6 @@ namespace Wabbajack
}
}
private bool _splashShowNSFW = false;
public bool SplashShowNSFW { get => _splashShowNSFW; set => this.RaiseAndSetIfChanged(ref _splashShowNSFW, value); }
public string Error => "Error";
public string this[string columnName] => Validate(columnName);
@ -367,9 +364,9 @@ namespace Wabbajack
var compiler = new Compiler(_mo2Folder)
{
MO2Profile = ModListName,
ModListName = ChangedProperties ? this.Slideshow.SplashScreenModName : null,
ModListAuthor = ChangedProperties ? this.Slideshow.SplashScreenAuthorName : null,
ModListDescription = ChangedProperties ? this.Slideshow.SplashScreenSummary : null,
ModListName = ChangedProperties ? this.Slideshow.ModName : null,
ModListAuthor = ChangedProperties ? this.Slideshow.AuthorName : null,
ModListDescription = ChangedProperties ? this.Slideshow.Summary : null,
ModListImage = ChangedProperties ? newImagePath : null,
ModListWebsite = ChangedProperties ? _nexusSiteURL : null,
ModListReadme = ChangedProperties ? readmePath : null

8
Wabbajack/UI/ModlistPropertiesWindow.xaml.cs
View File

@ -45,12 +45,12 @@ namespace Wabbajack
{
BitmapImage splashScreen = new BitmapImage(new Uri(newBannerFile));
state.newImagePath = newBannerFile;
state.Slideshow.SplashScreenImage = splashScreen;
state.Slideshow.Image = splashScreen;
}
state.Slideshow.SplashScreenModName = ModlistNameProperty.Text;
state.Slideshow.SplashScreenSummary = ModlistDescriptionProperty.Text;
state.Slideshow.SplashScreenAuthorName = ModlistAuthorProperty.Text;
state.Slideshow.ModName = ModlistNameProperty.Text;
state.Slideshow.Summary = ModlistDescriptionProperty.Text;
state.Slideshow.AuthorName = ModlistAuthorProperty.Text;
state._nexusSiteURL = ModlistWebsiteProperty.Text;
state.readmePath = ModlistReadmeProperty.Text;

50
Wabbajack/UI/SlideShow.cs
View File

@ -63,20 +63,20 @@ namespace Wabbajack
private bool _GCAfterUpdating = true;
public bool GCAfterUpdating { get => _GCAfterUpdating; set => this.RaiseAndSetIfChanged(ref _GCAfterUpdating, value); }
private bool _EnableSlideShow = true;
public bool EnableSlideShow { get => _EnableSlideShow; set => this.RaiseAndSetIfChanged(ref _EnableSlideShow, value); }
private bool _Enable = true;
public bool Enable { get => _Enable; set => this.RaiseAndSetIfChanged(ref _Enable, value); }
private BitmapImage _SplashScreenImage;
public BitmapImage SplashScreenImage { get => _SplashScreenImage; set => this.RaiseAndSetIfChanged(ref _SplashScreenImage, value); }
private BitmapImage _Image;
public BitmapImage Image { get => _Image; set => this.RaiseAndSetIfChanged(ref _Image, value); }
private string _SplashScreenModName = "Wabbajack";
public string SplashScreenModName { get => _SplashScreenModName; set => this.RaiseAndSetIfChanged(ref _SplashScreenModName, value); }
private string _ModName = "Wabbajack";
public string ModName { get => _ModName; set => this.RaiseAndSetIfChanged(ref _ModName, value); }
private string _SplashScreenAuthorName = "Halgari & the Wabbajack Team";
public string SplashScreenAuthorName { get => _SplashScreenAuthorName; set => this.RaiseAndSetIfChanged(ref _SplashScreenAuthorName, value); }
private string _AuthorName = "Halgari & the Wabbajack Team";
public string AuthorName { get => _AuthorName; set => this.RaiseAndSetIfChanged(ref _AuthorName, value); }
private string _SplashScreenSummary;
public string SplashScreenSummary { get => _SplashScreenSummary; set => this.RaiseAndSetIfChanged(ref _SplashScreenSummary, value); }
private string _Summary;
public string Summary { get => _Summary; set => this.RaiseAndSetIfChanged(ref _Summary, value); }
public IReactiveCommand SlideShowNextItemCommand { get; } = ReactiveCommand.Create(() => { });
@ -93,23 +93,23 @@ namespace Wabbajack
.NotNull()
.Subscribe(modList =>
{
this.SplashScreenModName = modList.Name;
this.SplashScreenAuthorName = modList.Author;
this.SplashScreenSummary = modList.Description;
this.ModName = modList.Name;
this.AuthorName = modList.Author;
this.Summary = modList.Description;
})
.DisposeWith(this.CompositeDisposable);
// Update splashscreen when modlist changes
Observable.CombineLatest(
this.WhenAny(x => x.AppState.ModList),
this.WhenAny(x => x.AppState.ModListPath),
this.WhenAny(x => x.EnableSlideShow),
(modList, modListPath, enableSlideShow) => (modList, modListPath, enableSlideShow))
(this).WhenAny(x => x.AppState.ModList),
(this).WhenAny(x => x.AppState.ModListPath),
(this).WhenAny(x => x.Enable),
(modList, modListPath, enabled) => (modList, modListPath, enabled))
// Do any potential unzipping on a background thread
.ObserveOn(RxApp.TaskpoolScheduler)
.Select(u =>
{
if (u.enableSlideShow
if (u.enabled
&& u.modList != null
&& u.modListPath != null
&& File.Exists(u.modListPath)
@ -144,7 +144,7 @@ namespace Wabbajack
})
.ObserveOn(RxApp.MainThreadScheduler)
.StartWith(this.WabbajackLogo)
.Subscribe(bitmap => this.SplashScreenImage = bitmap)
.Subscribe(bitmap => this.Image = bitmap)
.DisposeWith(this.CompositeDisposable);
/// Wire slideshow updates
@ -159,7 +159,7 @@ namespace Wabbajack
// Only subscribe to slideshow triggers if enabled and installing
.FilterSwitch(
Observable.CombineLatest(
this.WhenAny(x => x.EnableSlideShow),
this.WhenAny(x => x.Enable),
this.WhenAny(x => x.AppState.Installing),
resultSelector: (enabled, installing) => enabled && installing))
// Don't ever update more than once every half second. ToDo: Update to debounce
@ -205,16 +205,16 @@ namespace Wabbajack
if (!slide.IsNSFW || (slide.IsNSFW && ShowNSFW))
{
this.SplashScreenImage = AppState._noneImage;
this.Image = AppState._noneImage;
if (slide.ImageURL != null && slide.Image != null)
{
if (!CachedSlides.ContainsKey(slide.ModID)) return;
this.SplashScreenImage = slide.Image;
this.Image = slide.Image;
}
this.SplashScreenModName = slide.ModName;
this.SplashScreenAuthorName = slide.ModAuthor;
this.SplashScreenSummary = slide.ModDescription;
this.ModName = slide.ModName;
this.AuthorName = slide.ModAuthor;
this.Summary = slide.ModDescription;
AppState._nexusSiteURL = slide.ModURL;
}

14
Wabbajack/UI/SlideshowView.xaml
View File

@ -24,7 +24,7 @@
</Grid.RowDefinitions>
<Image
Grid.Row="0"
Source="{Binding SplashScreenImage}"
Source="{Binding Image}"
Stretch="Fill" />
<Button
Grid.Row="1"
@ -61,20 +61,20 @@
FontSize="30"
FontWeight="Bold"
Margin="6,0,0,0"
Text="{Binding SplashScreenModName}" />
Text="{Binding ModName}" />
<TextBlock
Grid.Row="1"
FontSize="15"
FontWeight="Bold"
Margin="6,0,0,6"
Text="{Binding SplashScreenAuthorName}" />
Text="{Binding AuthorName}" />
<TextBlock
Grid.Row="2"
FontSize="15"
FontWeight="Bold"
Padding="5"
Background="{StaticResource TextBoxBackground}"
Text="{Binding SplashScreenSummary}"
Text="{Binding Summary}"
TextWrapping="Wrap" />
<Grid Grid.Row="3" VerticalAlignment="Bottom">
<Grid.ColumnDefinitions>
@ -83,19 +83,17 @@
<ColumnDefinition Width="48" />
</Grid.ColumnDefinitions>
<CheckBox
Name="EnableSlideShow"
Margin="6,0,0,0"
Grid.Column="0"
VerticalAlignment="Center"
IsChecked="{Binding EnableSlideShow}">
IsChecked="{Binding Enable}">
Enable the Slideshow
</CheckBox>
<CheckBox
Name="ShowNSFWContent"
Grid.Column="1"
Margin="15,0,0,0"
VerticalAlignment="Center"
IsChecked="{Binding SplashShowNSFW}">
IsChecked="{Binding ShowNSFW}">
Show NSFW Mods in the Slideshow
</CheckBox>
<Button