Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
- 未经用户明确要求,不引入独立视觉风格、默认浅色控件或硬编码颜色;主窗口、导航栏和各功能页面应保持协调,避免无设计意图的大面积色彩断层。
- 用户明确要求的独立工具窗口配色继续保留,并复用现有控件模板和配色机制。文件集装箱的功能设置页使用软件主配色;快速装载和详细打包窗口共用一套配色。
- 点击配色预设直接应用并保存;编辑自定义颜色只改变预览,保存后才应用。软件本身和各工具均遵循该规则。
- 各工具停用后禁用其设置、快捷键编辑、配色预设及恢复默认入口;保留功能开关、导航、收藏和必要的数据保存、导出、备份恢复。停用和重新启用不应用或丢弃配色草稿。
- UI 修改不得破坏业务逻辑、快捷键、配置持久化或其他功能。只修改任务所需范围,不顺带重构无关模块或更改已有排版。
- 验证深色主题、不同窗口大小及不同 DPI 下的显示。区分 DPI 渲染检查与真实显示器、混合 DPI 运行检查,不将模拟检查写成实机验证。
- 完成 UI 修改后进行视觉验收,报告复用了哪些现有样式、增加了哪些样式,以及仍存在的差异或未验证场景。
12 changes: 6 additions & 6 deletions src/DailyToolkit.Desktop/Clipboard/ClipboardSettingsView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</UserControl.Resources>
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
<StackPanel Margin="0,0,8,0" IsEnabled="{Binding IsLoaded}">
<Border Style="{StaticResource Card}" Margin="0,0,0,12"><StackPanel>
<Border Style="{StaticResource FeatureSettingsCard}" Margin="0,0,0,12"><StackPanel>
<TextBlock Text="剪贴回溯" FontSize="16" FontWeight="SemiBold" Margin="0,0,0,12"/>
<TextBlock Text="开启后自动记录剪贴板。" Style="{StaticResource MutedText}"/>
<TextBlock Text="{Binding Status}" Foreground="{DynamicResource AccentBrush}" Margin="0,8,0,0"/>
Expand All @@ -26,7 +26,7 @@
<CheckBox Content="重新复制时加入 Win+V 历史" IsChecked="{Binding IncludeRestoredInWindowsHistory}" Margin="0,16,0,0"/>
<TextBlock Text="是否收录取决于 Windows;不允许云同步。" Style="{StaticResource MutedText}" Margin="0,8,0,0"/>
</StackPanel></Border>
<Border Style="{StaticResource Card}" Margin="0,0,0,12"><StackPanel>
<Border Style="{StaticResource FeatureSettingsCard}" Margin="0,0,0,12"><StackPanel>
<TextBlock Text="历史面板配色" FontSize="16" FontWeight="SemiBold" Margin="0,0,0,12"/>
<TextBlock Text="自定义颜色保存后应用。" Style="{StaticResource MutedText}" Margin="0,0,0,12"/>
<ItemsControl ItemsSource="{Binding AppearancePresets}"><ItemsControl.ItemsPanel><ItemsPanelTemplate><WrapPanel/></ItemsPanelTemplate></ItemsControl.ItemsPanel>
Expand Down Expand Up @@ -58,7 +58,7 @@
</Grid></DataTemplate></ItemsControl.ItemTemplate>
</ItemsControl></Expander>
</StackPanel></Border>
<Border Style="{StaticResource Card}" Margin="0,0,0,12"><StackPanel>
<Border Style="{StaticResource FeatureSettingsCard}" Margin="0,0,0,12"><StackPanel>
<TextBlock Text="普通历史容量" FontSize="16" FontWeight="SemiBold" Margin="0,0,0,12"/>
<WrapPanel><StackPanel Margin="0,0,16,12"><TextBlock Text="最多条数"/><TextBox Text="{Binding MaximumRecords, UpdateSourceTrigger=LostFocus}" Width="100" Margin="0,6,0,0"/></StackPanel>
<StackPanel Margin="0,0,16,12"><TextBlock Text="保留天数"/><TextBox Text="{Binding RetentionDays, UpdateSourceTrigger=LostFocus}" Width="100" Margin="0,6,0,0"/></StackPanel>
Expand All @@ -68,7 +68,7 @@
</WrapPanel>
<TextBlock Text="永久保存项不自动清理,置顶项仍会清理。" Style="{StaticResource MutedText}"/>
</StackPanel></Border>
<Border Style="{StaticResource Card}" Margin="0,0,0,12"><StackPanel>
<Border Style="{StaticResource FeatureSettingsCard}" Margin="0,0,0,12"><StackPanel>
<TextBlock Text="文件夹缓存" FontSize="16" FontWeight="SemiBold" Margin="0,0,0,12"/>
<DockPanel>
<controls:FeatureSwitch x:Name="FileCacheSwitch" DockPanel.Dock="Right" IsOn="{Binding UseCachedFiles, Mode=TwoWay}"
Expand All @@ -84,7 +84,7 @@
</WrapPanel>
<TextBlock Text="缓存加密保存,复制时生成未加密副本。最后使用满 24 小时后,运行期间清理。关闭开关保留已有缓存。" Style="{StaticResource MutedText}"/>
</StackPanel></Border>
<Border Style="{StaticResource Card}" Margin="0,0,0,12"><StackPanel>
<Border Style="{StaticResource FeatureSettingsCard}" Margin="0,0,0,12"><StackPanel>
<TextBlock Text="隐私与排除应用" FontSize="16" FontWeight="SemiBold" Margin="0,0,0,12"/>
<CheckBox Content="暂停监听" IsChecked="{Binding IsPaused}" IsEnabled="{Binding IsEnabled}" Margin="0,0,0,12"/>
<TextBlock Text="排除应用:每行一个进程名,如 KeePass.exe。来源不明时无法排除。" Style="{StaticResource MutedText}" Margin="0,0,0,8"/>
Expand All @@ -104,7 +104,7 @@
<Separator/>
<MenuItem Header="打开数据目录" Click="OpenDirectory"/><MenuItem Header="创建加密备份" Click="Backup"/><MenuItem Header="恢复最近备份" Click="RestoreBackup"/>
<Separator/>
<MenuItem Header="重试保存设置" Click="SaveSettings"/><MenuItem Header="恢复默认设置" Click="ResetSettings"/>
<MenuItem Header="重试保存设置" Click="SaveSettings"/><MenuItem Header="恢复默认设置" Click="ResetSettings" IsEnabled="{Binding IsEnabled}"/>
</ContextMenu></Button.ContextMenu>
</Button>
</WrapPanel>
Expand Down
3 changes: 2 additions & 1 deletion src/DailyToolkit.Desktop/Controls/LensColorPicker.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
</DataTrigger></Style.Triggers>
</Style>
</Button.Style>
<Button.ContextMenu><ContextMenu DataContext="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource Self}}">
<Button.ContextMenu><ContextMenu DataContext="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource Self}}"
IsEnabled="{Binding PlacementTarget.IsEnabled, RelativeSource={RelativeSource Self}}">
<MenuItem Header="撤销修改" Command="{Binding DiscardBorderColorCommand}"/>
</ContextMenu></Button.ContextMenu>
<StackPanel Orientation="Horizontal">
Expand Down
8 changes: 4 additions & 4 deletions src/DailyToolkit.Desktop/FilePack/FilePackSettingsView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</UserControl.Resources>
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
<StackPanel Margin="0,0,8,0" IsEnabled="{Binding SettingsLoaded}">
<Border Style="{StaticResource Card}" Margin="0,0,0,12"><StackPanel>
<Border Style="{StaticResource FeatureSettingsCard}" Margin="0,0,0,12"><StackPanel>
<TextBlock Text="文件集装箱" Style="{StaticResource SectionTitle}"/>
<Grid><Grid.ColumnDefinitions><ColumnDefinition Width="Auto"/><ColumnDefinition Width="*"/><ColumnDefinition Width="Auto"/></Grid.ColumnDefinitions>
<TextBlock Text="打开窗口快捷键" VerticalAlignment="Center"/>
Expand All @@ -22,7 +22,7 @@
</WrapPanel>
<WrapPanel Margin="0,12,0,0"><Button Content="快速装载" Command="{Binding OpenQuickWindowCommand}" Margin="0,0,8,8"/><Button Content="详细打包" Command="{Binding OpenPackWindowCommand}" Margin="0,0,0,8"/></WrapPanel>
</StackPanel></Border>
<Border Style="{StaticResource Card}" Margin="0,0,0,12"><StackPanel>
<Border Style="{StaticResource FeatureSettingsCard}" Margin="0,0,0,12"><StackPanel>
<TextBlock Text="快捷打包" Style="{StaticResource SectionTitle}"/>
<WrapPanel>
<StackPanel Margin="0,0,16,12"><TextBlock Text="文件名"/><TextBox Text="{Binding QuickArchiveName, UpdateSourceTrigger=LostFocus}" Width="200" Margin="0,6,0,0"/></StackPanel>
Expand All @@ -32,12 +32,12 @@
<TextBlock Text="保存位置"/><Grid Margin="0,6,0,0"><Grid.ColumnDefinitions><ColumnDefinition Width="*"/><ColumnDefinition Width="Auto"/></Grid.ColumnDefinitions><TextBox Text="{Binding QuickOutputDirectory, UpdateSourceTrigger=LostFocus}"/><Button Grid.Column="1" Content="选择" Command="{Binding BrowseQuickOutputCommand}" Margin="8,0,0,0"/></Grid>
<TextBlock Text="默认按压缩完成时间命名,精确到分钟。同名文件自动更名。" Style="{StaticResource MutedText}" Margin="0,8,0,0"/>
</StackPanel></Border>
<Border Style="{StaticResource Card}" Margin="0,0,0,12"><StackPanel>
<Border Style="{StaticResource FeatureSettingsCard}" Margin="0,0,0,12"><StackPanel>
<TextBlock Text="右键菜单" Style="{StaticResource SectionTitle}"/>
<CheckBox x:Name="ContextMenuCheck" Content="加入“显示更多选项”" Click="ChangeContextMenu"/>
<TextBlock Text="Windows 11 第一层菜单暂不支持。" Style="{StaticResource MutedText}" Margin="0,8,0,0"/>
</StackPanel></Border>
<Border Style="{StaticResource Card}"><StackPanel>
<Border Style="{StaticResource FeatureSettingsCard}"><StackPanel>
<TextBlock Text="窗口配色" Style="{StaticResource SectionTitle}" Margin="0,0,0,6"/>
<TextBlock Text="快速装载与详细打包共用此配色。" Style="{StaticResource MutedText}" Margin="0,0,0,12"/>
<StackPanel DataContext="{Binding SelectedAppearance}">
Expand Down
2 changes: 1 addition & 1 deletion src/DailyToolkit.Desktop/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@
<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled"
Visibility="{Binding ShowScreenLens, Converter={StaticResource VisibleWhen}}">
<StackPanel DataContext="{Binding Gaming}" Margin="0,0,8,0">
<Border Style="{StaticResource Card}">
<Border x:Name="LensSettingsCard" Style="{StaticResource FeatureSettingsCard}">
<StackPanel>
<Grid>
<Grid.ColumnDefinitions>
Expand Down
10 changes: 5 additions & 5 deletions src/DailyToolkit.Desktop/Notes/NotesSettingsView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<Grid x:Name="SettingsLayout" SizeChanged="SettingsSizeChanged" IsEnabled="{Binding IsLoaded}">
<ScrollViewer x:Name="SettingsScroll" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
<StackPanel Margin="0,0,8,0">
<Border Style="{StaticResource Card}" Margin="0,0,0,12"><StackPanel>
<Border Style="{StaticResource FeatureSettingsCard}" Margin="0,0,0,12"><StackPanel>
<Grid>
<Grid.ColumnDefinitions><ColumnDefinition Width="Auto"/><ColumnDefinition Width="*"/><ColumnDefinition Width="Auto"/><ColumnDefinition Width="Auto"/></Grid.ColumnDefinitions>
<Grid.RowDefinitions><RowDefinition/><RowDefinition Height="Auto"/><RowDefinition/><RowDefinition Height="Auto"/></Grid.RowDefinitions>
Expand All @@ -41,7 +41,7 @@
</WrapPanel>
<TextBlock Text="{Binding Status}" Foreground="{DynamicResource MutedBrush}"/>
</StackPanel></Border>
<Border Style="{StaticResource Card}" Margin="0,0,0,12"><StackPanel>
<Border Style="{StaticResource FeatureSettingsCard}" Margin="0,0,0,12"><StackPanel>
<TextBlock Text="位置" FontWeight="SemiBold" Margin="0,0,0,10"/>
<WrapPanel Margin="0,0,0,12">
<RadioButton x:Name="NotesFixedMode" Content="固定" GroupName="NotesMovement" IsChecked="{Binding IsFixedMode, Mode=TwoWay}" Margin="0,0,18,0"/>
Expand All @@ -56,7 +56,7 @@
<Button Content="重置位置" Click="ResetPosition" HorizontalAlignment="Left"/>
<TextBlock Text="宽高填写整数。" Style="{StaticResource MutedText}" Margin="0,12,0,0"/>
</StackPanel></Border>
<Border x:Name="AppearanceCard" Style="{StaticResource Card}" Margin="0,0,0,12">
<Border x:Name="AppearanceCard" Style="{StaticResource FeatureSettingsCard}" Margin="0,0,0,12">
<Grid><Grid.RowDefinitions><RowDefinition Height="Auto"/><RowDefinition Height="*"/></Grid.RowDefinitions>
<TextBlock Text="外观" FontSize="16" FontWeight="SemiBold" Margin="0,0,0,14"/>
<Grid x:Name="AppearanceLayout" Grid.Row="1" SizeChanged="AppearanceSizeChanged">
Expand Down Expand Up @@ -123,10 +123,10 @@
</Grid>
</Grid>
</Border>
<Border Style="{StaticResource Card}" Margin="0,0,0,12"><StackPanel>
<Border x:Name="DataManagementCard" Style="{StaticResource Card}" Margin="0,0,0,12"><StackPanel>
<TextBlock Text="数据管理" FontWeight="SemiBold" Margin="0,0,0,12"/>
<WrapPanel><Button Content="立即保存" Click="SaveNow" Margin="0,0,8,8"/><Button Content="导出文本" Click="ExportText" Margin="0,0,8,8"/>
<Button Content="打开数据目录" Click="OpenDirectory" Margin="0,0,8,8"/><Button Content="恢复默认设置" Click="ResetSettings" Margin="0,0,8,8"/></WrapPanel>
<Button Content="打开数据目录" Click="OpenDirectory" Margin="0,0,8,8"/><Button Content="恢复默认设置" Click="ResetSettings" IsEnabled="{Binding IsEnabled}" Margin="0,0,8,8"/></WrapPanel>
<TextBlock Text="恢复设置保留正文。" Style="{StaticResource MutedText}"/>
<TextBlock Text="{Binding Notice}" Foreground="{DynamicResource AccentBrush}" TextWrapping="Wrap" Margin="0,12,0,0"/>
</StackPanel></Border>
Expand Down
2 changes: 1 addition & 1 deletion src/DailyToolkit.Desktop/Notes/NotesSettingsView.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ private void CommitSize(object sender, KeyboardFocusChangedEventArgs e)
}
private async void SaveNow(object sender, RoutedEventArgs e)
{
if (_model is null || _model.HasColorChanges && !await _model.SaveColorDraftAsync()) return;
if (_model is null || _model.IsEnabled && _model.HasColorChanges && !await _model.SaveColorDraftAsync()) return;
if (await _model.FlushAsync()) _model.Notice = "";
}
private async void ExportText(object sender, RoutedEventArgs e)
Expand Down
4 changes: 2 additions & 2 deletions src/DailyToolkit.Desktop/Presentation/MainViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public MainViewModel(IEnvironmentProbe probe, DisplayInfo display, ILocalStatusP
{
if (IsSettings && !IsHome || ShowFilePack || ShowConversion) return;
if (ShowScreenLens) Gaming.RefreshMonitors(); else _ = InitializeAsync();
}, () => !ShowFilePack && !ShowConversion && (!IsSettings || IsHome) && (ShowScreenLens ? Gaming.CanConfigure : !IsRefreshing && !_isReadingStatus));
}, () => !ShowFilePack && !ShowConversion && (!IsSettings || IsHome) && (ShowScreenLens ? Gaming.IsEnabled && Gaming.CanConfigure : !IsRefreshing && !_isReadingStatus));
Gaming.PropertyChanged += OnGamingChanged;
Notes.PropertyChanged += OnNotesChanged;
ClipRecall.PropertyChanged += OnClipRecallChanged;
Expand All @@ -142,7 +142,7 @@ public MainViewModel(IEnvironmentProbe probe, DisplayInfo display, ILocalStatusP
private void OnGamingChanged(object? sender, PropertyChangedEventArgs e)
{
if (e.PropertyName == nameof(GamingViewModel.IsActive)) { RefreshCommand.Refresh(); Notify(nameof(FooterStatusText)); }
if (e.PropertyName == nameof(GamingViewModel.IsEnabled)) { _navigation[0].IsEnabled=Gaming.IsEnabled; Notify(nameof(FooterStatusText)); }
if (e.PropertyName == nameof(GamingViewModel.IsEnabled)) { _navigation[0].IsEnabled=Gaming.IsEnabled; RefreshCommand.Refresh(); Notify(nameof(FooterStatusText)); }
if (e.PropertyName != nameof(GamingViewModel.IsFavorite)) return;
if (Gaming.IsFavorite) _favoriteIds.Add("screen-lens"); else _favoriteIds.Remove("screen-lens");
if (!_favoritesStore.Save(_favoriteIds)) Notice="收藏未能保存,退出后会丢失。";
Expand Down
4 changes: 4 additions & 0 deletions src/DailyToolkit.Desktop/Theme.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@
<Setter Property="SnapsToDevicePixels" Value="True" />
<Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
</Style>
<Style x:Key="FeatureSettingsCard" TargetType="Border" BasedOn="{StaticResource Card}">
<Setter Property="IsEnabled" Value="{Binding IsEnabled, Mode=OneWay}" />
</Style>
<Style TargetType="Button">
<Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
<Setter Property="Background" Value="{DynamicResource SurfaceBrush}" />
Expand Down Expand Up @@ -118,6 +121,7 @@
<Setter Property="Foreground" Value="{DynamicResource AccentBrush}" />
<Setter Property="FontWeight" Value="SemiBold" />
</Trigger>
<Trigger Property="IsEnabled" Value="False"><Setter Property="Opacity" Value="0.45" /></Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
Expand Down
1 change: 1 addition & 0 deletions tests/DailyToolkit.Desktop.Tests/DeferredSettingsTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ private static async Task CheckDeferredSettingsViewsAsync()
model.Page = "screen-lens"; await LayoutAsync();
model.Page = "file-pack"; await LayoutAsync();
Require(ReferenceEquals(packHost.Content, pack), "Revisiting FilePack recreated its settings session");
await CheckDisabledToolSettingsAsync(model, window, notes, clipboard!, pack);
Console.WriteLine("PASS Unvisited settings remain unconstructed without disabled database initialization; first navigation, layout and repeated input/palette/scroll sessions survive hide and return");
}
finally
Expand Down
Loading