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

bump

Browse Source
This commit is contained in:
Asval 2026-07-30 23:35:40 +02:00
parent 9f42a6edbb
commit d62b3f5a64
5 changed files with 25 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CUE4Parse

@ -1 +1 @@
Subproject commit 02dea056a4f9f37f775676725c1d282f9883130c
Subproject commit 40033e82afd4c06c26bdd9eaa3d1f4e05b77bdf6

2
FModel/ViewModels/Commands/RightClickMenuCommand.cs
View File

@ -184,7 +184,7 @@ public class RightClickMenuCommand : ViewModelCommand<ApplicationViewModel>
{
FLogger.Append(ELog.Information, () =>
{
FLogger.Text($"Queued {queuedDelta} {fileType} for export from {directory}", Constants.WHITE, true);
FLogger.Text($"Queued {queuedDelta} {fileType} for export from {directory}{(UserSettings.Default.ExportImmediately ? ", exporting automatically..." : "")}", Constants.WHITE, true);
});
}
else if (contextViewModel.CUE4Parse.FailedExportCount == 0)

66
FModel/Views/ExportSessionWindow.xaml
View File

@ -186,6 +186,7 @@
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Viewbox Grid.Column="0" Width="16" Height="16" Margin="0 0 5 0" VerticalAlignment="Center"
@ -199,54 +200,31 @@
Foreground="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}"
ToolTip="{Binding Path}" />
<StackPanel Grid.Column="3" Orientation="Horizontal">
<Button ToolTip="Remove from queue" Click="OnRemoveFromQueueClick"
Width="16" Height="16" Padding="0" Margin="0"
Visibility="{Binding DataContext.CanExport, RelativeSource={RelativeSource AncestorType=adonisControls:AdonisWindow}, Converter={StaticResource BoolToVisibilityConverter}}"
HorizontalAlignment="Center" VerticalAlignment="Center" Focusable="False">
<Button.Style>
<Style TargetType="Button">
<Setter Property="Foreground" Value="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="Button">
<Border Background="Transparent">
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
</Border>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Foreground" Value="#EF5350" />
</Trigger>
</Style.Triggers>
</Style>
</Button.Style>
<Viewbox Width="16" Height="16">
<Canvas Width="24" Height="24">
<Path Fill="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Button}}"
Data="{StaticResource RemoveIcon}" />
</Canvas>
</Viewbox>
</Button>
<Button ToolTip="Open in Explorer" Click="OnOpenInExplorerClick"
<Button Grid.Column="3" ToolTip="Remove from queue" Click="OnRemoveFromQueueClick"
Visibility="{Binding DataContext.CanExport, RelativeSource={RelativeSource AncestorType=adonisControls:AdonisWindow}, Converter={StaticResource BoolToVisibilityConverter}}"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Padding="0" Margin="0" Focusable="False"
Foreground="#EF5350" Style="{DynamicResource {x:Static adonisUi:Styles.ToolbarButton}}">
<Viewbox Width="16" Height="16">
<Canvas Width="24" Height="24">
<Path Fill="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Button}}"
Data="{StaticResource RemoveIcon}" />
</Canvas>
</Viewbox>
</Button>
<Button Grid.Column="4" ToolTip="Open in Explorer" Click="OnOpenInExplorerClick"
Tag="{Binding FirstFilePath}"
Visibility="{Binding HasFilePath, Converter={StaticResource BoolToVisibilityConverter}}"
Style="{DynamicResource {x:Static adonisUi:Styles.ToolbarButton}}"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Padding="0" Margin="0">
<Viewbox Width="16" Height="16">
<Canvas Width="24" Height="24">
<Path StrokeThickness="2" Stroke="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}" Data="M12 6h-6a2 2 0 0 0 -2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2 -2v-6" />
<Path StrokeThickness="2" Stroke="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}" Data="M11 13l9 -9" />
<Path StrokeThickness="2" Stroke="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}" Data="M15 4h5v5" />
</Canvas>
</Viewbox>
</Button>
</StackPanel>
<Viewbox Width="16" Height="16">
<Canvas Width="24" Height="24">
<Path StrokeThickness="2" Stroke="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}" Data="M12 6h-6a2 2 0 0 0 -2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2 -2v-6" />
<Path StrokeThickness="2" Stroke="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}" Data="M11 13l9 -9" />
<Path StrokeThickness="2" Stroke="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}" Data="M15 4h5v5" />
</Canvas>
</Viewbox>
</Button>
</Grid>
</DataTemplate>

2
FModel/Views/ExportSessionWindow.xaml.cs
View File

@ -39,9 +39,7 @@ public partial class ExportSessionWindow
private void OnRemoveFromQueueClick(object sender, RoutedEventArgs e)
{
if (sender is Button { DataContext: ObjectGroupViewModel item } && DataContext is ExportSessionViewModel viewModel)
{
viewModel.RemoveFromQueue(item);
}
}
private void OnMakeDefaultOptions(object sender, RoutedEventArgs e)

2
FModel/Views/Resources/Controls/ExportOptionsControl.xaml
View File

@ -224,7 +224,7 @@
<TextBlock Grid.Row="15"
Grid.Column="0"
Text="Export all texture mips"
Text="Export All Mips"
VerticalAlignment="Center" />
<CheckBox Grid.Row="15"
Grid.Column="2"