Skip to content

Free, open-source Windows optimization tool for performance, privacy, and simplicity.

feat: redesign settings page fix: add Csharpier ignore for xaml files fix: remove unused translation keys

fatDuck2e450b8af74f
diff --git a/optimizerDuck/.csharpierignore b/optimizerDuck/.csharpierignore
new file mode 100644
index 0000000..4b8f843
--- /dev/null
+++ b/optimizerDuck/.csharpierignore
@@ -0,0 +1 @@
+*.xaml
\ No newline at end of file
diff --git a/optimizerDuck/Resources/Languages/Translations.Designer.cs b/optimizerDuck/Resources/Languages/Translations.Designer.cs
index d71427d..b94472e 100644
--- a/optimizerDuck/Resources/Languages/Translations.Designer.cs
+++ b/optimizerDuck/Resources/Languages/Translations.Designer.cs
@@ -582,33 +582,6 @@ namespace optimizerDuck.Resources.Languages {
}
}
- /// <summary>
- /// Looks up a localized string similar to System overview and quick actions.
- /// </summary>
- internal static string Dashboard_Header_Description {
- get {
- return ResourceManager.GetString("Dashboard.Header.Description", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Options.
- /// </summary>
- internal static string Dashboard_Header_Menu_Header_Options {
- get {
- return ResourceManager.GetString("Dashboard.Header.Menu.Header.Options", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Run.
- /// </summary>
- internal static string Dashboard_Header_Menu_Header_Run {
- get {
- return ResourceManager.GetString("Dashboard.Header.Menu.Header.Run", resourceCulture);
- }
- }
-
/// <summary>
/// Looks up a localized string similar to Refresh.
/// </summary>
@@ -618,24 +591,6 @@ namespace optimizerDuck.Resources.Languages {
}
}
- /// <summary>
- /// Looks up a localized string similar to Control Panel.
- /// </summary>
- internal static string Dashboard_Header_Menu_RunControlPanel {
- get {
- return ResourceManager.GetString("Dashboard.Header.Menu.RunControlPanel", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Settings.
- /// </summary>
- internal static string Dashboard_Header_Menu_RunSettings {
- get {
- return ResourceManager.GetString("Dashboard.Header.Menu.RunSettings", resourceCulture);
- }
- }
-
/// <summary>
/// Looks up a localized string similar to Task Manager.
/// </summary>
@@ -3918,7 +3873,7 @@ namespace optimizerDuck.Resources.Languages {
}
/// <summary>
- /// Looks up a localized string similar to This may take a moment while scanning for all scheduled tasks on your system..
+ /// Looks up a localized string similar to This may take a moment while scanning for all scheduled tasks on your system....
/// </summary>
internal static string ScheduledTasks_Loading_Hint {
get {
@@ -4260,75 +4215,39 @@ namespace optimizerDuck.Resources.Languages {
}
/// <summary>
- /// Looks up a localized string similar to Thank you for your trust and support &lt;3!
- ///Current version: {0}.
- /// </summary>
- internal static string Settings_About_Duck_Description {
- get {
- return ResourceManager.GetString("Settings.About.Duck.Description", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to About.
+ /// Looks up a localized string similar to View documentation, usage guides, and FAQs..
/// </summary>
- internal static string Settings_About_Header {
+ internal static string Settings_About_Documentation_Description {
get {
- return ResourceManager.GetString("Settings.About.Header", resourceCulture);
+ return ResourceManager.GetString("Settings.About.Documentation.Description", resourceCulture);
}
}
/// <summary>
- /// Looks up a localized string similar to Learn more.
- /// </summary>
- internal static string Settings_About_LearnMore {
- get {
- return ResourceManager.GetString("Settings.About.LearnMore", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Acknowledgments.
- /// </summary>
- internal static string Settings_About_LearnMore_Acknowledgements {
- get {
- return ResourceManager.GetString("Settings.About.LearnMore.Acknowledgements", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Community.
- /// </summary>
- internal static string Settings_About_LearnMore_Community {
- get {
- return ResourceManager.GetString("Settings.About.LearnMore.Community", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Contribute.
+ /// Looks up a localized string similar to Documentation.
/// </summary>
- internal static string Settings_About_LearnMore_Contribute {
+ internal static string Settings_About_Documentation_Title {
get {
- return ResourceManager.GetString("Settings.About.LearnMore.Contribute", resourceCulture);
+ return ResourceManager.GetString("Settings.About.Documentation.Title", resourceCulture);
}
}
/// <summary>
- /// Looks up a localized string similar to Documentation.
+ /// Looks up a localized string similar to Thank you for your trust and support &lt;3!
+ ///Current version: {0}.
/// </summary>
- internal static string Settings_About_LearnMore_Documentation {
+ internal static string Settings_About_Duck_Description {
get {
- return ResourceManager.GetString("Settings.About.LearnMore.Documentation", resourceCulture);
+ return ResourceManager.GetString("Settings.About.Duck.Description", resourceCulture);
}
}
/// <summary>
- /// Looks up a localized string similar to Official Website.
+ /// Looks up a localized string similar to About.
/// </summary>
- internal static string Settings_About_LearnMore_Website {
+ internal static string Settings_About_Header {
get {
- return ResourceManager.GetString("Settings.About.LearnMore.Website", resourceCulture);
+ return ResourceManager.GetString("Settings.About.Header", resourceCulture);
}
}
diff --git a/optimizerDuck/Resources/Languages/Translations.resx b/optimizerDuck/Resources/Languages/Translations.resx
index 6611b82..b5d483e 100644
--- a/optimizerDuck/Resources/Languages/Translations.resx
+++ b/optimizerDuck/Resources/Languages/Translations.resx
@@ -482,15 +482,6 @@ Current version: {0}</value>
<data name="Settings.About.Header" xml:space="preserve">
<value>About</value>
</data>
- <data name="Settings.About.LearnMore" xml:space="preserve">
- <value>Learn more</value>
- </data>
- <data name="Settings.About.LearnMore.Documentation" xml:space="preserve">
- <value>Documentation</value>
- </data>
- <data name="Settings.About.LearnMore.Contribute" xml:space="preserve">
- <value>Contribute</value>
- </data>
<data name="Dialog.AreYouSure.Title" xml:space="preserve">
<value>Do you really want to proceed?</value>
</data>
@@ -542,21 +533,9 @@ Current version: {0}</value>
<data name="Dashboard.Header.Menu.Refresh" xml:space="preserve">
<value>Refresh</value>
</data>
- <data name="Dashboard.Header.Menu.Header.Options" xml:space="preserve">
- <value>Options</value>
- </data>
- <data name="Dashboard.Header.Menu.Header.Run" xml:space="preserve">
- <value>Run</value>
- </data>
- <data name="Dashboard.Header.Menu.RunSettings" xml:space="preserve">
- <value>Settings</value>
- </data>
<data name="Dashboard.Header.Menu.RunTaskManager" xml:space="preserve">
<value>Task Manager</value>
</data>
- <data name="Dashboard.Header.Menu.RunControlPanel" xml:space="preserve">
- <value>Control Panel</value>
- </data>
<data name="Common.Unknown" xml:space="preserve">
<value>Unknown</value>
</data>
@@ -1025,9 +1004,6 @@ Current version: {0}</value>
<data name="Settings.About.Acknowledgements.Description" xml:space="preserve">
<value>optimizerDuck is made possible by the following open-source software and resources.</value>
</data>
- <data name="Settings.About.LearnMore.Acknowledgements" xml:space="preserve">
- <value>Acknowledgments</value>
- </data>
<data name="RestorePoint.Title" xml:space="preserve">
<value>System Restore</value>
</data>
@@ -1289,9 +1265,6 @@ Update now to enjoy the latest features, improvements, and bug fixes.</value>
<data name="Bloatware.Header.Description" xml:space="preserve">
<value>Manage and remove pre-installed applications that you don't need</value>
</data>
- <data name="Dashboard.Header.Description" xml:space="preserve">
- <value>System overview and quick actions</value>
- </data>
<data name="Dashboard.SystemInfo.Header" xml:space="preserve">
<value>System Information</value>
</data>
@@ -1394,9 +1367,6 @@ Update now to enjoy the latest features, improvements, and bug fixes.</value>
<data name="StartupManager.Menu.OpenSettings" xml:space="preserve">
<value>Open Settings</value>
</data>
- <data name="Settings.About.LearnMore.Website" xml:space="preserve">
- <value>Official Website</value>
- </data>
<!-- Scheduled Tasks (Startup Manager) -->
<data name="StartupManager.Tasks.HideMicrosoft" xml:space="preserve">
<value>Hide Microsoft tasks</value>
@@ -1416,7 +1386,7 @@ Update now to enjoy the latest features, improvements, and bug fixes.</value>
<value>Loading scheduled tasks...</value>
</data>
<data name="ScheduledTasks.Loading.Hint" xml:space="preserve">
- <value>This may take a moment while scanning for all scheduled tasks on your system.</value>
+ <value>This may take a moment while scanning for all scheduled tasks on your system...</value>
</data>
<data name="ScheduledTasks.HideMicrosoft" xml:space="preserve">
<value>Hide Microsoft tasks</value>
@@ -1528,9 +1498,6 @@ Update now to enjoy the latest features, improvements, and bug fixes.</value>
<data name="Settings.About.NeedHelp.Description" xml:space="preserve">
<value>If you need help with optimization or have any questions, please join our community for quick support.</value>
</data>
- <data name="Settings.About.LearnMore.Community" xml:space="preserve">
- <value>Community</value>
- </data>
<data name="ScheduledTasks.Error.TaskNotFound" xml:space="preserve">
<value>Task not found: {0}</value>
</data>
@@ -1729,4 +1696,10 @@ Update now to enjoy the latest features, improvements, and bug fixes.</value>
<data name="Dialog.PendingChanges.SecondaryButton" xml:space="preserve">
<value>Restart Explorer</value>
</data>
+ <data name="Settings.About.Documentation.Title" xml:space="preserve">
+ <value>Documentation</value>
+ </data>
+ <data name="Settings.About.Documentation.Description" xml:space="preserve">
+ <value>View documentation, usage guides, and FAQs.</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/optimizerDuck/Resources/Languages/Translations.vi-VN.resx b/optimizerDuck/Resources/Languages/Translations.vi-VN.resx
index cfe7f48..7d39ab2 100644
--- a/optimizerDuck/Resources/Languages/Translations.vi-VN.resx
+++ b/optimizerDuck/Resources/Languages/Translations.vi-VN.resx
@@ -435,7 +435,7 @@
</data>
<data name="Settings.About.Duck.Description" xml:space="preserve">
<value>Cảm ơn bạn đã tin tưởng và ủng hộ &lt;3!
-Phiên bản hiện tại: {0} </value>
+Phiên bản hiện tại: {0}</value>
</data>
<data name="Settings.Advanced.Header" xml:space="preserve">
<value>Nâng cao</value>
@@ -476,15 +476,6 @@ Phiên bản hiện tại: {0} </value>
<data name="Settings.About.Header" xml:space="preserve">
<value>Giới thiệu</value>
</data>
- <data name="Settings.About.LearnMore" xml:space="preserve">
- <value>Tìm hiểu thêm</value>
- </data>
- <data name="Settings.About.LearnMore.Documentation" xml:space="preserve">
- <value>Tài liệu hướng dẫn</value>
- </data>
- <data name="Settings.About.LearnMore.Contribute" xml:space="preserve">
- <value>Đóng góp cho dự án</value>
- </data>
<data name="Dialog.AreYouSure.Title" xml:space="preserve">
<value>Bạn có chắc chắn muốn tiếp tục không?</value>
</data>
@@ -536,21 +527,9 @@ Phiên bản hiện tại: {0} </value>
<data name="Dashboard.Header.Menu.Refresh" xml:space="preserve">
<value>Làm mới</value>
</data>
- <data name="Dashboard.Header.Menu.Header.Options" xml:space="preserve">
- <value>Tùy chọn</value>
- </data>
- <data name="Dashboard.Header.Menu.Header.Run" xml:space="preserve">
- <value>Mở</value>
- </data>
- <data name="Dashboard.Header.Menu.RunSettings" xml:space="preserve">
- <value>Cài đặt</value>
- </data>
<data name="Dashboard.Header.Menu.RunTaskManager" xml:space="preserve">
<value>Task Manager</value>
</data>
- <data name="Dashboard.Header.Menu.RunControlPanel" xml:space="preserve">
- <value>Control Panel</value>
- </data>
<data name="Common.Unknown" xml:space="preserve">
<value>Không rõ</value>
</data>
@@ -678,7 +657,7 @@ Phiên bản hiện tại: {0} </value>
<value>Đang tắt các dịch vụ telemetry...</value>
</data>
<data name="Optimizer.SecurityAndPrivacy.DisableTelemetry.Progress.DisableTasks" xml:space="preserve">
- <value>Đang tắt các tác vụ telemetry theo lịch trình…</value>
+ <value>Đang tắt các tác vụ telemetry theo lịch trình...</value>
</data>
<data name="Optimizer.SecurityAndPrivacy.DisableErrorReporting.Name" xml:space="preserve">
<value>Vô hiệu hóa báo cáo lỗi</value>
@@ -989,9 +968,6 @@ Phiên bản hiện tại: {0} </value>
<data name="Settings.About.Acknowledgements.Description" xml:space="preserve">
<value>optimizerDuck được xây dựng nhờ các phần mềm và tài nguyên nguồn mở.</value>
</data>
- <data name="Settings.About.LearnMore.Acknowledgements" xml:space="preserve">
- <value>Ghi nhận đóng góp</value>
- </data>
<data name="RestorePoint.Title" xml:space="preserve">
<value>Phục hồi hệ thống</value>
</data>
@@ -1253,9 +1229,6 @@ Cập nhật ngay để trải nghiệm các tính năng mới, cải tiến và
<data name="Bloatware.Header.Description" xml:space="preserve">
<value>Quản lý và gỡ bỏ các ứng dụng cài sẵn không cần thiết</value>
</data>
- <data name="Dashboard.Header.Description" xml:space="preserve">
- <value>Tổng quan hệ thống và thao tác nhanh</value>
- </data>
<data name="Dashboard.SystemInfo.Header" xml:space="preserve">
<value>Thông tin hệ thống</value>
</data>
@@ -1287,7 +1260,7 @@ Cập nhật ngay để trải nghiệm các tính năng mới, cải tiến và
<value>Quản Lý Khởi Động</value>
</data>
<data name="StartupManager.Header.Description" xml:space="preserve">
- <value>Quản lý các ứng dụng và tác vụ tự động chạy khi Windows khởi động</value>
+ <value>Quản lý các ứng dụng và tác vụ tự động chạy khi Windows khởi động.</value>
</data>
<data name="OptimizationDetailsDialog.Other.OpenRevertFile.Description" xml:space="preserve">
<value>Mở tệp JSON gốc chứa dữ liệu khôi phục cho tính năng tối ưu hóa này.</value>
@@ -1478,15 +1451,9 @@ Cập nhật ngay để trải nghiệm các tính năng mới, cải tiến và
<data name="ScheduledTasks.Snackbar.Error.Title" xml:space="preserve">
<value>Lỗi</value>
</data>
- <data name="Settings.About.LearnMore.Website" xml:space="preserve">
- <value>Trang Web Chính Thức</value>
- </data>
<data name="Settings.About.NeedHelp.Description" xml:space="preserve">
<value>Nếu bạn cần hỗ trợ về tối ưu hoặc có bất kỳ thắc mắc nào, hãy tham gia cộng đồng của chúng tôi để được hỗ trợ nhanh chóng.</value>
</data>
- <data name="Settings.About.LearnMore.Community" xml:space="preserve">
- <value>Cộng đồng</value>
- </data>
<data name="ScheduledTasks.Error.TaskNotFound" xml:space="preserve">
<value>Không tìm thấy task: {0}</value>
</data>
@@ -1721,4 +1688,10 @@ Cập nhật ngay để trải nghiệm các tính năng mới, cải tiến và
<data name="Dialog.PendingChanges.SecondaryButton" xml:space="preserve">
<value>Khởi động lại Explorer</value>
</data>
+ <data name="Settings.About.Documentation.Title" xml:space="preserve">
+ <value>Tài liệu</value>
+ </data>
+ <data name="Settings.About.Documentation.Description" xml:space="preserve">
+ <value>Xem tài liệu, hướng dẫn sử dụng và các câu hỏi thường gặp.</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/optimizerDuck/Resources/Languages/Translations.zh-TW.resx b/optimizerDuck/Resources/Languages/Translations.zh-TW.resx
index 4feef5d..0b3cdb7 100644
--- a/optimizerDuck/Resources/Languages/Translations.zh-TW.resx
+++ b/optimizerDuck/Resources/Languages/Translations.zh-TW.resx
@@ -451,15 +451,6 @@
<data name="Settings.About.Header" xml:space="preserve">
<value>關於</value>
</data>
- <data name="Settings.About.LearnMore" xml:space="preserve">
- <value>了解更多</value>
- </data>
- <data name="Settings.About.LearnMore.Documentation" xml:space="preserve">
- <value>文件</value>
- </data>
- <data name="Settings.About.LearnMore.Contribute" xml:space="preserve">
- <value>貢獻</value>
- </data>
<data name="Dialog.AreYouSure.Title" xml:space="preserve">
<value>您真的要繼續嗎?</value>
</data>
@@ -511,21 +502,9 @@
<data name="Dashboard.Header.Menu.Refresh" xml:space="preserve">
<value>重新整理</value>
</data>
- <data name="Dashboard.Header.Menu.Header.Options" xml:space="preserve">
- <value>選項</value>
- </data>
- <data name="Dashboard.Header.Menu.Header.Run" xml:space="preserve">
- <value>執行</value>
- </data>
- <data name="Dashboard.Header.Menu.RunSettings" xml:space="preserve">
- <value>設定</value>
- </data>
<data name="Dashboard.Header.Menu.RunTaskManager" xml:space="preserve">
<value>工作管理員</value>
</data>
- <data name="Dashboard.Header.Menu.RunControlPanel" xml:space="preserve">
- <value>控制台</value>
- </data>
<data name="Common.Unknown" xml:space="preserve">
<value>未知</value>
</data>
@@ -748,9 +727,6 @@
<data name="Settings.About.Acknowledgements.Description" xml:space="preserve">
<value>optimizerDuck 的誕生歸功於以下開放原始碼軟體和資源。</value>
</data>
- <data name="Settings.About.LearnMore.Acknowledgements" xml:space="preserve">
- <value>鳴謝</value>
- </data>
<data name="RestorePoint.Title" xml:space="preserve">
<value>系統還原</value>
</data>
@@ -1000,9 +976,6 @@
<data name="Bloatware.Header.Description" xml:space="preserve">
<value>管理和刪除您不需要的預先安裝應用程式</value>
</data>
- <data name="Dashboard.Header.Description" xml:space="preserve">
- <value>系統概覽和快速動作</value>
- </data>
<data name="Dashboard.SystemInfo.Header" xml:space="preserve">
<value>系統資訊</value>
</data>
@@ -1093,9 +1066,6 @@
<data name="StartupManager.Menu.OpenSettings" xml:space="preserve">
<value>開啟設定</value>
</data>
- <data name="Settings.About.LearnMore.Website" xml:space="preserve">
- <value>官方網站</value>
- </data>
<!-- Scheduled Tasks (Startup Manager) -->
<data name="StartupManager.Tasks.HideMicrosoft" xml:space="preserve">
<value>隱藏 Microsoft 工作</value>
@@ -1226,9 +1196,6 @@
<data name="Settings.About.NeedHelp.Description" xml:space="preserve">
<value>如果您在最佳化方面需要協助或有任何疑問,請加入我們的社群以獲得快速支援。</value>
</data>
- <data name="Settings.About.LearnMore.Community" xml:space="preserve">
- <value>社群</value>
- </data>
<data name="ScheduledTasks.Error.TaskNotFound" xml:space="preserve">
<value>找不到工作:{0}</value>
</data>
diff --git a/optimizerDuck/UI/Pages/BloatwarePage.xaml b/optimizerDuck/UI/Pages/BloatwarePage.xaml
index 71b6716..01788a2 100644
--- a/optimizerDuck/UI/Pages/BloatwarePage.xaml
+++ b/optimizerDuck/UI/Pages/BloatwarePage.xaml
@@ -259,7 +259,7 @@
<ItemsControl.Template>
<ControlTemplate TargetType="ItemsControl">
<ScrollViewer HorizontalScrollBarVisibility="Disabled">
- <ItemsPresenter />
+ <ItemsPresenter Margin="0,0,12,0" />
</ScrollViewer>
</ControlTemplate>
</ItemsControl.Template>
diff --git a/optimizerDuck/UI/Pages/DashboardPage.xaml b/optimizerDuck/UI/Pages/DashboardPage.xaml
index 6df4781..a6d08f6 100644
--- a/optimizerDuck/UI/Pages/DashboardPage.xaml
+++ b/optimizerDuck/UI/Pages/DashboardPage.xaml
@@ -395,8 +395,12 @@
<ItemsControl ItemsSource="{Binding ViewModel.RuntimeDisk.Volumes}">
<ItemsControl.ItemTemplate>
<DataTemplate>
- <ui:CardControl Margin="0,0,0,8">
- <ui:CardControl.Icon>
+ <ui:CardAction
+ Margin="0,0,0,8"
+ Command="{Binding DataContext.ViewModel.SelectDiskCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}"
+ CommandParameter="{Binding}"
+ Cursor="Hand">
+ <ui:CardAction.Icon>
<ui:SymbolIcon Filled="True" Symbol="HardDrive20">
<ui:SymbolIcon.Style>
<Style TargetType="ui:SymbolIcon">
@@ -408,107 +412,105 @@
</Style>
</ui:SymbolIcon.Style>
</ui:SymbolIcon>
- </ui:CardControl.Icon>
- <ui:CardControl.Header>
- <Grid>
- <Grid.RowDefinitions>
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- </Grid.RowDefinitions>
+ </ui:CardAction.Icon>
+ <Grid>
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
- <!-- Drive Letter and Label -->
- <StackPanel Grid.Row="0" Orientation="Horizontal">
- <ui:TextBlock
- Margin="0,0,8,0"
- FontTypography="BodyStrong"
- Text="{Binding DriveLetter, StringFormat='({0})'}" />
+ <!-- Drive Letter and Label -->
+ <StackPanel Grid.Row="0" Orientation="Horizontal">
+ <ui:TextBlock
+ Margin="0,0,8,0"
+ FontTypography="BodyStrong"
+ Text="{Binding DriveLetter, StringFormat='({0})'}" />
+
+ <ui:TextBlock
+ Margin="0,0,8,0"
+ VerticalAlignment="Center"
+ FontTypography="Caption"
+ Text="{Binding VolumeLabel}" />
+ <Border
+ Margin="0,0,4,0"
+ Padding="5,2"
+ VerticalAlignment="Center"
+ Background="{DynamicResource SystemFillColorAttentionBrush}"
+ CornerRadius="{StaticResource CornerRadiusSmall}"
+ Visibility="{Binding IsSystemDrive, Converter={StaticResource BoolToVisibilityConverter}}">
<ui:TextBlock
- Margin="0,0,8,0"
- VerticalAlignment="Center"
FontTypography="Caption"
- Text="{Binding VolumeLabel}" />
+ Foreground="Black"
+ Text="{ext:Loc Dashboard.SystemInfo.Storage.System}" />
+ </Border>
- <Border
- Margin="0,0,4,0"
- Padding="5,2"
- VerticalAlignment="Center"
- Background="{DynamicResource SystemFillColorAttentionBrush}"
- CornerRadius="{StaticResource CornerRadiusSmall}"
- Visibility="{Binding IsSystemDrive, Converter={StaticResource BoolToVisibilityConverter}}">
- <ui:TextBlock
- FontTypography="Caption"
- Foreground="Black"
- Text="{ext:Loc Dashboard.SystemInfo.Storage.System}" />
- </Border>
+ <Border
+ Margin="0,0,4,0"
+ Padding="5,2"
+ VerticalAlignment="Center"
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="{StaticResource CornerRadiusSmall}">
+ <ui:TextBlock FontTypography="Caption" Text="{Binding MediaType}">
+ <ui:TextBlock.Style>
+ <Style TargetType="ui:TextBlock">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding MediaType}" Value="SSD">
+ <Setter Property="Foreground" Value="{DynamicResource SystemFillColorSuccessBrush}" />
+ </DataTrigger>
+ <DataTrigger Binding="{Binding MediaType}" Value="HDD">
+ <Setter Property="Foreground" Value="{DynamicResource SystemFillColorCautionBrush}" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </ui:TextBlock.Style>
+ </ui:TextBlock>
+ </Border>
- <Border
- Margin="0,0,4,0"
- Padding="5,2"
- VerticalAlignment="Center"
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="{StaticResource CornerRadiusSmall}">
- <ui:TextBlock FontTypography="Caption" Text="{Binding MediaType}">
- <ui:TextBlock.Style>
- <Style TargetType="ui:TextBlock">
- <Style.Triggers>
- <DataTrigger Binding="{Binding MediaType}" Value="SSD">
- <Setter Property="Foreground" Value="{DynamicResource SystemFillColorSuccessBrush}" />
- </DataTrigger>
- <DataTrigger Binding="{Binding MediaType}" Value="HDD">
- <Setter Property="Foreground" Value="{DynamicResource SystemFillColorCautionBrush}" />
- </DataTrigger>
- </Style.Triggers>
- </Style>
- </ui:TextBlock.Style>
- </ui:TextBlock>
- </Border>
+ <Border
+ Padding="5,2"
+ VerticalAlignment="Center"
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="{StaticResource CornerRadiusSmall}">
+ <ui:TextBlock FontTypography="Caption" Text="{Binding DriveFormat}" />
+ </Border>
+ </StackPanel>
- <Border
- Padding="5,2"
- VerticalAlignment="Center"
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="{StaticResource CornerRadiusSmall}">
- <ui:TextBlock FontTypography="Caption" Text="{Binding DriveFormat}" />
- </Border>
- </StackPanel>
+ <!-- Model Information -->
+ <ui:TextBlock
+ Grid.Row="1"
+ Margin="0,4,0,0"
+ FontTypography="Caption"
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Text="{Binding Model}"
+ TextTrimming="CharacterEllipsis"
+ Visibility="{Binding Model, Converter={StaticResource NullToVisibilityConverter}}" />
- <!-- Model Information -->
+ <!-- Storage Stats -->
+ <StackPanel
+ Grid.Row="2"
+ Margin="0,4,0,0"
+ Orientation="Horizontal">
<ui:TextBlock
- Grid.Row="1"
- Margin="0,4,0,0"
FontTypography="Caption"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Text="{Binding Model}"
- TextTrimming="CharacterEllipsis"
- Visibility="{Binding Model, Converter={StaticResource NullToVisibilityConverter}}" />
-
- <!-- Storage Stats -->
- <StackPanel
- Grid.Row="2"
- Margin="0,4,0,0"
- Orientation="Horizontal">
- <ui:TextBlock
- FontTypography="Caption"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Text="{ext:Loc Dashboard.SystemInfo.Storage.DiskInfo,
- {Binding UsedSizeGB, StringFormat='{}{0:F1}'},
- {Binding TotalSizeGB, StringFormat='{}{0:F1}'},
- {Binding AvailableSizeGB, StringFormat='{}{0:F1}'}}" />
- </StackPanel>
+ Text="{ext:Loc Dashboard.SystemInfo.Storage.DiskInfo,
+ {Binding UsedSizeGB, StringFormat='{}{0:F1}'},
+ {Binding TotalSizeGB, StringFormat='{}{0:F1}'},
+ {Binding AvailableSizeGB, StringFormat='{}{0:F1}'}}" />
+ </StackPanel>
- <!-- Progress Bar -->
- <ProgressBar
- Grid.Row="3"
- Height="6"
- Margin="0,8,0,0"
- Maximum="100"
- Value="{Binding UsedPercent}" />
- </Grid>
- </ui:CardControl.Header>
- </ui:CardControl>
+ <!-- Progress Bar -->
+ <ProgressBar
+ Grid.Row="3"
+ Height="6"
+ Margin="0,8,0,0"
+ Maximum="100"
+ Value="{Binding UsedPercent}" />
+ </Grid>
+ </ui:CardAction>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
diff --git a/optimizerDuck/UI/Pages/SettingsPage.xaml b/optimizerDuck/UI/Pages/SettingsPage.xaml
index 152c33e..9dc5078 100644
--- a/optimizerDuck/UI/Pages/SettingsPage.xaml
+++ b/optimizerDuck/UI/Pages/SettingsPage.xaml
@@ -17,6 +17,7 @@
Style="{StaticResource PageRootStyle}"
mc:Ignorable="d">
<Page.Resources>
+ <converters:ThemeToGitHubIconConverter x:Key="ThemeToGitHubIconConverter" />
<converters:ThemeToIndexConverter x:Key="ThemeToIndexConverter" />
</Page.Resources>
@@ -228,122 +229,150 @@
<StackPanel Style="{StaticResource SettingsSectionStyle}">
<ui:TextBlock Style="{StaticResource SectionHeaderStyle}" Text="{ext:Loc Settings.About.Header}" />
- <ui:CardAction
+ <ui:CardExpander
Margin="0,0,0,4"
Padding="16,14"
- Command="{Binding ViewModel.OpenWebsiteCommand}"
- CommandParameter="Web"
- Cursor="Hand"
- IsChevronVisible="False">
- <ui:CardAction.Icon>
+ IsExpanded="True">
+ <ui:CardExpander.Icon>
<ui:ImageIcon Height="25" Source="pack://application:,,,/optimizerDuck;component/Resources/Images/Duck.png" />
- </ui:CardAction.Icon>
+ </ui:CardExpander.Icon>
- <Grid ColumnDefinitions="* Auto">
- <StackPanel>
- <ui:TextBlock
- FontTypography="BodyStrong"
- Foreground="{DynamicResource TextFillColorPrimaryBrush}"
- Text="optimizerDuck"
- TextWrapping="Wrap" />
- <ui:TextBlock
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Text="{ext:Loc Settings.About.Duck.Description,
- {Binding ViewModel.Version}}"
- TextWrapping="Wrap" />
- </StackPanel>
- <ui:SymbolIcon
- Grid.Column="1"
- FontSize="20"
- Symbol="Open24" />
- </Grid>
- </ui:CardAction>
+ <ui:CardExpander.Header>
+ <Grid ColumnDefinitions="* Auto">
+ <StackPanel>
+ <ui:TextBlock
+ FontTypography="BodyStrong"
+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+ Text="optimizerDuck"
+ TextWrapping="Wrap" />
+ <ui:TextBlock
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Text="{ext:Loc Settings.About.Duck.Description,
+ {Binding ViewModel.Version}}"
+ TextWrapping="Wrap" />
+ </StackPanel>
+ </Grid>
+ </ui:CardExpander.Header>
- <ui:CardAction
- Margin="0,0,0,4"
- Padding="16,14"
- Command="{Binding ViewModel.OpenWebsiteCommand}"
- CommandParameter="Help"
- Cursor="Hand"
- Icon="{ui:SymbolIcon ChatBubblesQuestion24}"
- IsChevronVisible="False">
- <Grid ColumnDefinitions="* Auto">
+ <Border>
<StackPanel>
- <ui:TextBlock
- Padding="0"
- FontTypography="BodyStrong"
- Text="{ext:Loc Settings.About.NeedHelp.Title}" />
- <ui:TextBlock
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Text="{ext:Loc Settings.About.NeedHelp.Description}"
- TextWrapping="Wrap" />
- </StackPanel>
+ <ui:CardAction
+ Margin="0,0,0,4"
+ Padding="16,14"
+ VerticalAlignment="Stretch"
+ Command="{Binding ViewModel.OpenWebsiteCommand}"
+ CommandParameter="GitHub"
+ Cursor="Hand"
+ IsChevronVisible="False">
+ <ui:CardAction.Icon>
+ <ui:ImageIcon Height="24" Source="{Binding ViewModel.CurrentApplicationTheme, Converter={StaticResource ThemeToGitHubIconConverter}}" />
+ </ui:CardAction.Icon>
+ <StackPanel>
+ <Grid ColumnDefinitions="* Auto">
+ <StackPanel>
+ <ui:TextBlock FontTypography="BodyStrong" Text="{ext:Loc Dashboard.Actions.GitHub.Title}" />
+ <ui:TextBlock
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Text="{ext:Loc Dashboard.Actions.GitHub.Description}"
+ TextWrapping="Wrap" />
+ </StackPanel>
- <ui:SymbolIcon
- Grid.Column="1"
- FontSize="20"
- Symbol="Open24" />
- </Grid>
- </ui:CardAction>
+ <ui:SymbolIcon
+ Grid.Column="1"
+ FontSize="20"
+ Symbol="Open24" />
+ </Grid>
+ </StackPanel>
+ </ui:CardAction>
- <ui:CardAction
- Margin="0,0,0,4"
- Padding="16,14"
- VerticalAlignment="Stretch"
- Command="{Binding ViewModel.OpenAcknowledgementsCommand}"
- Cursor="Hand"
- IsChevronVisible="False">
- <ui:CardAction.Icon>
- <ui:SymbolIcon Symbol="DocumentHeart24" />
- </ui:CardAction.Icon>
+ <ui:CardAction
+ Margin="0,0,0,4"
+ Padding="16,14"
+ VerticalAlignment="Stretch"
+ Command="{Binding ViewModel.OpenWebsiteCommand}"
+ CommandParameter="Documentation"
+ Cursor="Hand"
+ Icon="{ui:SymbolIcon Book20}"
+ IsChevronVisible="False">
+ <StackPanel>
+ <Grid ColumnDefinitions="* Auto">
+ <StackPanel>
+ <ui:TextBlock FontTypography="BodyStrong" Text="{ext:Loc Settings.About.Documentation.Title}" />
+ <ui:TextBlock
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Text="{ext:Loc Settings.About.Documentation.Description}"
+ TextWrapping="Wrap" />
+ </StackPanel>
- <Grid ColumnDefinitions="* Auto">
- <StackPanel>
- <ui:TextBlock
- FontTypography="BodyStrong"
- Foreground="{DynamicResource TextFillColorPrimaryBrush}"
- Text="{ext:Loc Settings.About.Acknowledgements.Title}"
- TextWrapping="Wrap" />
- <ui:TextBlock
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Text="{ext:Loc Settings.About.Acknowledgements.Description}"
- TextWrapping="Wrap" />
- </StackPanel>
+ <ui:SymbolIcon
+ Grid.Column="1"
+ FontSize="20"
+ Symbol="Open24" />
+ </Grid>
+ </StackPanel>
+ </ui:CardAction>
- <ui:SymbolIcon
- Grid.Column="1"
- FontSize="20"
- Symbol="Open24" />
- </Grid>
- </ui:CardAction>
+ <ui:CardAction
+ Margin="0,0,0,4"
+ Padding="16,14"
+ Command="{Binding ViewModel.OpenWebsiteCommand}"
+ CommandParameter="Help"
+ Cursor="Hand"
+ Icon="{ui:SymbolIcon ChatBubblesQuestion24}"
+ IsChevronVisible="False">
+ <Grid ColumnDefinitions="* Auto">
+ <StackPanel>
+ <ui:TextBlock
+ Padding="0"
+ FontTypography="BodyStrong"
+ Text="{ext:Loc Settings.About.NeedHelp.Title}" />
+ <ui:TextBlock
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Text="{ext:Loc Settings.About.NeedHelp.Description}"
+ TextWrapping="Wrap" />
+ </StackPanel>
- <ui:TextBlock
- Margin="0,16,0,8"
- FontTypography="BodyStrong"
- Text="{ext:Loc Settings.About.LearnMore}"
- TextTrimming="WordEllipsis"
- TextWrapping="Wrap" />
- <Border Style="{StaticResource ToolbarSurfaceStyle}">
- <WrapPanel>
- <ui:HyperlinkButton
- Margin="0,0,8,0"
- Content="{ext:Loc Settings.About.LearnMore.Website}"
- NavigateUri="{Binding ViewModel.Website}" />
- <ui:HyperlinkButton
- Margin="0,0,8,0"
- Content="{ext:Loc Settings.About.LearnMore.Contribute}"
- NavigateUri="{Binding ViewModel.Contribute}" />
- <ui:HyperlinkButton
- Margin="0,0,8,0"
- Content="{ext:Loc Settings.About.LearnMore.Documentation}"
- NavigateUri="{Binding ViewModel.Documentation}" />
- <ui:HyperlinkButton
- Margin="0,0,8,0"
- Content="{ext:Loc Settings.About.LearnMore.Community}"
- NavigateUri="{Binding ViewModel.Community}" />
- <ui:HyperlinkButton Content="{ext:Loc Settings.About.LearnMore.Acknowledgements}" NavigateUri="{Binding ViewModel.Acknowledgements}" />
- </WrapPanel>
- </Border>
+ <ui:SymbolIcon
+ Grid.Column="1"
+ FontSize="20"
+ Symbol="Open24" />
+ </Grid>
+ </ui:CardAction>
+
+ <ui:CardAction
+ Margin="0,0,0,4"
+ Padding="16,14"
+ VerticalAlignment="Stretch"
+ Command="{Binding ViewModel.OpenWebsiteCommand}"
+ CommandParameter="Acknowledgements"
+ Cursor="Hand"
+ IsChevronVisible="False">
+ <ui:CardAction.Icon>
+ <ui:SymbolIcon Symbol="DocumentHeart24" />
+ </ui:CardAction.Icon>
+
+ <Grid ColumnDefinitions="* Auto">
+ <StackPanel>
+ <ui:TextBlock
+ FontTypography="BodyStrong"
+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+ Text="{ext:Loc Settings.About.Acknowledgements.Title}"
+ TextWrapping="Wrap" />
+ <ui:TextBlock
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Text="{ext:Loc Settings.About.Acknowledgements.Description}"
+ TextWrapping="Wrap" />
+ </StackPanel>
+
+ <ui:SymbolIcon
+ Grid.Column="1"
+ FontSize="20"
+ Symbol="Open24" />
+ </Grid>
+ </ui:CardAction>
+ </StackPanel>
+ </Border>
+ </ui:CardExpander>
</StackPanel>
</StackPanel>
</StackPanel>
diff --git a/optimizerDuck/UI/ViewModels/Pages/DashboardViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/DashboardViewModel.cs
index efe5b89..41c3efb 100644
--- a/optimizerDuck/UI/ViewModels/Pages/DashboardViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Pages/DashboardViewModel.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
using System.Windows.Media;
using System.Windows.Threading;
using CommunityToolkit.Mvvm.ComponentModel;
@@ -132,6 +132,37 @@ public partial class DashboardViewModel : ViewModel
await LoadSystemInfoAsync();
}
+ [RelayCommand]
+ private void SelectDisk(DiskVolume diskVolume)
+ {
+ if (diskVolume is null || string.IsNullOrWhiteSpace(diskVolume.DriveLetter))
+ return;
+
+ try
+ {
+ var drivePath = $"{diskVolume.DriveLetter}\\";
+
+ Process.Start(
+ new ProcessStartInfo
+ {
+ FileName = drivePath,
+ UseShellExecute = true,
+ }
+ );
+ }
+ catch (Exception ex)
+ {
+ _snackbarService.Show(
+ Translations.Snackbar_OpenFailed_Title,
+ Translations.Snackbar_OpenFailed_Message,
+ ControlAppearance.Danger,
+ new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },
+ TimeSpan.FromSeconds(5)
+ );
+ _logger.LogError(ex, "Failed to open disk volume {DriveLetter}", diskVolume.DriveLetter);
+ }
+ }
+
[RelayCommand]
private void OpenAction(string action)
{
diff --git a/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs
index 0bcbbe4..99afdd9 100644
--- a/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs
@@ -1,4 +1,4 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
using System.Diagnostics;
using System.Globalization;
using System.Windows.Media;
@@ -45,14 +45,6 @@ public partial class SettingsViewModel(
private bool _showSnackbarNotificationAfterAppliedSuccessfully;
public string Version { get; } = Shared.FileVersion;
- //Learn more links
- public string Website { get; } = Shared.WebsiteURL;
-
- public string Documentation { get; } = Shared.WebsiteURL + "docs/guides/getting-started";
- public string Community { get; } = Shared.CommunityURL;
- public string Contribute { get; } = Shared.ContributeURL;
- public string Acknowledgements { get; } = Shared.AcknowledgementsURL;
-
public ObservableCollection<LanguageOption> Languages { get; } =
[
new() { DisplayName = "English", Culture = new CultureInfo("en-US") },
@@ -185,36 +177,6 @@ public partial class SettingsViewModel(
}
}
- [RelayCommand]
- private void OpenAcknowledgements()
- {
- try
- {
- logger.LogInformation(
- "Opening acknowledgements page: {Url}",
- Shared.AcknowledgementsURL
- );
- Process.Start(
- new ProcessStartInfo
- {
- FileName = Shared.AcknowledgementsURL,
- UseShellExecute = true,
- }
- );
- }
- catch (Exception ex)
- {
- snackbarService.Show(
- Translations.Snackbar_OpenLinkFailed_Title,
- Translations.Snackbar_OpenLinkFailed_Message,
- ControlAppearance.Danger,
- new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },
- TimeSpan.FromSeconds(5)
- );
- logger.LogError(ex, "Failed to open acknowledgements page");
- }
- }
-
[RelayCommand]
private void OpenWebsite(string type)
{
@@ -222,12 +184,34 @@ public partial class SettingsViewModel(
{
switch (type)
{
- case "Web":
- logger.LogInformation("Opening page: {Url}", Shared.WebsiteURL);
+ case "Documentation":
+ logger.LogInformation("Opening page: {Url}", Shared.WebsiteURL + "docs/guides/getting-started");
+ Process.Start(
+ new ProcessStartInfo
+ {
+ FileName = Shared.WebsiteURL + "docs/guides/getting-started",
+ UseShellExecute = true,
+ }
+ );
+ break;
+
+ case "GitHub":
+ logger.LogInformation("Opening page: {Url}", Shared.GitHubRepoURL);
+ Process.Start(
+ new ProcessStartInfo
+ {
+ FileName = Shared.GitHubRepoURL,
+ UseShellExecute = true,
+ }
+ );
+ break;
+
+ case "Acknowledgements":
+ logger.LogInformation("Opening page: {Url}", Shared.AcknowledgementsURL);
Process.Start(
new ProcessStartInfo
{
- FileName = Shared.WebsiteURL,
+ FileName = Shared.AcknowledgementsURL,
UseShellExecute = true,
}
);
diff --git a/optimizerDuck/UI/Windows/MainWindow.xaml b/optimizerDuck/UI/Windows/MainWindow.xaml
index a7b8df0..6cbf7e4 100644
--- a/optimizerDuck/UI/Windows/MainWindow.xaml
+++ b/optimizerDuck/UI/Windows/MainWindow.xaml
@@ -33,7 +33,7 @@
IsFooterSeparatorVisible="False"
IsPaneToggleVisible="True"
IsTopSeparatorVisible="False"
- OpenPaneLength="220"
+ OpenPaneLength="160"
PaneDisplayMode="Left"
TitleBar="{Binding ElementName=TitleBar, Mode=OneWay}">
<ui:NavigationView.MenuItems>