Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-03-22 01:34:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed custom dir

Browse Source
This commit is contained in:
Valentin 2021-05-24 01:33:47 +02:00
parent 395e2cb1dd
commit 4f69509d6d
6 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CUE4Parse

@ -1 +1 @@
Subproject commit 560e867bef0ef46640bda66458613dd0070a4809
Subproject commit c2535e18b0dd26c8173c73ba26f58d0c55afc0b8

22
FModel/ViewModels/CUE4ParseViewModel.cs
View File

@ -461,6 +461,17 @@ namespace FModel.ViewModels
break;
}
case "udic":
{
TabControl.SelectedTab.Image = null;
if (Provider.TryCreateReader(fullPath, out var archive))
{
var header = new FDictionaryHeader(archive);
TabControl.SelectedTab.SetDocumentText(JsonConvert.SerializeObject(header, Formatting.Indented), bulkSave);
}
break;
}
case "png":
case "jpg":
{
@ -476,17 +487,6 @@ namespace FModel.ViewModels
FLogger.AppendWarning();
FLogger.AppendText($"Export '{fullPath.SubstringAfterLast('/')}' and change its extension if you want it to be an installable font file", Constants.WHITE, true);
break;
case "udic":
{
TabControl.SelectedTab.Image = null;
if (Provider.TryCreateReader(fullPath, out var archive))
{
var header = new FDictionaryHeader(archive);
TabControl.SelectedTab.SetDocumentText(JsonConvert.SerializeObject(header, Formatting.Indented), bulkSave);
}
break;
}
case "ushaderbytecode":
TabControl.SelectedTab.Image = null;
break;

3
FModel/ViewModels/Commands/AddEditDirectoryCommand.cs
View File

@ -12,7 +12,8 @@ namespace FModel.ViewModels.Commands
public override void Execute(CustomDirectoriesViewModel contextViewModel, object parameter)
{
if (parameter is not CustomDirectory customDir) return;
if (parameter is not CustomDirectory customDir)
customDir = new CustomDirectory();
Helper.OpenWindow<AdonisWindow>("Custom Directory", () =>
{

3
FModel/ViewModels/CustomDirectoriesViewModel.cs
View File

@ -105,8 +105,7 @@ namespace FModel.ViewModels
Icon = new Image {Source = new BitmapImage(new Uri("/FModel;component/Resources/add_directory.png", UriKind.Relative))},
HorizontalContentAlignment = HorizontalAlignment.Left,
VerticalContentAlignment = VerticalAlignment.Center,
Command = AddEditDirectoryCommand,
CommandParameter = new CustomDirectory()
Command = AddEditDirectoryCommand
};
yield return new Separator();

2
FModel/Views/CustomDir.xaml
View File

@ -41,7 +41,7 @@
</Grid.ColumnDefinitions>
<TextBlock Grid.Row="0" Grid.Column="0" Text="Header" VerticalAlignment="Center" />
<TextBox Grid.Row="0" Grid.Column="2" Text="{Binding Header, Mode=TwoWay}" />
<TextBox x:Name="WpfSuckMyDick" Grid.Row="0" Grid.Column="2" Text="{Binding Header, Mode=TwoWay}" />
<TextBlock Grid.Row="2" Grid.Column="0" Text="Directory" VerticalAlignment="Center" />
<TextBox Grid.Row="2" Grid.Column="2" Text="{Binding DirectoryPath, Mode=TwoWay}" />
</Grid>

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

@ -9,6 +9,10 @@ namespace FModel.Views
{
DataContext = customDir;
InitializeComponent();
Activate();
WpfSuckMyDick.Focus();
WpfSuckMyDick.SelectAll();
}
private void OnClick(object sender, RoutedEventArgs e)