Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-03-24 18:54:42 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FModel v4.2.1

Browse Source
This commit is contained in:
iAmAsval 2021-12-26 23:05:50 +01:00
parent 17c3fcea8c
commit fee89ebca8
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CUE4Parse

@ -1 +1 @@
Subproject commit 254550e6f20a371edd0b3eed63a2b0ae206b46e7
Subproject commit 3df254b665420e05978f61441659c69d2a40411f

6
FModel/FModel.csproj
View File

@ -5,9 +5,9 @@
<TargetFramework>net6.0-windows</TargetFramework>
<UseWPF>true</UseWPF>
<ApplicationIcon>FModel.ico</ApplicationIcon>
<Version>4.2.0</Version>
<AssemblyVersion>4.2.0.0</AssemblyVersion>
<FileVersion>4.2.0.0</FileVersion>
<Version>4.2.1</Version>
<AssemblyVersion>4.2.1.0</AssemblyVersion>
<FileVersion>4.2.1.0</FileVersion>
<IsPackable>false</IsPackable>
<IsPublishable>true</IsPublishable>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>

4
FModel/Views/DirectorySelector.xaml
View File

@ -53,7 +53,7 @@
</ComboBox.ItemTemplate>
</ComboBox>
</Grid>
<Grid Margin="0 0 0 5">
<Grid x:Name="Hello" Margin="0 0 0 5">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="5" />
@ -76,7 +76,7 @@
</Grid>
<Separator Style="{StaticResource CustomSeparator}" Tag="ADD UNDETECTED GAME" />
<Expander ExpandDirection="Down" IsExpanded="False">
<Grid>
<Grid MaxWidth="{Binding ActualWidth, ElementName=Hello}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="5" />

4
FModel/Views/ImageMerger.xaml.cs
View File

@ -144,7 +144,7 @@ namespace FModel.Views
var fileBrowser = new OpenFileDialog
{
Title = "Add image(s)",
InitialDirectory = $"{UserSettings.Default.OutputDirectory}\\Textures",
InitialDirectory = $"{UserSettings.Default.OutputDirectory}\\Exports",
Multiselect = true,
Filter = "Image Files (*.png,*.bmp,*.jpg,*.jpeg,*.jfif,*.jpe,*.tiff,*.tif)|*.png;*.bmp;*.jpg;*.jpeg;*.jfif;*.jpe;*.tiff;*.tif|All Files (*.*)|*.*"
};
@ -299,4 +299,4 @@ namespace FModel.Views
ClipboardExtensions.SetImage(_imagebuffer, FILENAME);
}
}
}
}