github/ZonyLrcToolsX
1
0
Fork 0
mirror of https://github.com/real-zony/ZonyLrcToolsX.git synced 2026-03-17 06:42:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: fine-tune UI.

Browse Source
This commit is contained in:
real-zony
2026-03-03 15:34:26 +08:00
parent 4f4398acc8
commit f95c40ca52
11 changed files with 526 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/ZonyLrcTools.Desktop/App.axaml
View File

@@ -10,11 +10,26 @@
<Application.Resources> <Application.Resources>
<ResourceDictionary> <ResourceDictionary>
<!-- Icon Geometries (theme-independent) -->
<StreamGeometry x:Key="HomeIcon">M10,20V14H14V20H19V12H22L12,3L2,12H5V20H10Z</StreamGeometry>
<StreamGeometry x:Key="MusicNoteIcon">M12 3V13.55C11.41 13.21 10.73 13 10 13A4 4 0 0 0 6 17A4 4 0 0 0 10 21A4 4 0 0 0 14 17V7H18V3H12Z</StreamGeometry>
<StreamGeometry x:Key="ImageIcon">M8.5 13.5L11 16.5L14.5 12L19 18H5M21 19V5C21 3.89 20.1 3 19 3H5C3.89 3 3 3.89 3 5V19C3 20.1 3.89 21 5 21H19C20.1 21 21 20.1 21 19Z</StreamGeometry>
<StreamGeometry x:Key="SettingsIcon">M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.65 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.04 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.67 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.04 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z</StreamGeometry>
<StreamGeometry x:Key="MoonIcon">M9,2C7.95,2 6.95,2.16 6,2.46C10.06,3.73 13,7.5 13,12C13,16.5 10.06,20.27 6,21.54C6.95,21.84 7.95,22 9,22A10,10 0 0,0 19,12A10,10 0 0,0 9,2Z</StreamGeometry>
<StreamGeometry x:Key="SunIcon">M3.55 19.09L4.96 20.5L6.76 18.71L5.34 17.29M12 6C8.69 6 6 8.69 6 12S8.69 18 12 18 18 15.31 18 12 15.31 6 12 6M20 13H23V11H20M17.24 18.71L19.04 20.5L20.45 19.09L18.66 17.29M20.45 5.41L19.04 4L17.24 5.79L18.66 7.21M13 1H11V4H13M6.76 5.79L4.96 4L3.55 5.41L5.34 7.21L6.76 5.79M1 13H4V11H1M13 20H11V23H13Z</StreamGeometry>
<StreamGeometry x:Key="DownloadIcon">M5,20H19V18H5M19,9H15V3H9V9H5L12,16L19,9Z</StreamGeometry>
<StreamGeometry x:Key="FolderIcon">M10,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8C22,6.89 21.1,6 20,6H12L10,4Z</StreamGeometry>
<ResourceDictionary.ThemeDictionaries> <ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Light"> <ResourceDictionary x:Key="Light">
<SolidColorBrush x:Key="AppBackgroundBrush">#FFFFFF</SolidColorBrush> <SolidColorBrush x:Key="AppBackgroundBrush">#FFFFFF</SolidColorBrush>
<SolidColorBrush x:Key="AppAccentBrush">#0078D4</SolidColorBrush> <SolidColorBrush x:Key="AppAccentBrush">#0067C0</SolidColorBrush>
<SolidColorBrush x:Key="NavigationBackgroundBrush">#F3F3F3</SolidColorBrush> <SolidColorBrush x:Key="NavigationBackgroundBrush">#FAFAFA</SolidColorBrush>
<SolidColorBrush x:Key="ContentAreaBrush">#F3F3F3</SolidColorBrush>
<SolidColorBrush x:Key="CardBackgroundBrush">#FFFFFF</SolidColorBrush>
<SolidColorBrush x:Key="SeparatorBrush">#E5E5E5</SolidColorBrush>
<SolidColorBrush x:Key="NavActiveBackgroundBrush">#E8F1FF</SolidColorBrush>
<SolidColorBrush x:Key="TableHeaderBrush">#F9F9F9</SolidColorBrush>
<SolidColorBrush x:Key="SuccessColorBrush">#107C10</SolidColorBrush> <SolidColorBrush x:Key="SuccessColorBrush">#107C10</SolidColorBrush>
<SolidColorBrush x:Key="ErrorColorBrush">#D13438</SolidColorBrush> <SolidColorBrush x:Key="ErrorColorBrush">#D13438</SolidColorBrush>
<SolidColorBrush x:Key="WarningColorBrush">#FFB900</SolidColorBrush> <SolidColorBrush x:Key="WarningColorBrush">#FFB900</SolidColorBrush>
@@ -22,7 +37,12 @@
<ResourceDictionary x:Key="Dark"> <ResourceDictionary x:Key="Dark">
<SolidColorBrush x:Key="AppBackgroundBrush">#1F1F1F</SolidColorBrush> <SolidColorBrush x:Key="AppBackgroundBrush">#1F1F1F</SolidColorBrush>
<SolidColorBrush x:Key="AppAccentBrush">#60CDFF</SolidColorBrush> <SolidColorBrush x:Key="AppAccentBrush">#60CDFF</SolidColorBrush>
<SolidColorBrush x:Key="NavigationBackgroundBrush">#2D2D2D</SolidColorBrush> <SolidColorBrush x:Key="NavigationBackgroundBrush">#2A2A2A</SolidColorBrush>
<SolidColorBrush x:Key="ContentAreaBrush">#1F1F1F</SolidColorBrush>
<SolidColorBrush x:Key="CardBackgroundBrush">#2D2D2D</SolidColorBrush>
<SolidColorBrush x:Key="SeparatorBrush">#3A3A3A</SolidColorBrush>
<SolidColorBrush x:Key="NavActiveBackgroundBrush">#1A3A5C</SolidColorBrush>
<SolidColorBrush x:Key="TableHeaderBrush">#333333</SolidColorBrush>
<SolidColorBrush x:Key="SuccessColorBrush">#6CCB5F</SolidColorBrush> <SolidColorBrush x:Key="SuccessColorBrush">#6CCB5F</SolidColorBrush>
<SolidColorBrush x:Key="ErrorColorBrush">#FF99A4</SolidColorBrush> <SolidColorBrush x:Key="ErrorColorBrush">#FF99A4</SolidColorBrush>
<SolidColorBrush x:Key="WarningColorBrush">#FCE100</SolidColorBrush> <SolidColorBrush x:Key="WarningColorBrush">#FCE100</SolidColorBrush>

22
src/ZonyLrcTools.Desktop/Resources/UIStrings.en-US.resx
View File

@@ -73,16 +73,19 @@
<value>Lyrics Download</value> <value>Lyrics Download</value>
</data> </data>
<data name="Lyrics_Description" xml:space="preserve"> <data name="Lyrics_Description" xml:space="preserve">
<value>Batch download lyrics for your music files</value> <value>Batch download lyrics for your music files, with parallel processing and auto-skip</value>
</data>
<data name="Lyrics_FolderLabel" xml:space="preserve">
<value>Music Folder</value>
</data> </data>
<data name="Lyrics_SelectFolder" xml:space="preserve"> <data name="Lyrics_SelectFolder" xml:space="preserve">
<value>Select music folder...</value> <value>Select a folder containing music files...</value>
</data> </data>
<data name="Lyrics_Browse" xml:space="preserve"> <data name="Lyrics_Browse" xml:space="preserve">
<value>Browse...</value> <value>Browse...</value>
</data> </data>
<data name="Lyrics_Parallel" xml:space="preserve"> <data name="Lyrics_Parallel" xml:space="preserve">
<value>Parallel:</value> <value>Parallel Tasks</value>
</data> </data>
<data name="Lyrics_StartDownload" xml:space="preserve"> <data name="Lyrics_StartDownload" xml:space="preserve">
<value>Start Download</value> <value>Start Download</value>
@@ -105,6 +108,9 @@
<data name="Lyrics_Status_Complete" xml:space="preserve"> <data name="Lyrics_Status_Complete" xml:space="preserve">
<value>Download Complete</value> <value>Download Complete</value>
</data> </data>
<data name="Lyrics_EmptyState" xml:space="preserve">
<value>No tasks yet, please select a folder to start scanning</value>
</data>
<data name="Common_Total" xml:space="preserve"> <data name="Common_Total" xml:space="preserve">
<value>Total:</value> <value>Total:</value>
</data> </data>
@@ -124,14 +130,17 @@
<data name="Album_Description" xml:space="preserve"> <data name="Album_Description" xml:space="preserve">
<value>Download album artwork for your music collection</value> <value>Download album artwork for your music collection</value>
</data> </data>
<data name="Album_FolderLabel" xml:space="preserve">
<value>Music Folder</value>
</data>
<data name="Album_SelectFolder" xml:space="preserve"> <data name="Album_SelectFolder" xml:space="preserve">
<value>Select music folder...</value> <value>Select a folder containing music files...</value>
</data> </data>
<data name="Album_Browse" xml:space="preserve"> <data name="Album_Browse" xml:space="preserve">
<value>Browse...</value> <value>Browse...</value>
</data> </data>
<data name="Album_Parallel" xml:space="preserve"> <data name="Album_Parallel" xml:space="preserve">
<value>Parallel:</value> <value>Parallel Tasks</value>
</data> </data>
<data name="Album_StartDownload" xml:space="preserve"> <data name="Album_StartDownload" xml:space="preserve">
<value>Start Download</value> <value>Start Download</value>
@@ -139,6 +148,9 @@
<data name="Album_StopDownload" xml:space="preserve"> <data name="Album_StopDownload" xml:space="preserve">
<value>Stop Download</value> <value>Stop Download</value>
</data> </data>
<data name="Album_EmptyState" xml:space="preserve">
<value>No tasks yet, please select a folder to start scanning</value>
</data>
<!-- Settings Page --> <!-- Settings Page -->
<data name="Settings_Title" xml:space="preserve"> <data name="Settings_Title" xml:space="preserve">
<value>Settings</value> <value>Settings</value>

22
src/ZonyLrcTools.Desktop/Resources/UIStrings.resx
View File

@@ -73,16 +73,19 @@
<value>歌词下载</value> <value>歌词下载</value>
</data> </data>
<data name="Lyrics_Description" xml:space="preserve"> <data name="Lyrics_Description" xml:space="preserve">
<value>批量下载音乐文件的歌词</value> <value>批量下载音乐文件的歌词，支持并行处理与自动规避覆盖</value>
</data>
<data name="Lyrics_FolderLabel" xml:space="preserve">
<value>音乐文件夹</value>
</data> </data>
<data name="Lyrics_SelectFolder" xml:space="preserve"> <data name="Lyrics_SelectFolder" xml:space="preserve">
<value>选择音乐文件夹...</value> <value>请选择包含音乐文件的目录...</value>
</data> </data>
<data name="Lyrics_Browse" xml:space="preserve"> <data name="Lyrics_Browse" xml:space="preserve">
<value>浏览...</value> <value>浏览...</value>
</data> </data>
<data name="Lyrics_Parallel" xml:space="preserve"> <data name="Lyrics_Parallel" xml:space="preserve">
<value>并行:</value> <value>并行任务数</value>
</data> </data>
<data name="Lyrics_StartDownload" xml:space="preserve"> <data name="Lyrics_StartDownload" xml:space="preserve">
<value>开始下载</value> <value>开始下载</value>
@@ -105,6 +108,9 @@
<data name="Lyrics_Status_Complete" xml:space="preserve"> <data name="Lyrics_Status_Complete" xml:space="preserve">
<value>下载完成</value> <value>下载完成</value>
</data> </data>
<data name="Lyrics_EmptyState" xml:space="preserve">
<value>暂无任务，请选择目录开始解析</value>
</data>
<data name="Common_Total" xml:space="preserve"> <data name="Common_Total" xml:space="preserve">
<value>总计:</value> <value>总计:</value>
</data> </data>
@@ -124,14 +130,17 @@
<data name="Album_Description" xml:space="preserve"> <data name="Album_Description" xml:space="preserve">
<value>批量下载音乐文件的专辑封面</value> <value>批量下载音乐文件的专辑封面</value>
</data> </data>
<data name="Album_FolderLabel" xml:space="preserve">
<value>音乐文件夹</value>
</data>
<data name="Album_SelectFolder" xml:space="preserve"> <data name="Album_SelectFolder" xml:space="preserve">
<value>选择音乐文件夹...</value> <value>请选择包含音乐文件的目录...</value>
</data> </data>
<data name="Album_Browse" xml:space="preserve"> <data name="Album_Browse" xml:space="preserve">
<value>浏览...</value> <value>浏览...</value>
</data> </data>
<data name="Album_Parallel" xml:space="preserve"> <data name="Album_Parallel" xml:space="preserve">
<value>并行:</value> <value>并行任务数</value>
</data> </data>
<data name="Album_StartDownload" xml:space="preserve"> <data name="Album_StartDownload" xml:space="preserve">
<value>开始下载</value> <value>开始下载</value>
@@ -139,6 +148,9 @@
<data name="Album_StopDownload" xml:space="preserve"> <data name="Album_StopDownload" xml:space="preserve">
<value>停止下载</value> <value>停止下载</value>
</data> </data>
<data name="Album_EmptyState" xml:space="preserve">
<value>暂无任务，请选择目录开始解析</value>
</data>
<!-- Settings Page --> <!-- Settings Page -->
<data name="Settings_Title" xml:space="preserve"> <data name="Settings_Title" xml:space="preserve">
<value>设置</value> <value>设置</value>

12
src/ZonyLrcTools.Desktop/Services/ServiceCollectionExtensions.cs
View File

@@ -39,12 +39,12 @@ public static class ServiceCollectionExtensions
services.AddSingleton<IDialogService, DialogService>(); services.AddSingleton<IDialogService, DialogService>();
services.AddSingleton<IThemeService, ThemeService>(); services.AddSingleton<IThemeService, ThemeService>();
// Register ViewModels // Register ViewModels (Singleton to preserve state across navigation)
services.AddTransient<MainWindowViewModel>(); services.AddSingleton<MainWindowViewModel>();
services.AddTransient<HomeViewModel>(); services.AddSingleton<HomeViewModel>();
services.AddTransient<LyricsDownloadViewModel>(); services.AddSingleton<LyricsDownloadViewModel>();
services.AddTransient<AlbumDownloadViewModel>(); services.AddSingleton<AlbumDownloadViewModel>();
services.AddTransient<SettingsViewModel>(); services.AddSingleton<SettingsViewModel>();
return services; return services;
} }

14
src/ZonyLrcTools.Desktop/ViewModels/AlbumDownloadViewModel.cs
View File

@@ -40,7 +40,8 @@ public partial class AlbumDownloadViewModel : ViewModelBase
// Localized strings // Localized strings
public string AlbumTitle => _localization?["Album_Title"] ?? "Album Cover Download"; public string AlbumTitle => _localization?["Album_Title"] ?? "Album Cover Download";
public string AlbumDescription => _localization?["Album_Description"] ?? "Download album artwork for your music collection"; public string AlbumDescription => _localization?["Album_Description"] ?? "Download album artwork for your music collection";
public string AlbumSelectFolder => _localization?["Album_SelectFolder"] ?? "Select music folder..."; public string AlbumFolderLabel => _localization?["Album_FolderLabel"] ?? "Music Folder";
public string AlbumSelectFolder => _localization?["Album_SelectFolder"] ?? "Select a folder containing music files...";
public string AlbumBrowse => _localization?["Album_Browse"] ?? "Browse..."; public string AlbumBrowse => _localization?["Album_Browse"] ?? "Browse...";
public string AlbumParallel => _localization?["Album_Parallel"] ?? "Parallel:"; public string AlbumParallel => _localization?["Album_Parallel"] ?? "Parallel:";
public string AlbumStartDownload => _localization?["Album_StartDownload"] ?? "Start Download"; public string AlbumStartDownload => _localization?["Album_StartDownload"] ?? "Start Download";
@@ -55,6 +56,10 @@ public partial class AlbumDownloadViewModel : ViewModelBase
public bool CanStartDownload => !IsDownloading && !string.IsNullOrEmpty(SelectedFolderPath); public bool CanStartDownload => !IsDownloading && !string.IsNullOrEmpty(SelectedFolderPath);
public bool HasNoFiles => MusicFiles.Count == 0;
public string EmptyStateText => _localization?["Album_EmptyState"] ?? "No tasks yet, please select a folder to start scanning";
public ObservableCollection<MusicFileViewModel> MusicFiles { get; } = new(); public ObservableCollection<MusicFileViewModel> MusicFiles { get; } = new();
public AlbumDownloadViewModel( public AlbumDownloadViewModel(
@@ -70,12 +75,18 @@ public partial class AlbumDownloadViewModel : ViewModelBase
{ {
_localization.LanguageChanged += OnLanguageChanged; _localization.LanguageChanged += OnLanguageChanged;
} }
MusicFiles.CollectionChanged += (_, _) =>
{
OnPropertyChanged(nameof(HasNoFiles));
};
} }
private void OnLanguageChanged(object? sender, EventArgs e) private void OnLanguageChanged(object? sender, EventArgs e)
{ {
OnPropertyChanged(nameof(AlbumTitle)); OnPropertyChanged(nameof(AlbumTitle));
OnPropertyChanged(nameof(AlbumDescription)); OnPropertyChanged(nameof(AlbumDescription));
OnPropertyChanged(nameof(AlbumFolderLabel));
OnPropertyChanged(nameof(AlbumSelectFolder)); OnPropertyChanged(nameof(AlbumSelectFolder));
OnPropertyChanged(nameof(AlbumBrowse)); OnPropertyChanged(nameof(AlbumBrowse));
OnPropertyChanged(nameof(AlbumParallel)); OnPropertyChanged(nameof(AlbumParallel));
@@ -88,6 +99,7 @@ public partial class AlbumDownloadViewModel : ViewModelBase
OnPropertyChanged(nameof(ColumnSongName)); OnPropertyChanged(nameof(ColumnSongName));
OnPropertyChanged(nameof(ColumnArtist)); OnPropertyChanged(nameof(ColumnArtist));
OnPropertyChanged(nameof(ColumnStatus)); OnPropertyChanged(nameof(ColumnStatus));
OnPropertyChanged(nameof(EmptyStateText));
} }
[RelayCommand] [RelayCommand]

15
src/ZonyLrcTools.Desktop/ViewModels/LyricsDownloadViewModel.cs
View File

@@ -71,7 +71,8 @@ public partial class LyricsDownloadViewModel : ViewModelBase
// Localized strings // Localized strings
public string LyricsTitle => _localization?["Lyrics_Title"] ?? "Lyrics Download"; public string LyricsTitle => _localization?["Lyrics_Title"] ?? "Lyrics Download";
public string LyricsDescription => _localization?["Lyrics_Description"] ?? "Batch download lyrics for your music files"; public string LyricsDescription => _localization?["Lyrics_Description"] ?? "Batch download lyrics for your music files";
public string LyricsSelectFolder => _localization?["Lyrics_SelectFolder"] ?? "Select music folder..."; public string LyricsFolderLabel => _localization?["Lyrics_FolderLabel"] ?? "Music Folder";
public string LyricsSelectFolder => _localization?["Lyrics_SelectFolder"] ?? "Select a folder containing music files...";
public string LyricsBrowse => _localization?["Lyrics_Browse"] ?? "Browse..."; public string LyricsBrowse => _localization?["Lyrics_Browse"] ?? "Browse...";
public string LyricsParallel => _localization?["Lyrics_Parallel"] ?? "Parallel:"; public string LyricsParallel => _localization?["Lyrics_Parallel"] ?? "Parallel:";
public string LyricsStartDownload => _localization?["Lyrics_StartDownload"] ?? "Start Download"; public string LyricsStartDownload => _localization?["Lyrics_StartDownload"] ?? "Start Download";
@@ -88,6 +89,10 @@ public partial class LyricsDownloadViewModel : ViewModelBase
public bool CanStartDownload => !IsDownloading && !IsScanning && MusicFiles.Count > 0; public bool CanStartDownload => !IsDownloading && !IsScanning && MusicFiles.Count > 0;
public bool HasNoFiles => MusicFiles.Count == 0;
public string EmptyStateText => _localization?["Lyrics_EmptyState"] ?? "No tasks yet, please select a folder to start scanning";
public ObservableCollection<MusicFileViewModel> MusicFiles { get; } = new(); public ObservableCollection<MusicFileViewModel> MusicFiles { get; } = new();
public LyricsDownloadViewModel( public LyricsDownloadViewModel(
@@ -109,12 +114,19 @@ public partial class LyricsDownloadViewModel : ViewModelBase
{ {
_localization.LanguageChanged += OnLanguageChanged; _localization.LanguageChanged += OnLanguageChanged;
} }
MusicFiles.CollectionChanged += (_, _) =>
{
OnPropertyChanged(nameof(HasNoFiles));
OnPropertyChanged(nameof(CanStartDownload));
};
} }
private void OnLanguageChanged(object? sender, EventArgs e) private void OnLanguageChanged(object? sender, EventArgs e)
{ {
OnPropertyChanged(nameof(LyricsTitle)); OnPropertyChanged(nameof(LyricsTitle));
OnPropertyChanged(nameof(LyricsDescription)); OnPropertyChanged(nameof(LyricsDescription));
OnPropertyChanged(nameof(LyricsFolderLabel));
OnPropertyChanged(nameof(LyricsSelectFolder)); OnPropertyChanged(nameof(LyricsSelectFolder));
OnPropertyChanged(nameof(LyricsBrowse)); OnPropertyChanged(nameof(LyricsBrowse));
OnPropertyChanged(nameof(LyricsParallel)); OnPropertyChanged(nameof(LyricsParallel));
@@ -129,6 +141,7 @@ public partial class LyricsDownloadViewModel : ViewModelBase
OnPropertyChanged(nameof(ColumnArtist)); OnPropertyChanged(nameof(ColumnArtist));
OnPropertyChanged(nameof(ColumnFilePath)); OnPropertyChanged(nameof(ColumnFilePath));
OnPropertyChanged(nameof(ColumnStatus)); OnPropertyChanged(nameof(ColumnStatus));
OnPropertyChanged(nameof(EmptyStateText));
} }
[RelayCommand(CanExecute = nameof(CanSelectFolder))] [RelayCommand(CanExecute = nameof(CanSelectFolder))]

141
src/ZonyLrcTools.Desktop/Views/MainWindow.axaml
View File

@@ -10,55 +10,146 @@
MinWidth="900" MinHeight="600" MinWidth="900" MinHeight="600"
WindowStartupLocation="CenterScreen"> WindowStartupLocation="CenterScreen">
<Grid ColumnDefinitions="220,*"> <Window.Styles>
<!-- Nav ListBoxItem: remove default selection background, use rounded style -->
<Style Selector="ListBox.nav-list ListBoxItem">
<Setter Property="Padding" Value="12,10" />
<Setter Property="Margin" Value="8,2" />
<Setter Property="CornerRadius" Value="6" />
<Setter Property="Background" Value="Transparent" />
</Style>
<Style Selector="ListBox.nav-list ListBoxItem:selected /template/ ContentPresenter">
<Setter Property="Background" Value="{DynamicResource NavActiveBackgroundBrush}" />
</Style>
<Style Selector="ListBox.nav-list ListBoxItem:pointerover /template/ ContentPresenter">
<Setter Property="Background" Value="{DynamicResource NavActiveBackgroundBrush}" />
<Setter Property="Opacity" Value="0.6" />
</Style>
<Style Selector="ListBox.nav-list ListBoxItem:selected:pointerover /template/ ContentPresenter">
<Setter Property="Opacity" Value="1" />
</Style>
<Style Selector="ListBox.nav-list">
<Setter Property="Background" Value="Transparent" />
</Style>
</Window.Styles>
<Grid ColumnDefinitions="240,*">
<!-- Left Navigation Panel --> <!-- Left Navigation Panel -->
<Border Grid.Column="0" <Border Grid.Column="0"
Background="{DynamicResource NavigationBackgroundBrush}" Background="{DynamicResource NavigationBackgroundBrush}"
Padding="8"> BorderBrush="{DynamicResource SeparatorBrush}"
<DockPanel> BorderThickness="0,0,1,0">
<!-- App Title --> <DockPanel Margin="0,8,0,0">
<StackPanel DockPanel.Dock="Top" Margin="8,16,8,24"> <!-- Logo Area -->
<TextBlock Text="ZonyLrcTools" <StackPanel DockPanel.Dock="Top" Margin="24,16,24,24">
FontSize="24" <StackPanel Orientation="Horizontal">
FontWeight="Bold" <TextBlock Text="ZonyLrcTools"
HorizontalAlignment="Center" /> FontSize="20"
FontWeight="Bold"
VerticalAlignment="Center" />
<Border Background="#000000"
CornerRadius="4"
Padding="5,1"
Margin="3,0,0,0"
VerticalAlignment="Center">
<TextBlock Text="X"
FontSize="12"
FontWeight="Bold"
Foreground="White" />
</Border>
</StackPanel>
<TextBlock Text="{Binding HomeDescription}" <TextBlock Text="{Binding HomeDescription}"
FontSize="12" FontSize="12"
Opacity="0.7" Opacity="0.5"
HorizontalAlignment="Center"
Margin="0,4,0,0" /> Margin="0,4,0,0" />
</StackPanel> </StackPanel>
<!-- Theme Toggle --> <!-- Theme Toggle (bottom) -->
<Button DockPanel.Dock="Bottom" <Border DockPanel.Dock="Bottom"
Content="{Binding ThemeButtonText}" Background="{DynamicResource ContentAreaBrush}"
Command="{Binding ToggleThemeCommand}" CornerRadius="6"
HorizontalAlignment="Stretch" Margin="16,0,16,16"
HorizontalContentAlignment="Center" Padding="12,8">
Margin="8" /> <Button Command="{Binding ToggleThemeCommand}"
HorizontalAlignment="Center"
Background="Transparent"
BorderThickness="0"
Padding="0">
<StackPanel Orientation="Horizontal" Spacing="8">
<PathIcon Data="{StaticResource MoonIcon}"
Width="14" Height="14"
IsVisible="{Binding !IsDarkTheme}" />
<PathIcon Data="{StaticResource SunIcon}"
Width="14" Height="14"
IsVisible="{Binding IsDarkTheme}" />
<TextBlock Text="{Binding ThemeButtonText}"
VerticalAlignment="Center"
FontSize="13" />
</StackPanel>
</Button>
</Border>
<!-- Navigation Menu --> <!-- Navigation Menu -->
<ListBox SelectedIndex="{Binding SelectedNavigationIndex}" <ListBox Classes="nav-list"
Margin="0,8" SelectedIndex="{Binding SelectedNavigationIndex}"
Margin="0,8,0,0"
SelectionChanged="OnNavigationSelectionChanged"> SelectionChanged="OnNavigationSelectionChanged">
<ListBoxItem> <ListBoxItem>
<TextBlock Text="{Binding NavHome}" VerticalAlignment="Center" /> <StackPanel Orientation="Horizontal" Spacing="8">
<Border Width="3" CornerRadius="1.5"
Background="{DynamicResource AppAccentBrush}"
Margin="0,2"
IsVisible="{Binding $parent[ListBoxItem].IsSelected}" />
<PathIcon Data="{StaticResource HomeIcon}"
Width="16" Height="16" />
<TextBlock Text="{Binding NavHome}"
VerticalAlignment="Center" />
</StackPanel>
</ListBoxItem> </ListBoxItem>
<ListBoxItem> <ListBoxItem>
<TextBlock Text="{Binding NavLyricsDownload}" VerticalAlignment="Center" /> <StackPanel Orientation="Horizontal" Spacing="8">
<Border Width="3" CornerRadius="1.5"
Background="{DynamicResource AppAccentBrush}"
Margin="0,2"
IsVisible="{Binding $parent[ListBoxItem].IsSelected}" />
<PathIcon Data="{StaticResource MusicNoteIcon}"
Width="16" Height="16" />
<TextBlock Text="{Binding NavLyricsDownload}"
VerticalAlignment="Center" />
</StackPanel>
</ListBoxItem> </ListBoxItem>
<ListBoxItem> <ListBoxItem>
<TextBlock Text="{Binding NavAlbumDownload}" VerticalAlignment="Center" /> <StackPanel Orientation="Horizontal" Spacing="8">
<Border Width="3" CornerRadius="1.5"
Background="{DynamicResource AppAccentBrush}"
Margin="0,2"
IsVisible="{Binding $parent[ListBoxItem].IsSelected}" />
<PathIcon Data="{StaticResource ImageIcon}"
Width="16" Height="16" />
<TextBlock Text="{Binding NavAlbumDownload}"
VerticalAlignment="Center" />
</StackPanel>
</ListBoxItem> </ListBoxItem>
<ListBoxItem> <ListBoxItem>
<TextBlock Text="{Binding NavSettings}" VerticalAlignment="Center" /> <StackPanel Orientation="Horizontal" Spacing="8">
<Border Width="3" CornerRadius="1.5"
Background="{DynamicResource AppAccentBrush}"
Margin="0,2"
IsVisible="{Binding $parent[ListBoxItem].IsSelected}" />
<PathIcon Data="{StaticResource SettingsIcon}"
Width="16" Height="16" />
<TextBlock Text="{Binding NavSettings}"
VerticalAlignment="Center" />
</StackPanel>
</ListBoxItem> </ListBoxItem>
</ListBox> </ListBox>
</DockPanel> </DockPanel>
</Border> </Border>
<!-- Right Content Area --> <!-- Right Content Area -->
<Border Grid.Column="1" Padding="24"> <Border Grid.Column="1"
Background="{DynamicResource ContentAreaBrush}"
Padding="24">
<ContentControl Content="{Binding CurrentPage}"> <ContentControl Content="{Binding CurrentPage}">
<ContentControl.DataTemplates> <ContentControl.DataTemplates>
<DataTemplate DataType="vm:HomeViewModel"> <DataTemplate DataType="vm:HomeViewModel">

244
src/ZonyLrcTools.Desktop/Views/Pages/AlbumDownloadPage.axaml
View File

@@ -1,139 +1,193 @@
<UserControl xmlns="https://github.com/avaloniaui" <UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="using:ZonyLrcTools.Desktop.ViewModels" xmlns:vm="using:ZonyLrcTools.Desktop.ViewModels"
xmlns:loc="using:ZonyLrcTools.Desktop.Infrastructure.Localization"
x:Class="ZonyLrcTools.Desktop.Views.Pages.AlbumDownloadPage" x:Class="ZonyLrcTools.Desktop.Views.Pages.AlbumDownloadPage"
x:DataType="vm:AlbumDownloadViewModel"> x:DataType="vm:AlbumDownloadViewModel">
<Grid RowDefinitions="Auto,Auto,*,Auto"> <Grid RowDefinitions="Auto,Auto,*,Auto">
<!-- Title --> <!-- Title -->
<StackPanel Grid.Row="0" Margin="0,0,0,24"> <StackPanel Grid.Row="0" Margin="0,0,0,20">
<TextBlock Text="{Binding AlbumTitle}" <TextBlock Text="{Binding AlbumTitle}"
FontSize="28" FontSize="24"
FontWeight="SemiBold" /> FontWeight="Bold" />
<TextBlock Text="{Binding AlbumDescription}" <TextBlock Text="{Binding AlbumDescription}"
Opacity="0.7" FontSize="13"
Opacity="0.6"
Margin="0,4,0,0" /> Margin="0,4,0,0" />
</StackPanel> </StackPanel>
<!-- Controls --> <!-- Card 1: Form Controls -->
<Border Grid.Row="1" <Border Grid.Row="1"
Background="{DynamicResource NavigationBackgroundBrush}" Background="{DynamicResource CardBackgroundBrush}"
CornerRadius="8" CornerRadius="8"
Padding="16" BoxShadow="0 2 8 0 #0D000000"
Padding="24,20"
Margin="0,0,0,16"> Margin="0,0,0,16">
<StackPanel Spacing="16"> <Grid RowDefinitions="Auto,Auto,Auto,Auto" ColumnDefinitions="Auto,*,Auto"
<!-- Row 1: Folder Selection --> >
<Grid ColumnDefinitions="*,Auto"> <!-- Row 0: Folder Selection -->
<TextBox Grid.Column="0" <TextBlock Grid.Row="0" Grid.Column="0"
Text="{Binding SelectedFolderPath}" Text="{Binding AlbumFolderLabel}"
Watermark="{Binding AlbumSelectFolder}" VerticalAlignment="Center"
IsReadOnly="True" FontSize="13"
Margin="0,0,12,0" /> FontWeight="Medium" />
<Button Grid.Column="1" <TextBox Grid.Row="0" Grid.Column="1"
Content="{Binding AlbumBrowse}" Text="{Binding SelectedFolderPath}"
Command="{Binding SelectFolderCommand}" Watermark="{Binding AlbumSelectFolder}"
MinWidth="80" /> IsReadOnly="True"
</Grid> Margin="16,0" />
<Button Grid.Row="0" Grid.Column="2"
Content="{Binding AlbumBrowse}"
Command="{Binding SelectFolderCommand}"
MinWidth="80"
HorizontalAlignment="Stretch" />
<!-- Row 2: Options and Actions --> <!-- Separator -->
<Grid ColumnDefinitions="Auto,Auto,*,Auto"> <Border Grid.Row="1" Grid.ColumnSpan="3"
<!-- Parallel Count --> Height="1"
<TextBlock Grid.Column="0" Background="{DynamicResource SeparatorBrush}"
Text="{Binding AlbumParallel}" Opacity="0.5"
Margin="0,16" />
<!-- Row 2: Parallel Count + Download Button -->
<TextBlock Grid.Row="2" Grid.Column="0"
Text="{Binding AlbumParallel}"
VerticalAlignment="Center"
FontSize="13"
FontWeight="Medium" />
<NumericUpDown Grid.Row="2" Grid.Column="1"
Value="{Binding ParallelCount}"
Minimum="1"
Maximum="32"
Increment="1"
Width="100"
FormatString="0"
HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
Margin="0,0,8,0" /> Margin="16,0" />
<TextBox Grid.Column="1" <StackPanel Grid.Row="2" Grid.Column="2"
Text="{Binding ParallelCount}" Orientation="Horizontal" Spacing="8">
Width="60" <Button Command="{Binding StartDownloadCommand}"
TextAlignment="Center" IsVisible="{Binding !IsDownloading}"
VerticalContentAlignment="Center" /> Classes="accent"
MinWidth="120">
<StackPanel Orientation="Horizontal" Spacing="6">
<PathIcon Data="{StaticResource DownloadIcon}"
Width="14" Height="14" />
<TextBlock Text="{Binding AlbumStartDownload}"
VerticalAlignment="Center" />
</StackPanel>
</Button>
<Button Command="{Binding CancelDownloadCommand}"
Content="{Binding AlbumStopDownload}"
IsVisible="{Binding IsDownloading}"
MinWidth="100" />
</StackPanel>
<!-- Spacer --> <!-- Row 3: Progress -->
<Panel Grid.Column="2" /> <StackPanel Grid.Row="3" Grid.ColumnSpan="3"
IsVisible="{Binding IsDownloading}"
<!-- Download Buttons --> Spacing="8" Margin="0,16,0,0">
<StackPanel Grid.Column="3" Orientation="Horizontal" Spacing="8">
<Button Command="{Binding StartDownloadCommand}"
Content="{Binding AlbumStartDownload}"
IsVisible="{Binding !IsDownloading}"
Classes="accent"
MinWidth="100" />
<Button Command="{Binding CancelDownloadCommand}"
Content="{Binding AlbumStopDownload}"
IsVisible="{Binding IsDownloading}"
MinWidth="100" />
</StackPanel>
</Grid>
<!-- Progress Bar (visible during download) -->
<StackPanel IsVisible="{Binding IsDownloading}" Spacing="8">
<ProgressBar Value="{Binding ProgressPercentage}" <ProgressBar Value="{Binding ProgressPercentage}"
Maximum="100" Maximum="100" Height="6" />
Height="6" /> <TextBlock HorizontalAlignment="Center" FontSize="12" Opacity="0.7">
<TextBlock HorizontalAlignment="Center" FontSize="12" Opacity="0.8">
<Run Text="{Binding CompletedCount}" /> <Run Text="{Binding CompletedCount}" />
<Run Text=" / " /> <Run Text=" / " />
<Run Text="{Binding TotalCount}" /> <Run Text="{Binding TotalCount}" />
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
</StackPanel> </Grid>
</Border> </Border>
<!-- File List --> <!-- Card 2: File List with Empty State -->
<Border Grid.Row="2" <Panel Grid.Row="2">
Background="{DynamicResource NavigationBackgroundBrush}" <Border Background="{DynamicResource CardBackgroundBrush}"
CornerRadius="8" CornerRadius="8"
Padding="1"> BoxShadow="0 2 8 0 #0D000000"
<DataGrid ItemsSource="{Binding MusicFiles}" ClipToBounds="True">
AutoGenerateColumns="False" <DataGrid ItemsSource="{Binding MusicFiles}"
IsReadOnly="True" AutoGenerateColumns="False"
GridLinesVisibility="Horizontal" IsReadOnly="True"
BorderThickness="0"> GridLinesVisibility="Horizontal"
<DataGrid.Columns> BorderThickness="0"
<DataGridTextColumn Header="{Binding ColumnSongName}" Background="Transparent">
Binding="{Binding Name}" <DataGrid.Columns>
Width="*" /> <DataGridTextColumn x:DataType="vm:MusicFileViewModel"
<DataGridTextColumn Header="{Binding ColumnArtist}" Header="{loc:Localize Column_SongName}"
Binding="{Binding Artist}" Binding="{Binding Name}"
Width="200" /> Width="*" />
<DataGridTextColumn Header="{Binding ColumnStatus}" <DataGridTextColumn x:DataType="vm:MusicFileViewModel"
Binding="{Binding StatusMessage}" Header="{loc:Localize Column_Artist}"
Width="120" /> Binding="{Binding Artist}"
</DataGrid.Columns> Width="200" />
</DataGrid> <DataGridTextColumn x:DataType="vm:MusicFileViewModel"
</Border> Header="{loc:Localize Column_Status}"
Binding="{Binding StatusMessage}"
Width="120" />
</DataGrid.Columns>
</DataGrid>
</Border>
<!-- Status Bar --> <!-- Empty State Overlay (Margin top to preserve DataGrid header) -->
<Border Background="{DynamicResource CardBackgroundBrush}"
CornerRadius="0,0,8,8"
Margin="0,36,0,0"
IsVisible="{Binding HasNoFiles}"
IsHitTestVisible="False">
<StackPanel VerticalAlignment="Center"
HorizontalAlignment="Center"
Spacing="16">
<Border Background="{DynamicResource ContentAreaBrush}"
CornerRadius="4"
Width="50" Height="40"
HorizontalAlignment="Center">
<PathIcon Data="{StaticResource ImageIcon}"
Width="24" Height="24"
Opacity="0.3" />
</Border>
<TextBlock Text="{Binding EmptyStateText}"
Opacity="0.4"
FontSize="13"
HorizontalAlignment="Center" />
</StackPanel>
</Border>
</Panel>
<!-- Card 3: Status Bar -->
<Border Grid.Row="3" <Border Grid.Row="3"
Background="{DynamicResource NavigationBackgroundBrush}" Background="{DynamicResource CardBackgroundBrush}"
Padding="16,12" BoxShadow="0 2 8 0 #0D000000"
Padding="24,12"
Margin="0,16,0,0" Margin="0,16,0,0"
CornerRadius="8"> CornerRadius="8">
<Grid ColumnDefinitions="Auto,*,Auto,Auto"> <Grid ColumnDefinitions="Auto,*,Auto,Auto">
<!-- Total -->
<StackPanel Grid.Column="0" Orientation="Horizontal" Spacing="4"> <StackPanel Grid.Column="0" Orientation="Horizontal" Spacing="4">
<TextBlock Text="{Binding CommonTotal}" Opacity="0.8" /> <TextBlock Text="{Binding CommonTotal}" FontSize="13" FontWeight="Medium" />
<TextBlock Text="{Binding TotalCount}" FontWeight="SemiBold" /> <TextBlock Text="{Binding TotalCount}" FontWeight="Bold" FontSize="13" />
<TextBlock Text="{Binding CommonFiles}" Opacity="0.8" /> <TextBlock Text="{Binding CommonFiles}" FontSize="13" Opacity="0.7" />
</StackPanel> </StackPanel>
<!-- Spacer -->
<Panel Grid.Column="1" /> <Panel Grid.Column="1" />
<!-- Success --> <StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="6" Margin="0,0,24,0">
<StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="4" Margin="0,0,24,0"> <Border Width="4" Height="16" CornerRadius="2"
<TextBlock Text="{Binding CommonSuccess}" Opacity="0.8" /> Background="{DynamicResource SuccessColorBrush}"
VerticalAlignment="Center" />
<TextBlock Text="{Binding CommonSuccess}" FontSize="13" />
<TextBlock Text="{Binding CompletedCount}" <TextBlock Text="{Binding CompletedCount}"
FontWeight="SemiBold" FontWeight="Bold" FontSize="13"
Foreground="#4CAF50" /> Foreground="{DynamicResource SuccessColorBrush}" />
</StackPanel> </StackPanel>
<!-- Failed --> <StackPanel Grid.Column="3" Orientation="Horizontal" Spacing="6">
<StackPanel Grid.Column="3" Orientation="Horizontal" Spacing="4"> <Border Width="4" Height="16" CornerRadius="2"
<TextBlock Text="{Binding CommonFailed}" Opacity="0.8" /> Background="{DynamicResource ErrorColorBrush}"
VerticalAlignment="Center" />
<TextBlock Text="{Binding CommonFailed}" FontSize="13" />
<TextBlock Text="{Binding FailedCount}" <TextBlock Text="{Binding FailedCount}"
FontWeight="SemiBold" FontWeight="Bold" FontSize="13"
Foreground="#F44336" /> Foreground="{DynamicResource ErrorColorBrush}" />
</StackPanel> </StackPanel>
</Grid> </Grid>
</Border> </Border>

6
src/ZonyLrcTools.Desktop/Views/Pages/HomePage.axaml
View File

@@ -18,8 +18,9 @@
</StackPanel> </StackPanel>
<!-- Quick Actions --> <!-- Quick Actions -->
<Border Background="{DynamicResource NavigationBackgroundBrush}" <Border Background="{DynamicResource CardBackgroundBrush}"
CornerRadius="8" CornerRadius="8"
BoxShadow="0 2 8 0 #0D000000"
Padding="24"> Padding="24">
<StackPanel Spacing="16"> <StackPanel Spacing="16">
<TextBlock Text="Quick Actions" <TextBlock Text="Quick Actions"
@@ -55,8 +56,9 @@
</Border> </Border>
<!-- Features --> <!-- Features -->
<Border Background="{DynamicResource NavigationBackgroundBrush}" <Border Background="{DynamicResource CardBackgroundBrush}"
CornerRadius="8" CornerRadius="8"
BoxShadow="0 2 8 0 #0D000000"
Padding="24"> Padding="24">
<StackPanel Spacing="16"> <StackPanel Spacing="16">
<TextBlock Text="Features" <TextBlock Text="Features"

263
src/ZonyLrcTools.Desktop/Views/Pages/LyricsDownloadPage.axaml
View File

@@ -7,72 +7,92 @@
<Grid RowDefinitions="Auto,Auto,*,Auto"> <Grid RowDefinitions="Auto,Auto,*,Auto">
<!-- Title --> <!-- Title -->
<StackPanel Grid.Row="0" Margin="0,0,0,24"> <StackPanel Grid.Row="0" Margin="0,0,0,20">
<TextBlock Text="{Binding LyricsTitle}" <TextBlock Text="{Binding LyricsTitle}"
FontSize="28" FontSize="24"
FontWeight="SemiBold" /> FontWeight="Bold" />
<TextBlock Text="{Binding LyricsDescription}" <TextBlock Text="{Binding LyricsDescription}"
Opacity="0.7" FontSize="13"
Opacity="0.6"
Margin="0,4,0,0" /> Margin="0,4,0,0" />
</StackPanel> </StackPanel>
<!-- Controls --> <!-- Card 1: Form Controls -->
<Border Grid.Row="1" <Border Grid.Row="1"
Background="{DynamicResource NavigationBackgroundBrush}" Background="{DynamicResource CardBackgroundBrush}"
CornerRadius="8" CornerRadius="8"
Padding="16" BoxShadow="0 2 8 0 #0D000000"
Padding="24,20"
Margin="0,0,0,16"> Margin="0,0,0,16">
<StackPanel Spacing="16"> <Grid RowDefinitions="Auto,Auto,Auto,Auto" ColumnDefinitions="Auto,*,Auto"
<!-- Row 1: Folder Selection --> >
<Grid ColumnDefinitions="*,Auto"> <!-- Row 0: Folder Selection -->
<TextBox Grid.Column="0" <TextBlock Grid.Row="0" Grid.Column="0"
Text="{Binding SelectedFolderPath}" Text="{Binding LyricsFolderLabel}"
Watermark="{Binding LyricsSelectFolder}" VerticalAlignment="Center"
IsReadOnly="True" FontSize="13"
Margin="0,0,12,0" /> FontWeight="Medium" />
<Button Grid.Column="1" <TextBox Grid.Row="0" Grid.Column="1"
Content="{Binding LyricsBrowse}" Text="{Binding SelectedFolderPath}"
Command="{Binding SelectFolderCommand}" Watermark="{Binding LyricsSelectFolder}"
MinWidth="80" /> IsReadOnly="True"
</Grid> Margin="16,0" />
<Button Grid.Row="0" Grid.Column="2"
Content="{Binding LyricsBrowse}"
Command="{Binding SelectFolderCommand}"
MinWidth="80"
HorizontalAlignment="Stretch" />
<!-- Row 2: Options and Actions --> <!-- Separator -->
<Grid ColumnDefinitions="Auto,Auto,*,Auto"> <Border Grid.Row="1" Grid.ColumnSpan="3"
<!-- Parallel Count --> Height="1"
<TextBlock Grid.Column="0" Background="{DynamicResource SeparatorBrush}"
Text="{Binding LyricsParallel}" Opacity="0.5"
Margin="0,16" />
<!-- Row 2: Parallel Count + Download Button -->
<TextBlock Grid.Row="2" Grid.Column="0"
Text="{Binding LyricsParallel}"
VerticalAlignment="Center"
FontSize="13"
FontWeight="Medium" />
<NumericUpDown Grid.Row="2" Grid.Column="1"
Value="{Binding ParallelCount}"
Minimum="1"
Maximum="32"
Increment="1"
Width="100"
FormatString="0"
HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
Margin="0,0,8,0" /> Margin="16,0" />
<TextBox Grid.Column="1" <StackPanel Grid.Row="2" Grid.Column="2"
Text="{Binding ParallelCount}" Orientation="Horizontal" Spacing="8">
Width="60" <Button Command="{Binding StartDownloadCommand}"
TextAlignment="Center" IsVisible="{Binding !IsDownloading}"
VerticalContentAlignment="Center" /> IsEnabled="{Binding CanStartDownload}"
Classes="accent"
MinWidth="120">
<StackPanel Orientation="Horizontal" Spacing="6">
<PathIcon Data="{StaticResource DownloadIcon}"
Width="14" Height="14" />
<TextBlock Text="{Binding LyricsStartDownload}"
VerticalAlignment="Center" />
</StackPanel>
</Button>
<Button Command="{Binding CancelDownloadCommand}"
Content="{Binding LyricsStopDownload}"
IsVisible="{Binding IsDownloading}"
MinWidth="100" />
</StackPanel>
<!-- Spacer --> <!-- Row 3: Progress (spans all columns) -->
<Panel Grid.Column="2" /> <StackPanel Grid.Row="3" Grid.ColumnSpan="3"
IsVisible="{Binding IsScanning}"
<!-- Download Buttons --> Spacing="8" Margin="0,16,0,0">
<StackPanel Grid.Column="3" Orientation="Horizontal" Spacing="8">
<Button Command="{Binding StartDownloadCommand}"
Content="{Binding LyricsStartDownload}"
IsVisible="{Binding !IsDownloading}"
IsEnabled="{Binding CanStartDownload}"
Classes="accent"
MinWidth="100" />
<Button Command="{Binding CancelDownloadCommand}"
Content="{Binding LyricsStopDownload}"
IsVisible="{Binding IsDownloading}"
MinWidth="100" />
</StackPanel>
</Grid>
<!-- Progress Bar: Scanning phase -->
<StackPanel IsVisible="{Binding IsScanning}" Spacing="8">
<ProgressBar Value="{Binding ScanProgressPercentage}" <ProgressBar Value="{Binding ScanProgressPercentage}"
Maximum="100" Maximum="100" Height="6" />
Height="6" /> <TextBlock HorizontalAlignment="Center" FontSize="12" Opacity="0.7">
<TextBlock HorizontalAlignment="Center" FontSize="12" Opacity="0.8">
<Run Text="{Binding LyricsScanning}" /> <Run Text="{Binding LyricsScanning}" />
<Run Text=" " /> <Run Text=" " />
<Run Text="{Binding ScanProgressCount}" /> <Run Text="{Binding ScanProgressCount}" />
@@ -80,84 +100,115 @@
<Run Text="{Binding ScanTotalCount}" /> <Run Text="{Binding ScanTotalCount}" />
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
<StackPanel Grid.Row="3" Grid.ColumnSpan="3"
<!-- Progress Bar: Download phase --> IsVisible="{Binding IsDownloading}"
<StackPanel IsVisible="{Binding IsDownloading}" Spacing="8"> Spacing="8" Margin="0,16,0,0">
<ProgressBar Value="{Binding ProgressPercentage}" <ProgressBar Value="{Binding ProgressPercentage}"
Maximum="100" Maximum="100" Height="6" />
Height="6" /> <TextBlock HorizontalAlignment="Center" FontSize="12" Opacity="0.7">
<TextBlock HorizontalAlignment="Center" FontSize="12" Opacity="0.8">
<Run Text="{Binding CompletedCount}" /> <Run Text="{Binding CompletedCount}" />
<Run Text=" / " /> <Run Text=" / " />
<Run Text="{Binding TotalCount}" /> <Run Text="{Binding TotalCount}" />
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
</StackPanel> </Grid>
</Border> </Border>
<!-- File List --> <!-- Card 2: File List with Empty State -->
<Border Grid.Row="2" <Panel Grid.Row="2">
Background="{DynamicResource NavigationBackgroundBrush}" <Border Background="{DynamicResource CardBackgroundBrush}"
CornerRadius="8" CornerRadius="8"
Padding="1"> BoxShadow="0 2 8 0 #0D000000"
<DataGrid ItemsSource="{Binding MusicFiles}" ClipToBounds="True">
AutoGenerateColumns="False" <DataGrid ItemsSource="{Binding MusicFiles}"
IsReadOnly="True" AutoGenerateColumns="False"
GridLinesVisibility="Horizontal" IsReadOnly="True"
BorderThickness="0"> GridLinesVisibility="Horizontal"
<DataGrid.Columns> BorderThickness="0"
<DataGridTextColumn x:DataType="vm:MusicFileViewModel" Background="Transparent">
Header="{loc:Localize Column_SongName}" <DataGrid.Columns>
Binding="{Binding Name}" <DataGridTextColumn x:DataType="vm:MusicFileViewModel"
Width="*" /> Header="{loc:Localize Column_SongName}"
<DataGridTextColumn x:DataType="vm:MusicFileViewModel" Binding="{Binding Name}"
Header="{loc:Localize Column_Artist}" Width="*" />
Binding="{Binding Artist}" <DataGridTextColumn x:DataType="vm:MusicFileViewModel"
Width="150" /> Header="{loc:Localize Column_Artist}"
<DataGridTextColumn x:DataType="vm:MusicFileViewModel" Binding="{Binding Artist}"
Header="{loc:Localize Column_FilePath}" Width="150" />
Binding="{Binding FilePath}" <DataGridTextColumn x:DataType="vm:MusicFileViewModel"
Width="250" /> Header="{loc:Localize Column_FilePath}"
<DataGridTextColumn x:DataType="vm:MusicFileViewModel" Binding="{Binding FilePath}"
Header="{loc:Localize Column_Status}" Width="250" />
Binding="{Binding StatusMessage}" <DataGridTextColumn x:DataType="vm:MusicFileViewModel"
Width="100" /> Header="{loc:Localize Column_Status}"
</DataGrid.Columns> Binding="{Binding StatusMessage}"
</DataGrid> Width="100" />
</DataGrid.Columns>
</DataGrid>
</Border>
</Border> <!-- Empty State Overlay (Margin top to preserve DataGrid header) -->
<Border Background="{DynamicResource CardBackgroundBrush}"
CornerRadius="0,0,8,8"
Margin="0,36,0,0"
IsVisible="{Binding HasNoFiles}"
IsHitTestVisible="False">
<StackPanel VerticalAlignment="Center"
HorizontalAlignment="Center"
Spacing="16">
<Border Background="{DynamicResource ContentAreaBrush}"
CornerRadius="4"
Width="50" Height="40"
HorizontalAlignment="Center">
<PathIcon Data="{StaticResource ImageIcon}"
Width="24" Height="24"
Opacity="0.3" />
</Border>
<TextBlock Text="{Binding EmptyStateText}"
Opacity="0.4"
FontSize="13"
HorizontalAlignment="Center" />
</StackPanel>
</Border>
</Panel>
<!-- Status Bar --> <!-- Card 3: Status Bar -->
<Border Grid.Row="3" <Border Grid.Row="3"
Background="{DynamicResource NavigationBackgroundBrush}" Background="{DynamicResource CardBackgroundBrush}"
Padding="16,12" BoxShadow="0 2 8 0 #0D000000"
Padding="24,12"
Margin="0,16,0,0" Margin="0,16,0,0"
CornerRadius="8"> CornerRadius="8">
<Grid ColumnDefinitions="Auto,*,Auto,Auto"> <Grid ColumnDefinitions="Auto,*,Auto,Auto">
<!-- Total --> <!-- Total -->
<StackPanel Grid.Column="0" Orientation="Horizontal" Spacing="4"> <StackPanel Grid.Column="0" Orientation="Horizontal" Spacing="4">
<TextBlock Text="{Binding CommonTotal}" Opacity="0.8" /> <TextBlock Text="{Binding CommonTotal}" FontSize="13" FontWeight="Medium" />
<TextBlock Text="{Binding TotalCount}" FontWeight="SemiBold" /> <TextBlock Text="{Binding TotalCount}" FontWeight="Bold" FontSize="13" />
<TextBlock Text="{Binding CommonFiles}" Opacity="0.8" /> <TextBlock Text="{Binding CommonFiles}" FontSize="13" Opacity="0.7" />
</StackPanel> </StackPanel>
<!-- Spacer -->
<Panel Grid.Column="1" /> <Panel Grid.Column="1" />
<!-- Success --> <!-- Success -->
<StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="4" Margin="0,0,24,0"> <StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="6" Margin="0,0,24,0">
<TextBlock Text="{Binding CommonSuccess}" Opacity="0.8" /> <Border Width="4" Height="16" CornerRadius="2"
Background="{DynamicResource SuccessColorBrush}"
VerticalAlignment="Center" />
<TextBlock Text="{Binding CommonSuccess}" FontSize="13" />
<TextBlock Text="{Binding CompletedCount}" <TextBlock Text="{Binding CompletedCount}"
FontWeight="SemiBold" FontWeight="Bold" FontSize="13"
Foreground="#4CAF50" /> Foreground="{DynamicResource SuccessColorBrush}" />
</StackPanel> </StackPanel>
<!-- Failed --> <!-- Failed -->
<StackPanel Grid.Column="3" Orientation="Horizontal" Spacing="4"> <StackPanel Grid.Column="3" Orientation="Horizontal" Spacing="6">
<TextBlock Text="{Binding CommonFailed}" Opacity="0.8" /> <Border Width="4" Height="16" CornerRadius="2"
Background="{DynamicResource ErrorColorBrush}"
VerticalAlignment="Center" />
<TextBlock Text="{Binding CommonFailed}" FontSize="13" />
<TextBlock Text="{Binding FailedCount}" <TextBlock Text="{Binding FailedCount}"
FontWeight="SemiBold" FontWeight="Bold" FontSize="13"
Foreground="#F44336" /> Foreground="{DynamicResource ErrorColorBrush}" />
</StackPanel> </StackPanel>
</Grid> </Grid>
</Border> </Border>

16
src/ZonyLrcTools.Desktop/Views/Pages/SettingsPage.axaml
View File

@@ -9,13 +9,14 @@
<!-- Title --> <!-- Title -->
<StackPanel Margin="0,0,0,8"> <StackPanel Margin="0,0,0,8">
<TextBlock Text="{Binding SettingsTitle}" <TextBlock Text="{Binding SettingsTitle}"
FontSize="28" FontSize="24"
FontWeight="SemiBold" /> FontWeight="Bold" />
</StackPanel> </StackPanel>
<!-- Language Settings --> <!-- Language Settings -->
<Border Background="{DynamicResource NavigationBackgroundBrush}" <Border Background="{DynamicResource CardBackgroundBrush}"
CornerRadius="8" CornerRadius="8"
BoxShadow="0 2 8 0 #0D000000"
Padding="24"> Padding="24">
<StackPanel Spacing="16"> <StackPanel Spacing="16">
<TextBlock Text="{Binding SettingsLanguage}" <TextBlock Text="{Binding SettingsLanguage}"
@@ -37,8 +38,9 @@
</Border> </Border>
<!-- Network Settings --> <!-- Network Settings -->
<Border Background="{DynamicResource NavigationBackgroundBrush}" <Border Background="{DynamicResource CardBackgroundBrush}"
CornerRadius="8" CornerRadius="8"
BoxShadow="0 2 8 0 #0D000000"
Padding="24"> Padding="24">
<StackPanel Spacing="16"> <StackPanel Spacing="16">
<TextBlock Text="{Binding SettingsProxy}" <TextBlock Text="{Binding SettingsProxy}"
@@ -66,8 +68,9 @@
</Border> </Border>
<!-- Lyrics Settings --> <!-- Lyrics Settings -->
<Border Background="{DynamicResource NavigationBackgroundBrush}" <Border Background="{DynamicResource CardBackgroundBrush}"
CornerRadius="8" CornerRadius="8"
BoxShadow="0 2 8 0 #0D000000"
Padding="24"> Padding="24">
<StackPanel Spacing="16"> <StackPanel Spacing="16">
<TextBlock Text="Lyrics" <TextBlock Text="Lyrics"
@@ -94,8 +97,9 @@
</Border> </Border>
<!-- Lyrics Providers --> <!-- Lyrics Providers -->
<Border Background="{DynamicResource NavigationBackgroundBrush}" <Border Background="{DynamicResource CardBackgroundBrush}"
CornerRadius="8" CornerRadius="8"
BoxShadow="0 2 8 0 #0D000000"
Padding="24"> Padding="24">
<StackPanel Spacing="16"> <StackPanel Spacing="16">
<TextBlock Text="{Binding SettingsLyricsProvider}" <TextBlock Text="{Binding SettingsLyricsProvider}"