Merge branch 'p5c-p5' into review2-p5c

This commit is contained in:
Alby96 committed 2026-11-04 16:04:19 +01:00
commit 6daf5fa056
4 files changed
+866 -36

No files matched your search

+64 -16
View File
@@ -520,32 +520,80 @@
</HeaderedContentControl>
</StackPanel>
<!-- ================= Workspace (owner review 2, R8) ================= -->
<!-- ================= Workspace (owner review 2, R8; phase 5c) ================= -->
<StackPanel Style="{StaticResource Page}" Visibility="{Binding Page, Converter={x:Static shell:EqualsToVisibilityConverter.Instance}, ConverterParameter=Workspace}">
<!-- The folder is shown, opened and changed here (another folder after its plan; nothing is moved: moving it with its projects comes with phase 5c). -->
<!-- The folder is shown, opened, changed (another folder after its plan; nothing is moved) and moved with its projects (after its plan,
by the workspace-move job); what it takes of its drive under it. -->
<HeaderedContentControl Style="{StaticResource Setting.Row}" Header="{l:Loc Settings.Workspace.Folder}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" MinWidth="160" MaxWidth="360" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBox Style="{StaticResource TextBox.Path}" IsReadOnly="True" Text="{Binding WorkspaceRows.Folder, Mode=OneWay}" ToolTip="{l:Loc Tooltips.Settings.WorkspaceFolder}"
AutomationProperties.Name="{l:Loc Settings.Workspace.Folder}" />
<Button Grid.Column="1" Content="{l:Loc Common.Open}" Command="{Binding WorkspaceRows.OpenCommand}" ToolTip="{l:Loc Tooltips.Settings.OpenWorkspace}"
Margin="10,0,0,0" />
<Button Grid.Column="2" Content="{l:Loc Settings.Workspace.Change}" Command="{Binding WorkspaceRows.ChangeCommand}"
ToolTip="{l:Loc Tooltips.Settings.ChangeWorkspace}" Margin="8,0,0,0"
Visibility="{Binding WorkspaceRows.CanChange, Converter={StaticResource BoolToVisibility}}" />
</Grid>
<StackPanel>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" MinWidth="160" MaxWidth="360" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBox Style="{StaticResource TextBox.Path}" IsReadOnly="True" Text="{Binding WorkspaceRows.Folder, Mode=OneWay}" ToolTip="{l:Loc Tooltips.Settings.Workspace.Folder}"
AutomationProperties.Name="{l:Loc Settings.Workspace.Folder}" />
<Button Grid.Column="1" Content="{l:Loc Common.Open}" Command="{Binding WorkspaceRows.OpenCommand}" ToolTip="{l:Loc Tooltips.Settings.OpenWorkspace}"
Margin="10,0,0,0" />
<Button Grid.Column="2" Content="{l:Loc Settings.Workspace.Change}" Command="{Binding WorkspaceRows.ChangeCommand}"
ToolTip="{l:Loc Tooltips.Settings.ChangeWorkspace}" Margin="8,0,0,0"
Visibility="{Binding WorkspaceRows.CanChange, Converter={StaticResource BoolToVisibility}}" />
<Button Grid.Column="3" Content="{l:Loc Settings.Workspace.Move}" Command="{Binding WorkspaceRows.MoveCommand}"
ToolTip="{Binding WorkspaceRows.MoveToolTip}" ToolTipService.ShowOnDisabled="True" Margin="8,0,0,0"
Visibility="{Binding WorkspaceRows.CanMove, Converter={StaticResource BoolToVisibility}}" />
</Grid>
<TextBlock Style="{StaticResource Text.Hint}" Text="{Binding WorkspaceRows.UsageText}" ToolTip="{l:Loc Tooltips.Settings.Workspace.Used}" Margin="0,6,0,0"
Visibility="{Binding WorkspaceRows.HasUsageText, Converter={StaticResource BoolToVisibility}}" />
</StackPanel>
</HeaderedContentControl>
<HeaderedContentControl Style="{StaticResource Setting.Row}" Header="{l:Loc Settings.Workspace.SizeLimit}">
<ComboBox Width="170" HorizontalAlignment="Left" ItemsSource="{Binding WorkspaceRows.SizeLimitChoices}" SelectedItem="{Binding WorkspaceRows.SelectedSizeLimit}"
DisplayMemberPath="Label" ToolTip="{Binding WorkspaceRows.SizeLimitToolTip}" AutomationProperties.Name="{l:Loc Settings.Workspace.SizeLimit}" />
</HeaderedContentControl>
<HeaderedContentControl Style="{StaticResource Setting.Row}" Header="{l:Loc Settings.Workspace.DefaultMedia}">
<WrapPanel Margin="0,4,0,0">
<RadioButton GroupName="WorkspaceMedia" Content="{l:Loc Settings.Workspace.Proxies}" IsChecked="{Binding WorkspaceRows.IsDefaultProxies}"
ToolTip="{l:Loc Tooltips.Settings.Workspace.Proxies}" Margin="0,0,20,0" />
<RadioButton GroupName="WorkspaceMedia" Content="{l:Loc Settings.Workspace.Originals}" IsChecked="{Binding WorkspaceRows.IsDefaultOriginals}"
ToolTip="{l:Loc Tooltips.Settings.Workspace.Originals}" />
</WrapPanel>
</HeaderedContentControl>
<HeaderedContentControl Style="{StaticResource Setting.Row}" Header="{l:Loc Settings.Workspace.Sync}">
<CheckBox Content="{l:Loc Settings.Workspace.AfterSave}" IsChecked="{Binding WorkspaceRows.AutoSync}" ToolTip="{l:Loc Tooltips.Settings.WorkspaceSync}" Margin="0,4,0,0" />
</HeaderedContentControl>
<HeaderedContentControl Style="{StaticResource Setting.Row}" Header="{l:Loc Settings.Workspace.VersionOnRender}">
<CheckBox Content="{l:Loc Settings.Workspace.SaveBeforeRender}" IsChecked="{Binding WorkspaceRows.VersionOnRender}"
ToolTip="{l:Loc Tooltips.Settings.Workspace.VersionOnRender}" Margin="0,4,0,0" />
</HeaderedContentControl>
<HeaderedContentControl Style="{StaticResource Setting.Row}" Header="{l:Loc Settings.Workspace.Kept}">
<ComboBox Width="170" HorizontalAlignment="Left" ItemsSource="{Binding WorkspaceRows.KeptChoices}" SelectedItem="{Binding WorkspaceRows.SelectedKept}"
DisplayMemberPath="Label" ToolTip="{l:Loc Tooltips.Settings.KeptVersions}" AutomationProperties.Name="{l:Loc Settings.Workspace.Kept}" />
</HeaderedContentControl>
<HeaderedContentControl Style="{StaticResource Setting.Row}" Header="{l:Loc Settings.Workspace.CleanAfter}">
<ComboBox Width="170" HorizontalAlignment="Left" ItemsSource="{Binding WorkspaceRows.CleanAfterChoices}" SelectedItem="{Binding WorkspaceRows.SelectedCleanAfter}"
DisplayMemberPath="Label" ToolTip="{Binding WorkspaceRows.CleanAfterToolTip}" AutomationProperties.Name="{l:Loc Settings.Workspace.CleanAfter}" />
</HeaderedContentControl>
<HeaderedContentControl Style="{StaticResource Setting.Row}" Header="{l:Loc Settings.Workspace.OpenProject}">
<WrapPanel Margin="0,4,0,0">
<RadioButton GroupName="WorkspaceOpen" Content="{l:Loc Settings.Workspace.LastUsed}" IsChecked="{Binding WorkspaceRows.IsOpenLastUsed}"
ToolTip="{l:Loc Tooltips.Settings.Workspace.LastUsed}" Margin="0,0,20,0" />
<RadioButton GroupName="WorkspaceOpen" Content="{l:Loc Settings.Workspace.Main}" IsChecked="{Binding WorkspaceRows.IsOpenMain}"
ToolTip="{l:Loc Tooltips.Settings.Workspace.Main}" Margin="0,0,20,0" />
<RadioButton GroupName="WorkspaceOpen" Content="{l:Loc Settings.Workspace.Ask}" IsChecked="{Binding WorkspaceRows.IsOpenAsk}"
ToolTip="{l:Loc Tooltips.Settings.Workspace.Ask}" />
</WrapPanel>
</HeaderedContentControl>
<!-- What removed copies and the clean-up set aside; only Empty… erases it, after its plan and the typed number of its entries. -->
<HeaderedContentControl Style="{StaticResource Setting.Row}" Header="{l:Loc Settings.Workspace.Trash}">
<WrapPanel>
<TextBlock Style="{StaticResource Text.Hint}" Text="{Binding WorkspaceRows.TrashText}" ToolTip="{l:Loc Tooltips.Settings.Workspace.Trash}" Margin="0,0,12,0"
VerticalAlignment="Center" />
<Button Style="{StaticResource Button.Compact}" Content="{l:Loc Settings.Workspace.EmptyTrash}" Command="{Binding WorkspaceRows.EmptyTrashCommand}"
ToolTip="{Binding WorkspaceRows.EmptyTrashToolTip}" ToolTipService.ShowOnDisabled="True" />
</WrapPanel>
</HeaderedContentControl>
</StackPanel>
<!-- ================= Server ================= -->
+19 -3
View File
@@ -87,7 +87,9 @@ public sealed class SettingsViewModel : SectionViewModel
"Settings.Rendering.Hardware", "Settings.Rendering.Encoders"]),
new(SettingsPage.Formats, ["Settings.Formats.Title", "Settings.Formats.Column.Tier", "Settings.Formats.Install"]),
new(SettingsPage.Storage, ["Settings.Storage.Folder", "Settings.Storage.Thumbnails", "Settings.Storage.Limit"]),
new(SettingsPage.Workspace, ["Settings.Workspace.Folder", "Settings.Workspace.Sync", "Settings.Workspace.AfterSave", "Settings.Workspace.Kept"]),
new(SettingsPage.Workspace, ["Settings.Workspace.Folder", "Settings.Workspace.Move", "Settings.Workspace.SizeLimit", "Settings.Workspace.DefaultMedia",
"Settings.Workspace.Sync", "Settings.Workspace.AfterSave", "Settings.Workspace.VersionOnRender", "Settings.Workspace.SaveBeforeRender",
"Settings.Workspace.Kept", "Settings.Workspace.CleanAfter", "Settings.Workspace.OpenProject", "Settings.Workspace.Trash"]),
new(SettingsPage.Server, ["Settings.Server.Default", "Settings.Server.RenderNode", "Settings.Server.Certificates"]),
new(SettingsPage.Updates, ["Settings.General.CheckOnStart", "Settings.Updates.Latest", "About.Update.Check", "About.Releases"]),
new(SettingsPage.Advanced, ["Settings.Advanced.DataFolder", "Settings.Advanced.Logs", "Settings.Advanced.LogLevel", "Settings.Advanced.KeepLogs",
@@ -169,7 +171,9 @@ public sealed class SettingsViewModel : SectionViewModel
Logs = new LogSettingsRows(_s, Save);
// ---- Workspace ----
WorkspaceRows = new WorkspaceSettingsRows(_s, Save, () => AppEnvironment.Shown(Shell.Services.Workspace.Root), OpenWorkspaceFolder, ChangeWorkspaceFolderAsync);
WorkspaceRows = new WorkspaceSettingsRows(_s, Save, () => AppEnvironment.Shown(Shell.Services.Workspace.Root), OpenWorkspaceFolder, ChangeWorkspaceFolderAsync,
WorkspaceSettingsServices.For(Shell.Services.Workspace, Shell.Services.Dialogs, (title, message, isError) => Shell.Notify(title, message, isError: isError),
MoveWorkspaceFolderAsync));
// ---- Storage ----
// A capture shows its folders under a sample data folder; what is typed is taken back to the folder it stands for.
@@ -259,6 +263,7 @@ public sealed class SettingsViewModel : SectionViewModel
if (value == SettingsPage.Rendering && Encoders.Count == 0 && !_isDetecting) _ = DetectEncodersAsync();
if (value == SettingsPage.Formats && Formats.Count == 0 && !_isDetectingFormats) _ = DetectFormatsAsync(refresh: false);
if (value == SettingsPage.Storage) _ = UpdateCacheUsageAsync();
if (value == SettingsPage.Workspace) _ = WorkspaceRows.MeasureAsync();
if (value == SettingsPage.Advanced) LoadBackups();
}
}
@@ -726,7 +731,10 @@ public sealed class SettingsViewModel : SectionViewModel
// ---------------- Workspace ----------------
/// <summary>Settings › Workspace (owner review 2, R8): the folder, Sync automatically and Kept versions.</summary>
/// <summary>
/// Settings › Workspace (owner review 2, R8; phase 5c): the folder (Change, Move…, what it takes), Size limit, Default
/// media, Sync automatically, Version on render, Kept versions, Clean after, Open project and Trash.
/// </summary>
public WorkspaceSettingsRows WorkspaceRows { get; }
/// <summary>Shows the workspace folder in Explorer (made, with its manifest, when the workspace was never used).</summary>
@@ -747,6 +755,14 @@ public sealed class SettingsViewModel : SectionViewModel
{
await WorkspaceFolderChange.ChooseAsync(Shell);
WorkspaceRows.Refresh();
await WorkspaceRows.MeasureAsync();
}
/// <summary>The workspace folder moved with its projects, after its plan: the move job takes them, and Edit waits for it.</summary>
private async Task MoveWorkspaceFolderAsync()
{
await WorkspaceFolderChange.MoveAsync(Shell);
WorkspaceRows.Refresh();
}
// ---------------- Server ----------------