Renamed Katteker.Gui to Katteker.UserInterface.

This commit is contained in:
Holger Boerchers 2018-06-16 09:45:56 +02:00
parent 3aebff4e6d
commit ebc776459d
10 changed files with 54 additions and 54 deletions

View File

@ -104,9 +104,9 @@
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Katteker.Gui\Katteker.Gui.csproj">
<ProjectReference Include="..\Katteker.Gui\Katteker.UserInterface.csproj">
<Project>{07e2de31-80a0-43da-b307-1ca47cd930a1}</Project>
<Name>Katteker.Gui</Name>
<Name>Katteker.UserInterface</Name>
</ProjectReference>
<ProjectReference Include="..\Katteker\Katteker.csproj">
<Project>{a45e1c59-ba9e-452c-a5e2-50de49d53e92}</Project>

View File

@ -1,10 +1,10 @@
using System;
using System.Reflection;
using System.Windows;
using Katteker.Gui;
namespace Example
{
/// <inheritdoc cref="Window" />
/// <summary>
/// Interaction logic for MainWindow.xaml
/// </summary>
@ -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);
}
}
}

View File

@ -7,8 +7,8 @@
<ProjectGuid>{07E2DE31-80A0-43DA-B307-1CA47CD930A1}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Katteker.Gui</RootNamespace>
<AssemblyName>Katteker.Gui</AssemblyName>
<RootNamespace>Katteker</RootNamespace>
<AssemblyName>Katteker.UserInterface</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
@ -22,7 +22,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Debug\Katteker.Gui.xml</DocumentationFile>
<DocumentationFile>bin\Debug\Katteker.UserInterface.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@ -31,7 +31,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\Katteker.Gui.xml</DocumentationFile>
<DocumentationFile>bin\Release\Katteker.UserInterface.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
@ -43,7 +43,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="NativeMethods.cs" />
<Compile Include="Wrapper.cs" />
<Compile Include="UserInterface.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>

View File

@ -3,39 +3,39 @@ using System.Runtime.InteropServices;
// ReSharper disable InconsistentNaming
namespace Katteker.Gui
namespace Katteker
{
/// <summary>
/// Native methods.
/// </summary>
public static class NativeMethods
internal static class NativeMethods
{
/// <summary>
/// Hit Test Caption
/// </summary>
public const int HTCAPTION = 0x2;
internal const int HTCAPTION = 0x2;
/// <summary>
/// Posted when the user presses the left mouse button while the cursor is within the nonclient area of a window.
/// </summary>
public const int WM_NCLBUTTONDOWN = 0xA1;
internal const int WM_NCLBUTTONDOWN = 0xA1;
/// <summary>
/// Release the capture
/// </summary>
[DllImport("User32.dll")]
public static extern bool ReleaseCapture();
internal static extern bool ReleaseCapture();
/// <summary>
/// Send message
/// </summary>
[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);
/// <summary>
/// Set Process API aware
/// </summary>
[DllImport("user32.dll")]
public static extern bool SetProcessDPIAware();
internal static extern bool SetProcessDPIAware();
}
}

View File

@ -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("")]

View File

@ -1,24 +1,24 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 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.
// </auto-generated>
//------------------------------------------------------------------------------
namespace Katteker.Gui.Properties {
namespace Katteker.Properties {
using System;
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
/// </summary>
// 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 {
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
/// </summary>
[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 {
}
/// <summary>
/// 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.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
@ -61,7 +61,7 @@ namespace Katteker.Gui.Properties {
}
/// <summary>
/// Looks up a localized string similar to Could not update your application..
/// Sucht eine lokalisierte Zeichenfolge, die Could not update your application. ähnelt.
/// </summary>
internal static string CouldNotUpdateYourApplication {
get {
@ -70,7 +70,7 @@ namespace Katteker.Gui.Properties {
}
/// <summary>
/// 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.
/// </summary>
internal static string Installed_new_Version {
get {
@ -79,7 +79,7 @@ namespace Katteker.Gui.Properties {
}
/// <summary>
/// Looks up a localized string similar to New Version.
/// Sucht eine lokalisierte Zeichenfolge, die New Version ähnelt.
/// </summary>
internal static string New_Version {
get {
@ -88,7 +88,7 @@ namespace Katteker.Gui.Properties {
}
/// <summary>
/// Looks up a localized string similar to No update available..
/// Sucht eine lokalisierte Zeichenfolge, die No update available. ähnelt.
/// </summary>
internal static string No_update_available {
get {
@ -97,7 +97,7 @@ namespace Katteker.Gui.Properties {
}
/// <summary>
/// Looks up a localized string similar to Can&apos;t find configuration File. Ask your local distributor..
/// Sucht eine lokalisierte Zeichenfolge, die Can&apos;t find configuration File. Ask your local distributor. ähnelt.
/// </summary>
internal static string SquirrelWrapper_CheckForUpdate {
get {
@ -106,7 +106,7 @@ namespace Katteker.Gui.Properties {
}
/// <summary>
/// Looks up a localized string similar to Ask your local distributor..
/// Sucht eine lokalisierte Zeichenfolge, die Ask your local distributor. ähnelt.
/// </summary>
internal static string SquirrelWrapper_CheckForUpdate_AskYourLocalDistributor {
get {
@ -115,7 +115,7 @@ namespace Katteker.Gui.Properties {
}
/// <summary>
/// Looks up a localized string similar to Error with Configuration-File.
/// Sucht eine lokalisierte Zeichenfolge, die Error with Configuration-File ähnelt.
/// </summary>
internal static string SquirrelWrapper_CheckForUpdate_Error {
get {
@ -124,7 +124,7 @@ namespace Katteker.Gui.Properties {
}
/// <summary>
/// Looks up a localized string similar to Error with Update.
/// Sucht eine lokalisierte Zeichenfolge, die Error with Update ähnelt.
/// </summary>
internal static string SquirrelWrapper_CheckForUpdate_ErrorWithUpdate {
get {
@ -133,7 +133,7 @@ namespace Katteker.Gui.Properties {
}
/// <summary>
/// Looks up a localized string similar to Updater.
/// Sucht eine lokalisierte Zeichenfolge, die Updater ähnelt.
/// </summary>
internal static string Updater {
get {
@ -142,7 +142,7 @@ namespace Katteker.Gui.Properties {
}
/// <summary>
/// Looks up a localized string similar to You can update to Version: .
/// Sucht eine lokalisierte Zeichenfolge, die You can update to Version: ähnelt.
/// </summary>
internal static string You_can_update_to_Version {
get {
@ -151,7 +151,7 @@ namespace Katteker.Gui.Properties {
}
/// <summary>
/// Looks up a localized string similar to You&apos;re up to date..
/// Sucht eine lokalisierte Zeichenfolge, die You&apos;re up to date. ähnelt.
/// </summary>
internal static string You_re_up_to_date {
get {

View File

@ -1,6 +1,6 @@
using System;
namespace Katteker.Gui
namespace Katteker
{
/// <summary>
/// Shows the Update Window.

View File

@ -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
/// <summary>
/// The Update Window
/// </summary>
public UpdateWindow(UpdateManager updateManager, ReleaseEntry entry)
internal UpdateWindow(UpdateManager updateManager, ReleaseEntry entry)
{
_updateManager = updateManager;
_entry = entry;

View File

@ -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
{
/// <summary>
/// The wrapper to add Squirrel-capability to older Programs.
/// The wrapper to add Katteker-capability to older Programs.
/// </summary>
public static class Wrapper
public static class UserInterface
{
private static UpdateManager _manager;

View File

@ -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