From ebc776459da6868147c90facb610a615d5a1a85e Mon Sep 17 00:00:00 2001 From: Holger Boerchers Date: Sat, 16 Jun 2018 09:45:56 +0200 Subject: [PATCH] Renamed Katteker.Gui to Katteker.UserInterface. --- Example/Example.csproj | 4 +- Example/MainWindow.xaml.cs | 6 +-- ...i.csproj => Katteker.UserInterface.csproj} | 10 ++-- Katteker.Gui/NativeMethods.cs | 14 +++--- Katteker.Gui/Properties/AssemblyInfo.cs | 4 +- Katteker.Gui/Properties/Resources.Designer.cs | 50 +++++++++---------- Katteker.Gui/UpdateWindow.Designer.cs | 2 +- Katteker.Gui/UpdateWindow.cs | 8 +-- Katteker.Gui/{Wrapper.cs => UserInterface.cs} | 8 +-- Katteker.sln | 2 +- 10 files changed, 54 insertions(+), 54 deletions(-) rename Katteker.Gui/{Katteker.Gui.csproj => Katteker.UserInterface.csproj} (91%) rename Katteker.Gui/{Wrapper.cs => UserInterface.cs} (92%) diff --git a/Example/Example.csproj b/Example/Example.csproj index 5c31bb8..9de00c2 100644 --- a/Example/Example.csproj +++ b/Example/Example.csproj @@ -104,9 +104,9 @@ - + {07e2de31-80a0-43da-b307-1ca47cd930a1} - Katteker.Gui + Katteker.UserInterface {a45e1c59-ba9e-452c-a5e2-50de49d53e92} diff --git a/Example/MainWindow.xaml.cs b/Example/MainWindow.xaml.cs index 2f29a4e..e0fe5c8 100644 --- a/Example/MainWindow.xaml.cs +++ b/Example/MainWindow.xaml.cs @@ -1,10 +1,10 @@ using System; using System.Reflection; using System.Windows; -using Katteker.Gui; namespace Example { + /// /// /// Interaction logic for MainWindow.xaml /// @@ -21,12 +21,12 @@ namespace Example private async void MainWindow_OnContentRendered(object sender, EventArgs e) { - await Wrapper.CheckForUpdateAsync(true).ConfigureAwait(false); + await Katteker.UserInterface.CheckForUpdateAsync(true).ConfigureAwait(false); } private async void ButtonBase_OnClick(object sender, RoutedEventArgs e) { - await Wrapper.CheckForUpdateAsync().ConfigureAwait(false); + await Katteker.UserInterface.CheckForUpdateAsync().ConfigureAwait(false); } } } diff --git a/Katteker.Gui/Katteker.Gui.csproj b/Katteker.Gui/Katteker.UserInterface.csproj similarity index 91% rename from Katteker.Gui/Katteker.Gui.csproj rename to Katteker.Gui/Katteker.UserInterface.csproj index 6e9b001..aa053a8 100644 --- a/Katteker.Gui/Katteker.Gui.csproj +++ b/Katteker.Gui/Katteker.UserInterface.csproj @@ -7,8 +7,8 @@ {07E2DE31-80A0-43DA-B307-1CA47CD930A1} Library Properties - Katteker.Gui - Katteker.Gui + Katteker + Katteker.UserInterface v4.5 512 ..\ @@ -22,7 +22,7 @@ DEBUG;TRACE prompt 4 - bin\Debug\Katteker.Gui.xml + bin\Debug\Katteker.UserInterface.xml pdbonly @@ -31,7 +31,7 @@ TRACE prompt 4 - bin\Release\Katteker.Gui.xml + bin\Release\Katteker.UserInterface.xml @@ -43,7 +43,7 @@ - + True diff --git a/Katteker.Gui/NativeMethods.cs b/Katteker.Gui/NativeMethods.cs index 3a57b26..d1b51b8 100644 --- a/Katteker.Gui/NativeMethods.cs +++ b/Katteker.Gui/NativeMethods.cs @@ -3,39 +3,39 @@ using System.Runtime.InteropServices; // ReSharper disable InconsistentNaming -namespace Katteker.Gui +namespace Katteker { /// /// Native methods. /// - public static class NativeMethods + internal static class NativeMethods { /// /// Hit Test Caption /// - public const int HTCAPTION = 0x2; + internal const int HTCAPTION = 0x2; /// /// Posted when the user presses the left mouse button while the cursor is within the nonclient area of a window. /// - public const int WM_NCLBUTTONDOWN = 0xA1; + internal const int WM_NCLBUTTONDOWN = 0xA1; /// /// Release the capture /// [DllImport("User32.dll")] - public static extern bool ReleaseCapture(); + internal static extern bool ReleaseCapture(); /// /// Send message /// [DllImport("User32.dll")] - public static extern int SendMessage(IntPtr hWnd, int Msg, int wParam, int lParam); + internal static extern int SendMessage(IntPtr hWnd, int Msg, int wParam, int lParam); /// /// Set Process API aware /// [DllImport("user32.dll")] - public static extern bool SetProcessDPIAware(); + internal static extern bool SetProcessDPIAware(); } } \ No newline at end of file diff --git a/Katteker.Gui/Properties/AssemblyInfo.cs b/Katteker.Gui/Properties/AssemblyInfo.cs index d2ccb21..76d3cad 100644 --- a/Katteker.Gui/Properties/AssemblyInfo.cs +++ b/Katteker.Gui/Properties/AssemblyInfo.cs @@ -4,11 +4,11 @@ using System.Runtime.InteropServices; // Allgemeine Informationen über eine Assembly werden über die folgenden // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, // die mit einer Assembly verknüpft sind. -[assembly: AssemblyTitle("Katteker.Gui")] +[assembly: AssemblyTitle("Katteker.UserInterface")] [assembly: AssemblyDescription("Helps Applications to integrate Katteker")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("WRD GmbH")] -[assembly: AssemblyProduct("Katteker.Gui")] +[assembly: AssemblyProduct("Katteker.UserInterface")] [assembly: AssemblyCopyright("Copyright © Enercon GmbH 2015-2018")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Katteker.Gui/Properties/Resources.Designer.cs b/Katteker.Gui/Properties/Resources.Designer.cs index b58a096..a894bd8 100644 --- a/Katteker.Gui/Properties/Resources.Designer.cs +++ b/Katteker.Gui/Properties/Resources.Designer.cs @@ -1,24 +1,24 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +// der Code erneut generiert wird. // //------------------------------------------------------------------------------ -namespace Katteker.Gui.Properties { +namespace Katteker.Properties { using System; /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. + // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. + // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] @@ -33,13 +33,13 @@ namespace Katteker.Gui.Properties { } /// - /// Returns the cached ResourceManager instance used by this class. + /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Katteker.Gui.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Katteker.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; @@ -47,8 +47,8 @@ namespace Katteker.Gui.Properties { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -61,7 +61,7 @@ namespace Katteker.Gui.Properties { } /// - /// Looks up a localized string similar to Could not update your application.. + /// Sucht eine lokalisierte Zeichenfolge, die Could not update your application. ähnelt. /// internal static string CouldNotUpdateYourApplication { get { @@ -70,7 +70,7 @@ namespace Katteker.Gui.Properties { } /// - /// Looks up a localized string similar to Installed new Version! Would you like to restart the Application?. + /// Sucht eine lokalisierte Zeichenfolge, die Installed new Version! Would you like to restart the Application? ähnelt. /// internal static string Installed_new_Version { get { @@ -79,7 +79,7 @@ namespace Katteker.Gui.Properties { } /// - /// Looks up a localized string similar to New Version. + /// Sucht eine lokalisierte Zeichenfolge, die New Version ähnelt. /// internal static string New_Version { get { @@ -88,7 +88,7 @@ namespace Katteker.Gui.Properties { } /// - /// Looks up a localized string similar to No update available.. + /// Sucht eine lokalisierte Zeichenfolge, die No update available. ähnelt. /// internal static string No_update_available { get { @@ -97,7 +97,7 @@ namespace Katteker.Gui.Properties { } /// - /// Looks up a localized string similar to Can't find configuration File. Ask your local distributor.. + /// Sucht eine lokalisierte Zeichenfolge, die Can't find configuration File. Ask your local distributor. ähnelt. /// internal static string SquirrelWrapper_CheckForUpdate { get { @@ -106,7 +106,7 @@ namespace Katteker.Gui.Properties { } /// - /// Looks up a localized string similar to Ask your local distributor.. + /// Sucht eine lokalisierte Zeichenfolge, die Ask your local distributor. ähnelt. /// internal static string SquirrelWrapper_CheckForUpdate_AskYourLocalDistributor { get { @@ -115,7 +115,7 @@ namespace Katteker.Gui.Properties { } /// - /// Looks up a localized string similar to Error with Configuration-File. + /// Sucht eine lokalisierte Zeichenfolge, die Error with Configuration-File ähnelt. /// internal static string SquirrelWrapper_CheckForUpdate_Error { get { @@ -124,7 +124,7 @@ namespace Katteker.Gui.Properties { } /// - /// Looks up a localized string similar to Error with Update. + /// Sucht eine lokalisierte Zeichenfolge, die Error with Update ähnelt. /// internal static string SquirrelWrapper_CheckForUpdate_ErrorWithUpdate { get { @@ -133,7 +133,7 @@ namespace Katteker.Gui.Properties { } /// - /// Looks up a localized string similar to Updater. + /// Sucht eine lokalisierte Zeichenfolge, die Updater ähnelt. /// internal static string Updater { get { @@ -142,7 +142,7 @@ namespace Katteker.Gui.Properties { } /// - /// Looks up a localized string similar to You can update to Version: . + /// Sucht eine lokalisierte Zeichenfolge, die You can update to Version: ähnelt. /// internal static string You_can_update_to_Version { get { @@ -151,7 +151,7 @@ namespace Katteker.Gui.Properties { } /// - /// Looks up a localized string similar to You're up to date.. + /// Sucht eine lokalisierte Zeichenfolge, die You're up to date. ähnelt. /// internal static string You_re_up_to_date { get { diff --git a/Katteker.Gui/UpdateWindow.Designer.cs b/Katteker.Gui/UpdateWindow.Designer.cs index 3e34ea2..af10b97 100644 --- a/Katteker.Gui/UpdateWindow.Designer.cs +++ b/Katteker.Gui/UpdateWindow.Designer.cs @@ -1,6 +1,6 @@ using System; -namespace Katteker.Gui +namespace Katteker { /// /// Shows the Update Window. diff --git a/Katteker.Gui/UpdateWindow.cs b/Katteker.Gui/UpdateWindow.cs index 1185cda..d598542 100644 --- a/Katteker.Gui/UpdateWindow.cs +++ b/Katteker.Gui/UpdateWindow.cs @@ -2,11 +2,11 @@ using System.Drawing; using System.IO; using System.Windows.Forms; -using Katteker.Gui.Properties; +using Katteker.Properties; -namespace Katteker.Gui +namespace Katteker { - public sealed partial class UpdateWindow : Form + internal sealed partial class UpdateWindow : Form { private readonly ReleaseEntry _entry; private readonly UpdateManager _updateManager; @@ -14,7 +14,7 @@ namespace Katteker.Gui /// /// The Update Window /// - public UpdateWindow(UpdateManager updateManager, ReleaseEntry entry) + internal UpdateWindow(UpdateManager updateManager, ReleaseEntry entry) { _updateManager = updateManager; _entry = entry; diff --git a/Katteker.Gui/Wrapper.cs b/Katteker.Gui/UserInterface.cs similarity index 92% rename from Katteker.Gui/Wrapper.cs rename to Katteker.Gui/UserInterface.cs index 43fe7c5..47e1bd8 100644 --- a/Katteker.Gui/Wrapper.cs +++ b/Katteker.Gui/UserInterface.cs @@ -2,14 +2,14 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -using Katteker.Gui.Properties; +using Katteker.Properties; -namespace Katteker.Gui +namespace Katteker { /// - /// The wrapper to add Squirrel-capability to older Programs. + /// The wrapper to add Katteker-capability to older Programs. /// - public static class Wrapper + public static class UserInterface { private static UpdateManager _manager; diff --git a/Katteker.sln b/Katteker.sln index dd01bc3..d922953 100644 --- a/Katteker.sln +++ b/Katteker.sln @@ -11,7 +11,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppStub", "AppStub\AppStub. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Example", "Example\Example.csproj", "{DE9CFDEB-40B8-447D-9959-31BA78512CED}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Katteker.Gui", "Katteker.Gui\Katteker.Gui.csproj", "{07E2DE31-80A0-43DA-B307-1CA47CD930A1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Katteker.UserInterface", "Katteker.Gui\Katteker.UserInterface.csproj", "{07E2DE31-80A0-43DA-B307-1CA47CD930A1}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Katteker.Test", "Katteker.Test\Katteker.Test.csproj", "{76E9E47E-C810-4C13-BAC3-1F53CF4BCB92}" EndProject