diff --git a/BrowseForFileAndFolder/App.config b/BrowseForFileAndFolder/App.config new file mode 100644 index 0000000..56efbc7 --- /dev/null +++ b/BrowseForFileAndFolder/App.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/BrowseForFileAndFolder/BrowseForFileAndFolder.csproj b/BrowseForFileAndFolder/BrowseForFileAndFolder.csproj new file mode 100644 index 0000000..774380a --- /dev/null +++ b/BrowseForFileAndFolder/BrowseForFileAndFolder.csproj @@ -0,0 +1,76 @@ + + + + + Debug + AnyCPU + {74EA2D69-AF51-4BC9-A531-335219379E2A} + WinExe + BrowseForFileAndFolder + BrowseForFileAndFolder + v4.7.2 + 512 + true + true + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\CoreWindowsWrapper.1.0.43\lib\net472\CoreWindowsWrapper.dll + + + ..\packages\Diga.Core.Api.Win32.1.0.20\lib\net472\Diga.Core.Api.Win32.dll + + + + + + + + + + + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + True + Resources.resx + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + True + Settings.settings + True + + + + + + + \ No newline at end of file diff --git a/BrowseForFileAndFolder/MainWindow.cs b/BrowseForFileAndFolder/MainWindow.cs new file mode 100644 index 0000000..ccc7fd9 --- /dev/null +++ b/BrowseForFileAndFolder/MainWindow.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; + +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using CoreWindowsWrapper; +using CoreWindowsWrapper.Tools; +using Diga.Core.Api.Win32; + +namespace BrowseForFileAndFolder +{ + class MainWindow:NativeWindow + { + private NativeTextBox _TextPath; + private NativeButton _PathSelectButton; + protected override void InitControls() + { + + this.Text = "Browse for Folder and File"; + this.Width = 500; + this.Height = 400; + this.BackColor = ColorTool.White; + this.StartUpPosition = WindowsStartupPosition.CenterScreen; + this._TextPath = new NativeTextBox(); + + this._TextPath.Left = 10; + this._TextPath.Top = 10; + this._TextPath.Width = 200; + this._TextPath.Height = 20; + this._TextPath.Style |= WindowStylesConst.WS_BORDER; + + this._PathSelectButton = new NativeButton(); + this._PathSelectButton.Left = this._TextPath.Left + this._TextPath.Width + 2; + this._PathSelectButton.Top = this._TextPath.Top; + this._PathSelectButton.Width = 30; + this._PathSelectButton.Height = 20; + this._PathSelectButton.Text = "…"; + this._PathSelectButton.Clicked += PathSelectButton_Click; + + this.Controls.Add(this._TextPath); + this.Controls.Add(this._PathSelectButton); + } + + private void PathSelectButton_Click(object sender, EventArgs e) + { + OpenFolderDialog ofd = new OpenFolderDialog(); + ofd.Caption = "Select your Folder"; + if(ofd.Show(this)) + { + this._TextPath.Text = ofd.SelectedPath; + } + + } + } +} diff --git a/BrowseForFileAndFolder/Program.cs b/BrowseForFileAndFolder/Program.cs new file mode 100644 index 0000000..10f3e28 --- /dev/null +++ b/BrowseForFileAndFolder/Program.cs @@ -0,0 +1,20 @@ +using System; +using CoreWindowsWrapper; + +namespace BrowseForFileAndFolder +{ + static class Program + { + /// + /// Der Haupteinstiegspunkt für die Anwendung. + /// + [STAThread] + static void Main() + { + + MainWindow mw = new MainWindow(); + NativeApp.Run(mw); + + } + } +} diff --git a/BrowseForFileAndFolder/Properties/AssemblyInfo.cs b/BrowseForFileAndFolder/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..fb40a36 --- /dev/null +++ b/BrowseForFileAndFolder/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +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 einer Assembly zugeordnet sind. +[assembly: AssemblyTitle("BrowseForFileAndFolder")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("BrowseForFileAndFolder")] +[assembly: AssemblyCopyright("Copyright © 2020")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly +// für COM-Komponenten unsichtbar. Wenn Sie auf einen Typ in dieser Assembly von +// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen. +[assembly: ComVisible(false)] + +// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird +[assembly: Guid("74ea2d69-af51-4bc9-a531-335219379e2a")] + +// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: +// +// Hauptversion +// Nebenversion +// Buildnummer +// Revision +// +// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, +// indem Sie "*" wie unten gezeigt eingeben: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/BrowseForFileAndFolder/Properties/Resources.Designer.cs b/BrowseForFileAndFolder/Properties/Resources.Designer.cs new file mode 100644 index 0000000..c3498b2 --- /dev/null +++ b/BrowseForFileAndFolder/Properties/Resources.Designer.cs @@ -0,0 +1,71 @@ +//------------------------------------------------------------------------------ +// +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion: 4.0.30319.42000 +// +// Änderungen an dieser Datei können fehlerhaftes Verhalten verursachen und gehen verloren, wenn +// der Code neu generiert wird. +// +//------------------------------------------------------------------------------ + +namespace BrowseForFileAndFolder.Properties +{ + + + /// + /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. + /// + // Diese Klasse wurde von der StronglyTypedResourceBuilder-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 Option /str erneut aus, oder erstellen Sie Ihr VS-Projekt neu. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources + { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() + { + } + + /// + /// 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 ((resourceMan == null)) + { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("BrowseForFileAndFolder.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + /// Ressourcenlookups, die diese stark typisierte Ressourcenklasse verwenden. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture + { + get + { + return resourceCulture; + } + set + { + resourceCulture = value; + } + } + } +} diff --git a/BrowseForFileAndFolder/Properties/Resources.resx b/BrowseForFileAndFolder/Properties/Resources.resx new file mode 100644 index 0000000..af7dbeb --- /dev/null +++ b/BrowseForFileAndFolder/Properties/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/BrowseForFileAndFolder/Properties/Settings.Designer.cs b/BrowseForFileAndFolder/Properties/Settings.Designer.cs new file mode 100644 index 0000000..d2bb088 --- /dev/null +++ b/BrowseForFileAndFolder/Properties/Settings.Designer.cs @@ -0,0 +1,30 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace BrowseForFileAndFolder.Properties +{ + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase + { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default + { + get + { + return defaultInstance; + } + } + } +} diff --git a/BrowseForFileAndFolder/Properties/Settings.settings b/BrowseForFileAndFolder/Properties/Settings.settings new file mode 100644 index 0000000..3964565 --- /dev/null +++ b/BrowseForFileAndFolder/Properties/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + diff --git a/BrowseForFileAndFolder/packages.config b/BrowseForFileAndFolder/packages.config new file mode 100644 index 0000000..2605115 --- /dev/null +++ b/BrowseForFileAndFolder/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Diga.NativeControls.WebBrowser.Core/Diga.NativeControls.WebBrowser.Core.csproj b/Diga.NativeControls.WebBrowser.Core/Diga.NativeControls.WebBrowser.Core.csproj index 1af9b36..ed94e0b 100644 --- a/Diga.NativeControls.WebBrowser.Core/Diga.NativeControls.WebBrowser.Core.csproj +++ b/Diga.NativeControls.WebBrowser.Core/Diga.NativeControls.WebBrowser.Core.csproj @@ -15,7 +15,7 @@ - + diff --git a/Diga.NativeControls.WebBrowser/Diga.NativeControls.WebBrowser.csproj b/Diga.NativeControls.WebBrowser/Diga.NativeControls.WebBrowser.csproj index 15e6de9..4698c80 100644 --- a/Diga.NativeControls.WebBrowser/Diga.NativeControls.WebBrowser.csproj +++ b/Diga.NativeControls.WebBrowser/Diga.NativeControls.WebBrowser.csproj @@ -34,10 +34,10 @@ - ..\packages\CoreWindowsWrapper.1.0.41\lib\net472\CoreWindowsWrapper.dll + ..\packages\CoreWindowsWrapper.1.0.43\lib\net472\CoreWindowsWrapper.dll - ..\packages\Diga.Core.Api.Win32.1.0.19\lib\net472\Diga.Core.Api.Win32.dll + ..\packages\Diga.Core.Api.Win32.1.0.20\lib\net472\Diga.Core.Api.Win32.dll ..\packages\Diga.WebView2.Interop.2.0.4\lib\net472\Diga.WebView2.Interop.V9430.dll diff --git a/Diga.NativeControls.WebBrowser/packages.config b/Diga.NativeControls.WebBrowser/packages.config index f771686..1a41010 100644 --- a/Diga.NativeControls.WebBrowser/packages.config +++ b/Diga.NativeControls.WebBrowser/packages.config @@ -1,7 +1,7 @@  - - + + diff --git a/Diga.NativeControls.sln b/Diga.NativeControls.sln index b9948dd..1221717 100644 --- a/Diga.NativeControls.sln +++ b/Diga.NativeControls.sln @@ -11,6 +11,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Diga.NativeControls.WebBrow EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diga.NativeControls.WebBrowser", "Diga.NativeControls.WebBrowser\Diga.NativeControls.WebBrowser.csproj", "{98B7E068-93E6-4291-B45D-6F6940A21258}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrowseForFileAndFolder", "BrowseForFileAndFolder\BrowseForFileAndFolder.csproj", "{74EA2D69-AF51-4BC9-A531-335219379E2A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -33,6 +35,10 @@ Global {98B7E068-93E6-4291-B45D-6F6940A21258}.Debug|Any CPU.Build.0 = Debug|Any CPU {98B7E068-93E6-4291-B45D-6F6940A21258}.Release|Any CPU.ActiveCfg = Release|Any CPU {98B7E068-93E6-4291-B45D-6F6940A21258}.Release|Any CPU.Build.0 = Release|Any CPU + {74EA2D69-AF51-4BC9-A531-335219379E2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {74EA2D69-AF51-4BC9-A531-335219379E2A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {74EA2D69-AF51-4BC9-A531-335219379E2A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {74EA2D69-AF51-4BC9-A531-335219379E2A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/DigaCoreTest/DigaCoreTest.csproj b/DigaCoreTest/DigaCoreTest.csproj index cb42541..dd13649 100644 --- a/DigaCoreTest/DigaCoreTest.csproj +++ b/DigaCoreTest/DigaCoreTest.csproj @@ -6,7 +6,7 @@ - + diff --git a/DigaCoreTest/Program.cs b/DigaCoreTest/Program.cs index ab36cb6..f0a2b31 100644 --- a/DigaCoreTest/Program.cs +++ b/DigaCoreTest/Program.cs @@ -7,8 +7,7 @@ namespace DigaCore class Program { [STAThread] - static void Main(string[] args) - { + static void Main(string[] args) { BrowserWindow browserWindow = new BrowserWindow(); NativeApp.Run(browserWindow); } diff --git a/DigaWinFormsTest/DigaWinFormsTest.csproj b/DigaWinFormsTest/DigaWinFormsTest.csproj index 33de359..4b811e0 100644 --- a/DigaWinFormsTest/DigaWinFormsTest.csproj +++ b/DigaWinFormsTest/DigaWinFormsTest.csproj @@ -36,10 +36,10 @@ - ..\packages\CoreWindowsWrapper.1.0.41\lib\net472\CoreWindowsWrapper.dll + ..\packages\CoreWindowsWrapper.1.0.43\lib\net472\CoreWindowsWrapper.dll - ..\packages\Diga.Core.Api.Win32.1.0.19\lib\net472\Diga.Core.Api.Win32.dll + ..\packages\Diga.Core.Api.Win32.1.0.20\lib\net472\Diga.Core.Api.Win32.dll ..\packages\Diga.NativeControls.WebBrowser.1.0.0\lib\net472\Diga.NativeControls.WebBrowser.dll diff --git a/DigaWinFormsTest/packages.config b/DigaWinFormsTest/packages.config index 53ec3b2..0d428ed 100644 --- a/DigaWinFormsTest/packages.config +++ b/DigaWinFormsTest/packages.config @@ -1,7 +1,7 @@  - - + +