Преглед изворни кода

Moved platform specific non-UI libraries to Core namespace.

Ruben пре 7 месеци
родитељ
комит
7dab44e16d

+ 1 - 1
src/PicView.Avalonia.MacOS/PicView.Avalonia.MacOS.csproj

@@ -42,7 +42,7 @@
   <ItemGroup>
     <ProjectReference Include="..\PicView.Avalonia\PicView.Avalonia.csproj" />
     <ProjectReference Include="..\PicView.Core\PicView.Core.csproj" />
-    <ProjectReference Include="..\PicView.MacOS\PicView.MacOS.csproj" />
+    <ProjectReference Include="..\PicView.Core.MacOS\PicView.Core.MacOS.csproj" />
   </ItemGroup>
 
   <ItemGroup>

+ 5 - 5
src/PicView.Avalonia.Win32/App.axaml.cs

@@ -17,12 +17,12 @@ using PicView.Avalonia.WindowBehavior;
 using PicView.Core.FileHandling;
 using PicView.Core.Localization;
 using PicView.Core.ProcessHandling;
-using PicView.WindowsNT;
-using PicView.WindowsNT.FileHandling;
-using PicView.WindowsNT.Taskbar;
-using PicView.WindowsNT.Wallpaper;
+using PicView.Core.WindowsNT;
+using PicView.Core.WindowsNT.FileHandling;
+using PicView.Core.WindowsNT.Taskbar;
+using PicView.Core.WindowsNT.Wallpaper;
 using Dispatcher = Avalonia.Threading.Dispatcher;
-using Win32Clipboard = PicView.WindowsNT.Copy.Win32Clipboard;
+using Win32Clipboard = PicView.Core.WindowsNT.Copy.Win32Clipboard;
 
 namespace PicView.Avalonia.Win32;
 

+ 1 - 1
src/PicView.Avalonia.Win32/PicView.Avalonia.Win32.csproj

@@ -48,7 +48,7 @@
   <ItemGroup>
     <ProjectReference Include="..\PicView.Avalonia\PicView.Avalonia.csproj" />
     <ProjectReference Include="..\PicView.Core\PicView.Core.csproj" />
-    <ProjectReference Include="..\PicView.WindowsNT\PicView.WindowsNT.csproj" />
+    <ProjectReference Include="..\PicView.Core.WindowsNT\PicView.Core.WindowsNT.csproj" />
   </ItemGroup>
 
   <ItemGroup>

+ 1 - 1
src/PicView.MacOS/Fullscreen.cs → src/PicView.Core.MacOS/Fullscreen.cs

@@ -1,4 +1,4 @@
-namespace PicView.MacOS;
+namespace PicView.Core.MacOS;
 public static class Fullscreen
 {
 

+ 0 - 0
src/PicView.MacOS/PicView.MacOS.csproj → src/PicView.Core.MacOS/PicView.Core.MacOS.csproj


+ 1 - 1
src/PicView.WindowsNT/Copy/Win32Clipboard.cs → src/PicView.Core.WindowsNT/Copy/Win32Clipboard.cs

@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace PicView.WindowsNT.Copy;
+namespace PicView.Core.WindowsNT.Copy;
 
 public static partial class Win32Clipboard
 {

+ 1 - 1
src/PicView.WindowsNT/FileHandling/ArchiveExtractionHelper.cs → src/PicView.Core.WindowsNT/FileHandling/ArchiveExtractionHelper.cs

@@ -2,7 +2,7 @@
 using Microsoft.Win32;
 using PicView.Core.FileHandling;
 
-namespace PicView.WindowsNT.FileHandling;
+namespace PicView.Core.WindowsNT.FileHandling;
 
 public static class ArchiveExtractionHelper
 {

+ 1 - 1
src/PicView.WindowsNT/FileHandling/FileExplorer.cs → src/PicView.Core.WindowsNT/FileHandling/FileExplorer.cs

@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace PicView.WindowsNT.FileHandling;
+namespace PicView.Core.WindowsNT.FileHandling;
 public static class Shell32Wrapper
 {
     [DllImport("shell32.dll", SetLastError = true)]

+ 1 - 1
src/PicView.WindowsNT/Lockscreen/LockscreenHelper.cs → src/PicView.Core.WindowsNT/Lockscreen/LockscreenHelper.cs

@@ -1,7 +1,7 @@
 // using System.Runtime.InteropServices;
 // using Microsoft.Win32;
 //
-// namespace PicView.WindowsNT.Lockscreen;
+// namespace PicView.Core.WindowsNT.Lockscreen;
 //
 // public static partial class LockscreenHelper
 // {

+ 1 - 1
src/PicView.WindowsNT/NativeMethods.cs → src/PicView.Core.WindowsNT/NativeMethods.cs

@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace PicView.WindowsNT;
+namespace PicView.Core.WindowsNT;
 
 public static partial class NativeMethods
 {

+ 0 - 0
src/PicView.WindowsNT/PicView.WindowsNT.csproj → src/PicView.Core.WindowsNT/PicView.Core.WindowsNT.csproj


+ 1 - 1
src/PicView.WindowsNT/Taskbar/ITaskbarList3.cs → src/PicView.Core.WindowsNT/Taskbar/ITaskbarList3.cs

@@ -1,7 +1,7 @@
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.Marshalling;
 
-namespace PicView.WindowsNT.Taskbar;
+namespace PicView.Core.WindowsNT.Taskbar;
 
 // ITaskbarList3 interface using P/Invoke
 [GeneratedComInterface]

+ 1 - 1
src/PicView.WindowsNT/Taskbar/TaskbarProgress.cs → src/PicView.Core.WindowsNT/Taskbar/TaskbarProgress.cs

@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace PicView.WindowsNT.Taskbar;
+namespace PicView.Core.WindowsNT.Taskbar;
 public partial class TaskbarProgress
 {
     /// <summary>

+ 1 - 1
src/PicView.WindowsNT/Taskbar/TaskbarStates.cs → src/PicView.Core.WindowsNT/Taskbar/TaskbarStates.cs

@@ -1,4 +1,4 @@
-namespace PicView.WindowsNT.Taskbar;
+namespace PicView.Core.WindowsNT.Taskbar;
 
 public enum TaskbarStates
 {

+ 1 - 1
src/PicView.WindowsNT/Wallpaper/WallpaperHelper.cs → src/PicView.Core.WindowsNT/Wallpaper/WallpaperHelper.cs

@@ -2,7 +2,7 @@
 using System.Runtime.InteropServices;
 using Microsoft.Win32;
 
-namespace PicView.WindowsNT.Wallpaper;
+namespace PicView.Core.WindowsNT.Wallpaper;
 
 public static class WallpaperHelper
 {

+ 1 - 1
src/PicView.Core/Config/SettingsManager.cs

@@ -22,7 +22,7 @@ public static class SettingsManager
     /// <summary>
     ///     Asynchronously loads the user settings. Loads defaults if not found
     /// </summary>
-    /// <returns>True if settings exists and were loaded successfully</returns>
+    /// <returns>True if settings exists</returns>
     public static async Task<bool> LoadSettingsAsync()
     {
         try

+ 2 - 2
src/PicView.sln

@@ -11,9 +11,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PicView.Avalonia.Win32", "P
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PicView.Avalonia.MacOS", "PicView.Avalonia.MacOS\PicView.Avalonia.MacOS.csproj", "{79402A1F-0EDE-49C8-970A-E7AC0065FFB4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PicView.WindowsNT", "PicView.WindowsNT\PicView.WindowsNT.csproj", "{D63E2F56-02CC-4E23-AF78-F5218E83B2E6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PicView.Core.WindowsNT", "PicView.Core.WindowsNT\PicView.Core.WindowsNT.csproj", "{D63E2F56-02CC-4E23-AF78-F5218E83B2E6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PicView.MacOS", "PicView.MacOS\PicView.MacOS.csproj", "{FEAC727E-1102-4F11-A747-5A5789FBBF81}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PicView.Core.MacOS", "PicView.Core.MacOS\PicView.Core.MacOS.csproj", "{FEAC727E-1102-4F11-A747-5A5789FBBF81}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PicView.Tests", "PicView.Tests\PicView.Tests.csproj", "{E9901309-A077-42CF-957C-9E737DC9731C}"
 EndProject