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

Folder restructuring

Browse Source
This commit is contained in:
Justin Swanson 2019-10-21 20:08:26 -05:00
parent 5dce9a1e78
commit 4f8167555d
29 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Wabbajack/App.xaml
View File

@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:Wabbajack" xmlns:local="clr-namespace:Wabbajack"
StartupUri="UI\ModeSelectionWindow.xaml" StartupUri="Views\ModeSelectionWindow.xaml"
ShutdownMode="OnExplicitShutdown"> ShutdownMode="OnExplicitShutdown">
<Application.Resources> <Application.Resources>
<ResourceDictionary> <ResourceDictionary>

0
Wabbajack/Themes/LeftMarginMultiplierConverter.cs → Wabbajack/Converters/LeftMarginMultiplierConverter.cs
View File

0
Wabbajack/UI/Icons/discord.png → Wabbajack/Resources/Icons/discord.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

0
Wabbajack/UI/Icons/github.png → Wabbajack/Resources/Icons/github.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

0
Wabbajack/UI/Icons/github_light.png → Wabbajack/Resources/Icons/github_light.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

0
Wabbajack/UI/Icons/next.png → Wabbajack/Resources/Icons/next.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 512 B

After

Width:  |  Height:  |  Size: 512 B

0
Wabbajack/UI/Icons/patreon.png → Wabbajack/Resources/Icons/patreon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

0
Wabbajack/UI/Icons/patreon_light.png → Wabbajack/Resources/Icons/patreon_light.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
Wabbajack/UI/Icons/wabbajack.ico → Wabbajack/Resources/Icons/wabbajack.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 399 KiB

After

Width:  |  Height:  |  Size: 399 KiB

0
Wabbajack/UI/banner.png → Wabbajack/Resources/banner.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 122 KiB

After

Width:  |  Height:  |  Size: 122 KiB

0
Wabbajack/UI/banner_dark.png → Wabbajack/Resources/banner_dark.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 139 KiB

After

Width:  |  Height:  |  Size: 139 KiB

0
Wabbajack/UI/banner_small.png → Wabbajack/Resources/banner_small.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 59 KiB

0
Wabbajack/UI/banner_small_dark.png → Wabbajack/Resources/banner_small_dark.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 129 KiB

After

Width:  |  Height:  |  Size: 129 KiB

0
Wabbajack/UI/none.jpg → Wabbajack/Resources/none.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

0
Wabbajack/AutoScrollBehavior.cs → Wabbajack/Util/AutoScrollBehavior.cs
View File

0
Wabbajack/Themes/TreeViewItemExtensions.cs → Wabbajack/Util/TreeViewItemExtensions.cs
View File

3
Wabbajack/AppState.cs → Wabbajack/View Models/AppState.cs
View File

@ -21,7 +21,6 @@ using System.Windows.Threading;
using Wabbajack.Common; using Wabbajack.Common;
using Wabbajack.Lib.Downloaders; using Wabbajack.Lib.Downloaders;
using Wabbajack.Lib.NexusApi; using Wabbajack.Lib.NexusApi;
using Wabbajack.UI;
using DynamicData; using DynamicData;
using DynamicData.Binding; using DynamicData.Binding;
using System.Reactive; using System.Reactive;
@ -36,7 +35,7 @@ namespace Wabbajack
private string _mo2Folder; private string _mo2Folder;
public readonly BitmapImage _noneImage = UIUtils.BitmapImageFromResource("Wabbajack.UI.none.jpg"); public readonly BitmapImage _noneImage = UIUtils.BitmapImageFromResource("Wabbajack.Resources.none.jpg");
private readonly Subject<CPUStatus> _statusSubject = new Subject<CPUStatus>(); private readonly Subject<CPUStatus> _statusSubject = new Subject<CPUStatus>();
public ObservableCollectionExtended<CPUStatus> Status { get; } = new ObservableCollectionExtended<CPUStatus>(); public ObservableCollectionExtended<CPUStatus> Status { get; } = new ObservableCollectionExtended<CPUStatus>();

4
Wabbajack/UI/SlideShow.cs → Wabbajack/View Models/SlideShow.cs
View File

@ -32,8 +32,8 @@ namespace Wabbajack
public AppState AppState { get; } public AppState AppState { get; }
public BitmapImage NextIcon { get; } = UIUtils.BitmapImageFromResource("Wabbajack.UI.Icons.next.png"); public BitmapImage NextIcon { get; } = UIUtils.BitmapImageFromResource("Wabbajack.Resources.Icons.next.png");
public BitmapImage WabbajackLogo { get; } = UIUtils.BitmapImageFromResource("Wabbajack.UI.Banner_Dark.png"); public BitmapImage WabbajackLogo { get; } = UIUtils.BitmapImageFromResource("Wabbajack.Resources.Banner_Dark.png");
private bool _ShowNSFW; private bool _ShowNSFW;
public bool ShowNSFW { get => _ShowNSFW; set => this.RaiseAndSetIfChanged(ref _ShowNSFW, value); } public bool ShowNSFW { get => _ShowNSFW; set => this.RaiseAndSetIfChanged(ref _ShowNSFW, value); }

2
Wabbajack/UI/MainWindow.xaml → Wabbajack/Views/MainWindow.xaml
View File

@ -11,7 +11,7 @@
MinWidth="1024" MinWidth="1024"
MinHeight="768" MinHeight="768"
Closing="Window_Closing" Closing="Window_Closing"
Icon="Icons/wabbajack.ico" Icon="../Resources/Icons/wabbajack.ico"
ResizeMode="CanResize" ResizeMode="CanResize"
Style="{StaticResource {x:Type Window}}" Style="{StaticResource {x:Type Window}}"
WindowStyle="ToolWindow" WindowStyle="ToolWindow"

0
Wabbajack/UI/MainWindow.xaml.cs → Wabbajack/Views/MainWindow.xaml.cs
View File

4
Wabbajack/UI/ModeSelectionWindow.xaml → Wabbajack/Views/ModeSelectionWindow.xaml
View File

@ -3,7 +3,9 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Style="{StaticResource {x:Type Window}}" Icon="Icons/wabbajack.ico" WindowStyle="ToolWindow" Style="{StaticResource {x:Type Window}}"
Icon="../Resources/Icons/wabbajack.ico"
WindowStyle="ToolWindow"
xmlns:local="clr-namespace:Wabbajack" xmlns:local="clr-namespace:Wabbajack"
mc:Ignorable="d" mc:Ignorable="d"
Title="Wabbajack" Height="500" Width="800" ResizeMode="NoResize" Title="Wabbajack" Height="500" Width="800" ResizeMode="NoResize"

8
Wabbajack/UI/ModeSelectionWindow.xaml.cs → Wabbajack/Views/ModeSelectionWindow.xaml.cs
View File

@ -16,13 +16,13 @@ namespace Wabbajack
public ModeSelectionWindow() public ModeSelectionWindow()
{ {
InitializeComponent(); InitializeComponent();
var bannerImage = UIUtils.BitmapImageFromResource("Wabbajack.UI.banner_small_dark.png"); var bannerImage = UIUtils.BitmapImageFromResource("Wabbajack.Resources.banner_small_dark.png");
Banner.Source = bannerImage; Banner.Source = bannerImage;
var patreonIcon = UIUtils.BitmapImageFromResource("Wabbajack.UI.Icons.patreon_light.png"); var patreonIcon = UIUtils.BitmapImageFromResource("Wabbajack.Resources.Icons.patreon_light.png");
Patreon.Source = patreonIcon; Patreon.Source = patreonIcon;
var githubIcon = UIUtils.BitmapImageFromResource("Wabbajack.UI.Icons.github_light.png"); var githubIcon = UIUtils.BitmapImageFromResource("Wabbajack.Resources.Icons.github_light.png");
GitHub.Source = githubIcon; GitHub.Source = githubIcon;
var discordIcon = UIUtils.BitmapImageFromResource("Wabbajack.UI.Icons.discord.png"); var discordIcon = UIUtils.BitmapImageFromResource("Wabbajack.Resources.Icons.discord.png");
Discord.Source = discordIcon; Discord.Source = discordIcon;
} }

2
Wabbajack/UI/ModlistPropertiesWindow.xaml → Wabbajack/Views/ModlistPropertiesWindow.xaml
View File

@ -6,7 +6,7 @@
xmlns:local="clr-namespace:Wabbajack" xmlns:local="clr-namespace:Wabbajack"
mc:Ignorable="d" mc:Ignorable="d"
Title="Wabbajack (Modlist Properties)" Height="600" Width="900" Title="Wabbajack (Modlist Properties)" Height="600" Width="900"
Style="{StaticResource {x:Type Window}}" Icon="Icons/wabbajack.ico" WindowStyle="ToolWindow" Style="{StaticResource {x:Type Window}}" Icon="../Resources/Icons/wabbajack.ico" WindowStyle="ToolWindow"
ResizeMode="NoResize"> ResizeMode="NoResize">
<Grid Margin="8"> <Grid Margin="8">
<Grid.RowDefinitions> <Grid.RowDefinitions>

2
Wabbajack/UI/ModlistPropertiesWindow.xaml.cs → Wabbajack/Views/ModlistPropertiesWindow.xaml.cs
View File

@ -16,7 +16,7 @@ namespace Wabbajack
internal ModlistPropertiesWindow(AppState _state) internal ModlistPropertiesWindow(AppState _state)
{ {
InitializeComponent(); InitializeComponent();
var bannerImage = UIUtils.BitmapImageFromResource("Wabbajack.UI.Banner_Dark.png"); var bannerImage = UIUtils.BitmapImageFromResource("Wabbajack.Resources.Banner_Dark.png");
SplashScreenProperty.Source = bannerImage; SplashScreenProperty.Source = bannerImage;
newBannerFile = null; newBannerFile = null;

0
Wabbajack/UI/SlideshowView.xaml → Wabbajack/Views/SlideshowView.xaml
View File

0
Wabbajack/UI/SlideshowView.xaml.cs → Wabbajack/Views/SlideshowView.xaml.cs
View File

6
Wabbajack/UI/TextViewer.xaml → Wabbajack/Views/TextViewer.xaml
View File

@ -1,12 +1,12 @@
<Window x:Class="Wabbajack.UI.TextViewer" <Window x:Class="Wabbajack.TextViewer"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Wabbajack.UI" xmlns:local="clr-namespace:Wabbajack"
Style="{StaticResource {x:Type Window}}" Style="{StaticResource {x:Type Window}}"
mc:Ignorable="d" mc:Ignorable="d"
Icon="Icons/wabbajack.ico" Icon="../Resources/Icons/wabbajack.ico"
WindowStyle="ToolWindow" WindowStyle="ToolWindow"
Title="TextViewer" Height="450" Width="800"> Title="TextViewer" Height="450" Width="800">
<Grid> <Grid>

2
Wabbajack/UI/TextViewer.xaml.cs → Wabbajack/Views/TextViewer.xaml.cs
View File

@ -1,6 +1,6 @@
using System.Windows; using System.Windows;
namespace Wabbajack.UI namespace Wabbajack
{ {
public partial class TextViewer : Window public partial class TextViewer : Window
{ {

56
Wabbajack/Wabbajack.csproj
View File

@ -54,7 +54,7 @@
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ApplicationIcon>UI\Icons\wabbajack.ico</ApplicationIcon> <ApplicationIcon>Resources\Icons\wabbajack.ico</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug %28no commandargs%29|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug %28no commandargs%29|AnyCPU'">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@ -227,26 +227,26 @@
<Compile Include="Converters\IsNotNullVisibilityConverter.cs" /> <Compile Include="Converters\IsNotNullVisibilityConverter.cs" />
<Compile Include="Enums\RunMode.cs" /> <Compile Include="Enums\RunMode.cs" />
<Compile Include="Extensions\ReactiveUIExt.cs" /> <Compile Include="Extensions\ReactiveUIExt.cs" />
<Compile Include="UI\SlideshowView.xaml.cs"> <Compile Include="Views\SlideshowView.xaml.cs">
<DependentUpon>SlideshowView.xaml</DependentUpon> <DependentUpon>SlideshowView.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="UI\ModlistPropertiesWindow.xaml.cs"> <Compile Include="Views\ModlistPropertiesWindow.xaml.cs">
<DependentUpon>ModlistPropertiesWindow.xaml</DependentUpon> <DependentUpon>ModlistPropertiesWindow.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="UI\ModeSelectionWindow.xaml.cs"> <Compile Include="Views\ModeSelectionWindow.xaml.cs">
<DependentUpon>ModeSelectionWindow.xaml</DependentUpon> <DependentUpon>ModeSelectionWindow.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Themes\LeftMarginMultiplierConverter.cs" /> <Compile Include="Converters\LeftMarginMultiplierConverter.cs" />
<Compile Include="Themes\TreeViewItemExtensions.cs" /> <Compile Include="Util\TreeViewItemExtensions.cs" />
<Compile Include="UI\SlideShow.cs" /> <Compile Include="View Models\SlideShow.cs" />
<Compile Include="UI\TextViewer.xaml.cs"> <Compile Include="Views\TextViewer.xaml.cs">
<DependentUpon>TextViewer.xaml</DependentUpon> <DependentUpon>TextViewer.xaml</DependentUpon>
</Compile> </Compile>
<Page Include="UI\SlideshowView.xaml"> <Page Include="Views\SlideshowView.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="UI\MainWindow.xaml"> <Page Include="Views\MainWindow.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</Page> </Page>
@ -254,17 +254,17 @@
<DependentUpon>App.xaml</DependentUpon> <DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="AppState.cs" /> <Compile Include="View Models\AppState.cs" />
<Compile Include="AutoScrollBehavior.cs" /> <Compile Include="Util\AutoScrollBehavior.cs" />
<Compile Include="UI\MainWindow.xaml.cs"> <Compile Include="Views\MainWindow.xaml.cs">
<DependentUpon>MainWindow.xaml</DependentUpon> <DependentUpon>MainWindow.xaml</DependentUpon>
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Page Include="UI\ModeSelectionWindow.xaml"> <Page Include="Views\ModeSelectionWindow.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="UI\ModlistPropertiesWindow.xaml"> <Page Include="Views\ModlistPropertiesWindow.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
@ -272,7 +272,7 @@
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</Page> </Page>
<Page Include="UI\TextViewer.xaml"> <Page Include="Views\TextViewer.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
@ -335,34 +335,34 @@
</BootstrapperPackage> </BootstrapperPackage>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Resource Include="UI\Icons\wabbajack.ico" /> <Resource Include="Resources\Icons\wabbajack.ico" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="UI\banner.png" /> <EmbeddedResource Include="Resources\banner.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="UI\banner_small.png" /> <EmbeddedResource Include="Resources\banner_small.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="UI\Icons\discord.png" /> <EmbeddedResource Include="Resources\Icons\discord.png" />
<EmbeddedResource Include="UI\Icons\github.png" /> <EmbeddedResource Include="Resources\Icons\github.png" />
<EmbeddedResource Include="UI\Icons\patreon.png" /> <EmbeddedResource Include="Resources\Icons\patreon.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="UI\Icons\next.png" /> <EmbeddedResource Include="Resources\Icons\next.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="UI\none.jpg" /> <EmbeddedResource Include="Resources\none.jpg" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="UI\Icons\github_light.png" /> <EmbeddedResource Include="Resources\Icons\github_light.png" />
<EmbeddedResource Include="UI\Icons\patreon_light.png" /> <EmbeddedResource Include="Resources\Icons\patreon_light.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="UI\Banner_Dark.png" /> <EmbeddedResource Include="Resources\Banner_Dark.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="UI\banner_small_dark.png" /> <EmbeddedResource Include="Resources\banner_small_dark.png" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Fody.5.1.1\build\Fody.targets" Condition="Exists('..\packages\Fody.5.1.1\build\Fody.targets')" /> <Import Project="..\packages\Fody.5.1.1\build\Fody.targets" Condition="Exists('..\packages\Fody.5.1.1\build\Fody.targets')" />