Refactor imports and fix WPF type usage

Co0ob1iee · Co0ob1iee · commit d93d3956f1c1 · 2025-11-16T08:23:46.000+01:00
Standardized and expanded using directives across multiple files for better clarity and maintainability. Replaced ambiguous WPF type references with fully qualified names (e.g., System.Windows.MessageBoxButton) to avoid conflicts and improve code readability. Removed invalid StackPanel spacing styles from XAML and updated comments to guide correct usage. Added a new PrivacyMode property to SettingsManager. Minor UI string and property assignment fixes in settings and editor windows.
diff --git a/App.xaml.cs b/App.xaml.cs
@@ -3,6 +3,13 @@
 using System.Windows;
 using System.Windows.Threading;
 using Wpf.Ui.Appearance;
+using PrettyScreenSHOT.Helpers;
+using PrettyScreenSHOT.Services;
+using PrettyScreenSHOT.Services.Update;
+using PrettyScreenSHOT.Services.Cloud;
+using PrettyScreenSHOT.Services.Settings;
+using PrettyScreenSHOT.Services.Screenshot;
+using PrettyScreenSHOT.Views.Windows;
 
 namespace PrettyScreenSHOT
 {
@@ -59,11 +66,8 @@ private void InitializeWpfUiTheme()
             }
             else
             {
-                ApplicationThemeManager.Apply(
-                    appTheme,
-                    WindowBackdropType.Mica,  // Windows 11 Mica effect
-                    true  // updateAccents
-                );
+                // Apply theme - WindowBackdropType may not be available in this WPF UI version
+                ApplicationThemeManager.Apply(appTheme);
             }
 
             DebugHelper.LogInfo("App", $"WPF UI Theme initialized: {themeName} -> {appTheme}");
diff --git a/Helpers/LocalizationHelper.cs b/Helpers/LocalizationHelper.cs
@@ -1,6 +1,7 @@
 using System.Globalization;
 using System.Resources;
 using System.Windows;
+using PrettyScreenSHOT.Services.Settings;
 
 namespace PrettyScreenSHOT.Helpers
 {
diff --git a/Helpers/StackPanelHelper.cs b/Helpers/StackPanelHelper.cs
@@ -53,7 +53,7 @@ private static void StackPanel_Loaded(object sender, RoutedEventArgs e)
         private static void ApplySpacing(StackPanel stackPanel)
         {
             var spacing = GetSpacing(stackPanel);
-            var isHorizontal = stackPanel.Orientation == Orientation.Horizontal;
+            var isHorizontal = stackPanel.Orientation == System.Windows.Controls.Orientation.Horizontal;
 
             for (int i = 0; i < stackPanel.Children.Count; i++)
             {
diff --git a/PrettyScreenSHOT.csproj b/PrettyScreenSHOT.csproj
@@ -11,10 +11,11 @@
     <StartupObject>PrettyScreenSHOT.App</StartupObject>
     <AssemblyName>$(MSBuildProjectName)</AssemblyName>
     <AssemblyTitle>$(MSBuildProjectName)</AssemblyTitle>
-    <ApplicationIcon>app.ico</ApplicationIcon>
+    <!-- <ApplicationIcon>app.ico</ApplicationIcon> -->
     <PlatformTarget>x64</PlatformTarget>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <Platforms>AnyCPU;x64</Platforms>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 
     <!-- Version strategy:
          - 0.0.X = Development builds (X = CI build number)
@@ -50,6 +51,12 @@
     <FrameworkReference Include="Microsoft.WindowsDesktop.App.WindowsForms" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Remove="Tests\**" />
+    <EmbeddedResource Remove="Tests\**" />
+    <None Remove="Tests\**" />
+  </ItemGroup>
+
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
diff --git a/Services/PerformanceOptimizer.cs b/Services/PerformanceOptimizer.cs
@@ -3,6 +3,7 @@
 using System.Windows.Media.Imaging;
 using System.IO;
 using System.Threading.Tasks;
+using PrettyScreenSHOT.Helpers;
 
 namespace PrettyScreenSHOT.Services
 {
diff --git a/Services/Screenshot/ScreenshotManager.cs b/Services/Screenshot/ScreenshotManager.cs
@@ -2,6 +2,9 @@
 using System.Windows.Media.Imaging;
 using System.IO;
 using System.Linq;
+using PrettyScreenSHOT.Helpers;
+using PrettyScreenSHOT.Services.Cloud;
+using PrettyScreenSHOT.Services.Security;
 using PrettyScreenSHOT.Services.Settings;
 
 namespace PrettyScreenSHOT.Services.Screenshot
diff --git a/Services/Screenshot/ScrollCaptureHelper.cs b/Services/Screenshot/ScrollCaptureHelper.cs
@@ -8,6 +8,7 @@
 using System.Windows.Input;
 using System.Windows.Media.Imaging;
 using System.Windows.Media;
+using PrettyScreenSHOT.Helpers;
 
 namespace PrettyScreenSHOT.Services.Screenshot
 {
diff --git a/Services/SearchAndFilterManager.cs b/Services/SearchAndFilterManager.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+using PrettyScreenSHOT.Services.Screenshot;
 
 namespace PrettyScreenSHOT.Services
 {
diff --git a/Services/Settings/SettingsManager.cs b/Services/Settings/SettingsManager.cs
@@ -1,6 +1,8 @@
 using System.IO;
 using System.Text.Json;
+using PrettyScreenSHOT.Helpers;
 using PrettyScreenSHOT.Services;
+using PrettyScreenSHOT.Services.Cloud;
 
 namespace PrettyScreenSHOT.Services.Settings
 {
@@ -249,6 +251,12 @@ public bool RemoveMetadata
             set { settings.RemoveMetadata = value; SaveSettings(); }
         }
 
+        public bool PrivacyMode
+        {
+            get => settings.PrivacyMode;
+            set { settings.PrivacyMode = value; SaveSettings(); }
+        }
+
         // Performance settings
         public bool EnableCache
         {
@@ -405,6 +413,7 @@ private class AppSettings
             public bool EnableWatermark { get; set; } = false;
             public string WatermarkText { get; set; } = "PrettyScreenSHOT";
             public bool RemoveMetadata { get; set; } = false;
+            public bool PrivacyMode { get; set; } = false;
             
             // Performance
             public bool EnableCache { get; set; } = true;
diff --git a/Services/ThemeService.cs b/Services/ThemeService.cs
@@ -1,5 +1,6 @@
 using System;
 using Wpf.Ui.Appearance;
+using PrettyScreenSHOT.Helpers;
 
 namespace PrettyScreenSHOT.Services
 {
@@ -77,11 +78,8 @@ private void ApplyTheme(ApplicationTheme theme)
             }
             else
             {
-                ApplicationThemeManager.Apply(
-                    theme,
-                    WindowBackdropType.Mica,  // Windows 11 Mica effect
-                    true  // updateAccents
-                );
+                // Apply theme - WindowBackdropType may not be available in this WPF UI version
+                ApplicationThemeManager.Apply(theme);
 
                 DebugHelper.LogInfo("ThemeService", $"Applied theme: {theme}");
             }
diff --git a/Services/TrayIconManager.cs b/Services/TrayIconManager.cs
@@ -7,6 +7,7 @@
 using PrettyScreenSHOT.Services.Update;
 using PrettyScreenSHOT.Services.Video;
 using PrettyScreenSHOT.Views.Windows;
+using PrettyScreenSHOT.Views.Overlays;
 
 namespace PrettyScreenSHOT.Services
 {
diff --git a/Themes/WpfUiCustom.xaml b/Themes/WpfUiCustom.xaml
@@ -64,18 +64,11 @@
         <Setter Property="Margin" Value="0,0,0,8"/>
     </Style>
 
-    <!-- StackPanel with consistent spacing using Attached Property -->
-    <Style x:Key="StandardSpacing" TargetType="StackPanel">
-        <Setter Property="helpers:StackPanelHelper.Spacing" Value="12"/>
-    </Style>
-
-    <Style x:Key="CompactSpacing" TargetType="StackPanel">
-        <Setter Property="helpers:StackPanelHelper.Spacing" Value="8"/>
-    </Style>
-
-    <Style x:Key="WideSpacing" TargetType="StackPanel">
-        <Setter Property="helpers:StackPanelHelper.Spacing" Value="16"/>
-    </Style>
+    <!-- 
+    Note: StackPanel spacing styles removed - attached properties cannot be set in Style Setters.
+    Use helpers:StackPanelHelper.Spacing directly on StackPanel elements instead.
+    Example: <StackPanel helpers:StackPanelHelper.Spacing="12">...</StackPanel>
+    -->
 
     <!-- Section separator -->
     <Style x:Key="SectionSeparator" TargetType="Border">
diff --git a/Views/Dialogs/SaveScreenshotDialog.xaml.cs b/Views/Dialogs/SaveScreenshotDialog.xaml.cs
@@ -4,6 +4,8 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using PrettyScreenSHOT.Helpers;
+using PrettyScreenSHOT.Services;
 using Wpf.Ui.Controls;
 
 namespace PrettyScreenSHOT.Views.Dialogs
diff --git a/Views/Overlays/ScreenshotOverlay.xaml.cs b/Views/Overlays/ScreenshotOverlay.xaml.cs
@@ -2,6 +2,10 @@
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Runtime.InteropServices;
+using PrettyScreenSHOT.Helpers;
+using PrettyScreenSHOT.Services;
+using PrettyScreenSHOT.Services.Screenshot;
+using PrettyScreenSHOT.Services.Settings;
 using Point = System.Windows.Point;
 
 namespace PrettyScreenSHOT.Views.Overlays
diff --git a/Views/Windows/ScreenshotEditorWindow.xaml.cs b/Views/Windows/ScreenshotEditorWindow.xaml.cs
@@ -4,6 +4,13 @@
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
+using PrettyScreenSHOT.Helpers;
+using PrettyScreenSHOT.Services;
+using PrettyScreenSHOT.Services.Cloud;
+using PrettyScreenSHOT.Services.Input;
+using PrettyScreenSHOT.Services.Screenshot;
+using PrettyScreenSHOT.Services.Settings;
+using PrettyScreenSHOT.Views.Dialogs;
 using Wpf.Ui.Controls;
 using Point = System.Windows.Point;
 using Color = System.Windows.Media.Color;
@@ -12,6 +19,9 @@
 using WindowsFontStyle = System.Windows.FontStyle;
 using WindowsFontWeight = System.Windows.FontWeight;
 using WindowsFontFamily = System.Windows.Media.FontFamily;
+using WpfMessageBoxButton = Wpf.Ui.Controls.MessageBoxButton;
+using WpfMessageBoxResult = Wpf.Ui.Controls.MessageBoxResult;
+using WpfTextBlock = Wpf.Ui.Controls.TextBlock;
 
 namespace PrettyScreenSHOT.Views.Windows
 {
@@ -448,8 +458,8 @@ private async void OnUploadClick(object sender, RoutedEventArgs e)
                     System.Windows.MessageBox.Show(
                         LocalizationHelper.GetString("Editor_CloudNotConfigured"),
                         LocalizationHelper.GetString("Editor_CloudNotConfiguredTitle"),
-                        MessageBoxButton.OK,
-                        MessageBoxImage.Information);
+                        System.Windows.MessageBoxButton.OK,
+                        System.Windows.MessageBoxImage.Information);
                     return;
                 }
 
@@ -468,7 +478,7 @@ private async void OnUploadClick(object sender, RoutedEventArgs e)
                 if (sender is System.Windows.Controls.Button btn)
                 {
                     btn.IsEnabled = false;
-                    btn.Content = new TextBlock { Text = LocalizationHelper.GetString("Editor_Uploading"), FontSize = 12, FontWeight = FontWeights.Bold };
+                    btn.Content = new System.Windows.Controls.TextBlock { Text = LocalizationHelper.GetString("Editor_Uploading"), FontSize = 12, FontWeight = FontWeights.Bold };
                 }
 
                 var filename = $"Screenshot_{DateTime.Now:yyyy-MM-dd_HH-mm-ss}.png";
@@ -478,7 +488,7 @@ private async void OnUploadClick(object sender, RoutedEventArgs e)
                 if (sender is System.Windows.Controls.Button button)
                 {
                     button.IsEnabled = true;
-                    button.Content = new TextBlock { Text = LocalizationHelper.GetString("Editor_Upload"), FontSize = 12, FontWeight = FontWeights.Bold };
+                    button.Content = new System.Windows.Controls.TextBlock { Text = LocalizationHelper.GetString("Editor_Upload"), FontSize = 12, FontWeight = FontWeights.Bold };
                 }
 
                 if (result.Success && !string.IsNullOrEmpty(result.Url))
@@ -487,23 +497,23 @@ private async void OnUploadClick(object sender, RoutedEventArgs e)
                     System.Windows.Clipboard.SetText(result.Url);
                     
                     var message = string.Format(LocalizationHelper.GetString("Editor_UploadSuccessMessage"), "\n", result.Url);
-                    System.Windows.MessageBox.Show(message, LocalizationHelper.GetString("Editor_UploadSuccess"), MessageBoxButton.OK, MessageBoxImage.Information);
+                    System.Windows.MessageBox.Show(message, LocalizationHelper.GetString("Editor_UploadSuccess"), System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Information);
                     
                     DebugHelper.LogInfo("Editor", $"Upload successful: {result.Url}");
                 }
                 else
                 {
                     var errorMsg = result.ErrorMessage ?? LocalizationHelper.GetString("Editor_Error");
                     var message = string.Format(LocalizationHelper.GetString("Editor_UploadErrorMessage"), "\n", errorMsg);
-                    System.Windows.MessageBox.Show(message, LocalizationHelper.GetString("Editor_UploadError"), MessageBoxButton.OK, MessageBoxImage.Error);
+                    System.Windows.MessageBox.Show(message, LocalizationHelper.GetString("Editor_UploadError"), System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Error);
                     DebugHelper.LogError("Editor", $"Upload failed: {errorMsg}");
                 }
             }
             catch (Exception ex)
             {
                 DebugHelper.LogError("Editor", "Error during upload", ex);
                 var message = string.Format(LocalizationHelper.GetString("Editor_ErrorWithMessage"), ex.Message);
-                System.Windows.MessageBox.Show(message, LocalizationHelper.GetString("Editor_Error"), MessageBoxButton.OK, MessageBoxImage.Error);
+                System.Windows.MessageBox.Show(message, LocalizationHelper.GetString("Editor_Error"), System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Error);
             }
         }
 
@@ -557,7 +567,7 @@ private void OnCancelClick(object sender, RoutedEventArgs e)
 
         private void OnClearClick(object sender, RoutedEventArgs e)
         {
-            if (System.Windows.MessageBox.Show("Czy na pewno chcesz wyczyścić wszystkie zmiany?", "Potwierdzenie", MessageBoxButton.YesNo) == MessageBoxResult.Yes)
+            if (System.Windows.MessageBox.Show("Czy na pewno chcesz wyczyścić wszystkie zmiany?", "Potwierdzenie", System.Windows.MessageBoxButton.YesNo) == System.Windows.MessageBoxResult.Yes)
             {
                 ClearAll();
             }
diff --git a/Views/Windows/ScreenshotHistoryWindow.xaml.cs b/Views/Windows/ScreenshotHistoryWindow.xaml.cs
@@ -4,7 +4,14 @@
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
+using PrettyScreenSHOT.Helpers;
+using PrettyScreenSHOT.Services;
+using PrettyScreenSHOT.Services.Cloud;
+using PrettyScreenSHOT.Services.Input;
+using PrettyScreenSHOT.Services.Screenshot;
 using Wpf.Ui.Controls;
+using WpfMessageBoxButton = Wpf.Ui.Controls.MessageBoxButton;
+using WpfTextBlock = Wpf.Ui.Controls.TextBlock;
 
 namespace PrettyScreenSHOT.Views.Windows
 {
@@ -102,7 +109,7 @@ private async void OnUploadClick(object sender, RoutedEventArgs e)
                 try
                 {
                     btn.IsEnabled = false;
-                    btn.Content = new TextBlock { Text = LocalizationHelper.GetString("History_Uploading"), FontSize = 11, FontWeight = FontWeights.Bold };
+                    btn.Content = new System.Windows.Controls.TextBlock { Text = LocalizationHelper.GetString("History_Uploading"), FontSize = 11, FontWeight = FontWeights.Bold };
 
                     var bitmap = new BitmapImage();
                     bitmap.BeginInit();
@@ -114,7 +121,7 @@ private async void OnUploadClick(object sender, RoutedEventArgs e)
                     var result = await CloudUploadManager.Instance.UploadScreenshotAsync(bitmap, item.Filename);
                     
                     btn.IsEnabled = true;
-                    btn.Content = new TextBlock { Text = LocalizationHelper.GetString("History_Upload"), FontSize = 11, FontWeight = FontWeights.Bold };
+                    btn.Content = new System.Windows.Controls.TextBlock { Text = LocalizationHelper.GetString("History_Upload"), FontSize = 11, FontWeight = FontWeights.Bold };
 
                     if (result.Success && !string.IsNullOrEmpty(result.Url))
                     {
@@ -123,20 +130,20 @@ private async void OnUploadClick(object sender, RoutedEventArgs e)
                         System.Windows.Clipboard.SetText(result.Url);
                         var message = string.Format(LocalizationHelper.GetString("History_UploadSuccessMessage"), "\n", result.Url);
                         System.Windows.MessageBox.Show(message, 
-                            LocalizationHelper.GetString("History_UploadSuccess"), MessageBoxButton.OK, MessageBoxImage.Information);
+                            LocalizationHelper.GetString("History_UploadSuccess"), System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Information);
                     }
                     else
                     {
                         var errorMsg = result.ErrorMessage ?? LocalizationHelper.GetString("History_Error");
                         var message = string.Format(LocalizationHelper.GetString("History_UploadErrorMessage"), "\n", errorMsg);
                         System.Windows.MessageBox.Show(message, 
-                            LocalizationHelper.GetString("History_UploadError"), MessageBoxButton.OK, MessageBoxImage.Error);
+                            LocalizationHelper.GetString("History_UploadError"), System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Error);
                     }
                 }
                 catch (Exception ex)
                 {
                     var message = string.Format(LocalizationHelper.GetString("History_ErrorWithMessage"), ex.Message);
-                    System.Windows.MessageBox.Show(message, LocalizationHelper.GetString("History_Error"), MessageBoxButton.OK, MessageBoxImage.Error);
+                    System.Windows.MessageBox.Show(message, LocalizationHelper.GetString("History_Error"), System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Error);
                 }
             }
         }
@@ -148,7 +155,7 @@ private void OnCloudUrlClick(object sender, RoutedEventArgs e)
                 System.Windows.Clipboard.SetText(item.CloudUrl);
                 var message = string.Format(LocalizationHelper.GetString("History_UrlCopied"), "\n", item.CloudUrl);
                 System.Windows.MessageBox.Show(message, 
-                    LocalizationHelper.GetString("History_CloudUrlTitle"), MessageBoxButton.OK, MessageBoxImage.Information);
+                    LocalizationHelper.GetString("History_CloudUrlTitle"), System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Information);
             }
         }
 
diff --git a/Views/Windows/SettingsWindow.xaml.cs b/Views/Windows/SettingsWindow.xaml.cs
diff --git a/Views/Windows/TextInputWindow.xaml.cs b/Views/Windows/TextInputWindow.xaml.cs
diff --git a/Views/Windows/UpdateNotificationWindow.xaml.cs b/Views/Windows/UpdateNotificationWindow.xaml.cs
diff --git a/Views/Windows/UpdateWindow.xaml.cs b/Views/Windows/UpdateWindow.xaml.cs
diff --git a/Views/Windows/VideoCaptureWindow.xaml.cs b/Views/Windows/VideoCaptureWindow.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System.Globalization;`
`2`	`2`	`using System.Resources;`
`3`	`3`	`using System.Windows;`
	`4`	`+using PrettyScreenSHOT.Services.Settings;`
`4`	`5`
`5`	`6`	`namespace PrettyScreenSHOT.Helpers`
`6`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ private static void StackPanel_Loaded(object sender, RoutedEventArgs e)`
`53`	`53`	`private static void ApplySpacing(StackPanel stackPanel)`
`54`	`54`	`{`
`55`	`55`	`var spacing = GetSpacing(stackPanel);`
`56`		`- var isHorizontal = stackPanel.Orientation == Orientation.Horizontal;`
	`56`	`+ var isHorizontal = stackPanel.Orientation == System.Windows.Controls.Orientation.Horizontal;`
`57`	`57`
`58`	`58`	`for (int i = 0; i < stackPanel.Children.Count; i++)`
`59`	`59`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System.Windows.Media.Imaging;`
`4`	`4`	`using System.IO;`
`5`	`5`	`using System.Threading.Tasks;`
	`6`	`+using PrettyScreenSHOT.Helpers;`
`6`	`7`
`7`	`8`	`namespace PrettyScreenSHOT.Services`
`8`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`using System.Windows.Input;`
`9`	`9`	`using System.Windows.Media.Imaging;`
`10`	`10`	`using System.Windows.Media;`
	`11`	`+using PrettyScreenSHOT.Helpers;`
`11`	`12`
`12`	`13`	`namespace PrettyScreenSHOT.Services.Screenshot`
`13`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Collections.ObjectModel;`
`4`	`4`	`using System.Linq;`
	`5`	`+using PrettyScreenSHOT.Services.Screenshot;`
`5`	`6`
`6`	`7`	`namespace PrettyScreenSHOT.Services`
`7`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using Wpf.Ui.Appearance;`
	`3`	`+using PrettyScreenSHOT.Helpers;`
`3`	`4`
`4`	`5`	`namespace PrettyScreenSHOT.Services`
`5`	`6`	`{`
`@@ -77,11 +78,8 @@ private void ApplyTheme(ApplicationTheme theme)`
`77`	`78`	`}`
`78`	`79`	`else`
`79`	`80`	`{`
`80`		`- ApplicationThemeManager.Apply(`
`81`		`- theme,`
`82`		`- WindowBackdropType.Mica, // Windows 11 Mica effect`
`83`		`- true // updateAccents`
`84`		`- );`
	`81`	`+ // Apply theme - WindowBackdropType may not be available in this WPF UI version`
	`82`	`+ ApplicationThemeManager.Apply(theme);`
`85`	`83`
`86`	`84`	`DebugHelper.LogInfo("ThemeService", $"Applied theme: {theme}");`
`87`	`85`	`}`