diff --git a/src/.vs/DesktopMagic/DesignTimeBuild/.dtbcache.v2 b/src/.vs/DesktopMagic/DesignTimeBuild/.dtbcache.v2 index 13feed0..5c1d718 100644 Binary files a/src/.vs/DesktopMagic/DesignTimeBuild/.dtbcache.v2 and b/src/.vs/DesktopMagic/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/.vs/DesktopMagic/v16/.suo b/src/.vs/DesktopMagic/v16/.suo index 16ebed2..66e9e8b 100644 Binary files a/src/.vs/DesktopMagic/v16/.suo and b/src/.vs/DesktopMagic/v16/.suo differ diff --git a/src/DesktopMagic.Installer/DesktopMagic-Installer.exe b/src/DesktopMagic.Installer/DesktopMagic-Installer.exe index 8fc185d..cef97e4 100644 Binary files a/src/DesktopMagic.Installer/DesktopMagic-Installer.exe and b/src/DesktopMagic.Installer/DesktopMagic-Installer.exe differ diff --git a/src/DesktopMagic.Installer/Installer.iss b/src/DesktopMagic.Installer/Installer.iss index 58a9216..3656655 100644 --- a/src/DesktopMagic.Installer/Installer.iss +++ b/src/DesktopMagic.Installer/Installer.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "DesktopMagic" -#define MyAppVersion "0.0.2.0" +#define MyAppVersion "0.0.2.1" #define MyAppPublisher "Stone_Red" #define MyAppExeName "DesktopMagic.exe" diff --git a/src/DesktopMagic.Installer/bin/Debug/net5.0/DesktopMagic.Installer.dll b/src/DesktopMagic.Installer/bin/Debug/net5.0/DesktopMagic.Installer.dll index 17c26f1..64a0ed9 100644 Binary files a/src/DesktopMagic.Installer/bin/Debug/net5.0/DesktopMagic.Installer.dll and b/src/DesktopMagic.Installer/bin/Debug/net5.0/DesktopMagic.Installer.dll differ diff --git a/src/DesktopMagic.Installer/bin/Debug/net5.0/DesktopMagic.Installer.pdb b/src/DesktopMagic.Installer/bin/Debug/net5.0/DesktopMagic.Installer.pdb index 40ba353..7459fe9 100644 Binary files a/src/DesktopMagic.Installer/bin/Debug/net5.0/DesktopMagic.Installer.pdb and b/src/DesktopMagic.Installer/bin/Debug/net5.0/DesktopMagic.Installer.pdb differ diff --git a/src/DesktopMagic.Installer/bin/Debug/net5.0/Installer.iss b/src/DesktopMagic.Installer/bin/Debug/net5.0/Installer.iss index 8f843af..58a9216 100644 --- a/src/DesktopMagic.Installer/bin/Debug/net5.0/Installer.iss +++ b/src/DesktopMagic.Installer/bin/Debug/net5.0/Installer.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "DesktopMagic" -#define MyAppVersion "0" +#define MyAppVersion "0.0.2.0" #define MyAppPublisher "Stone_Red" #define MyAppExeName "DesktopMagic.exe" @@ -21,7 +21,7 @@ UsedUserAreasWarning=no ; Remove the following line to run in administrative install mode (install for all users.) PrivilegesRequired=lowest PrivilegesRequiredOverridesAllowed=dialog -OutputBaseFilename=DesktopMagic +OutputBaseFilename=DesktopMagic-Installer OutputDir=. Compression=lzma SolidCompression=yes diff --git a/src/DesktopMagic.Installer/bin/Release/net5.0/Installer.iss b/src/DesktopMagic.Installer/bin/Release/net5.0/Installer.iss index 58a9216..3656655 100644 --- a/src/DesktopMagic.Installer/bin/Release/net5.0/Installer.iss +++ b/src/DesktopMagic.Installer/bin/Release/net5.0/Installer.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "DesktopMagic" -#define MyAppVersion "0.0.2.0" +#define MyAppVersion "0.0.2.1" #define MyAppPublisher "Stone_Red" #define MyAppExeName "DesktopMagic.exe" diff --git a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.dll b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.dll index 734c866..93a0daa 100644 Binary files a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.dll and b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.dll differ diff --git a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.pdb b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.pdb index 731a302..b31758f 100644 Binary files a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.pdb and b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.pdb differ diff --git a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagicPluginAPI.dll b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagicPluginAPI.dll index 1fafbc0..dc0530b 100644 Binary files a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagicPluginAPI.dll and b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagicPluginAPI.dll differ diff --git a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagicPluginAPI.pdb b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagicPluginAPI.pdb index 629027c..f05ce0a 100644 Binary files a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagicPluginAPI.pdb and b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagicPluginAPI.pdb differ diff --git a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.deps.json b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.deps.json index d239f46..1b3e9e8 100644 --- a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.deps.json +++ b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.deps.json @@ -8,7 +8,7 @@ ".NETCoreApp,Version=v5.0": { "DesktopMagic/1.0.0": { "dependencies": { - "DesktopMagicPluginAPI": "0.0.0.1", + "DesktopMagicPluginAPI": "0.0.0.2", "Extended.Wpf.Toolkit": "4.1.0", "Google.Apis.Calendar.v3": "1.51.0.2312", "Hardcodet.NotifyIcon.Wpf": "1.1.0", @@ -323,7 +323,7 @@ } }, "System.Security.Principal.Windows/5.0.0": {}, - "DesktopMagicPluginAPI/0.0.0.1": { + "DesktopMagicPluginAPI/0.0.0.2": { "dependencies": { "System.Drawing.Common": "5.0.2" }, @@ -514,7 +514,7 @@ "path": "system.security.principal.windows/5.0.0", "hashPath": "system.security.principal.windows.5.0.0.nupkg.sha512" }, - "DesktopMagicPluginAPI/0.0.0.1": { + "DesktopMagicPluginAPI/0.0.0.2": { "type": "project", "serviceable": false, "sha512": "" diff --git a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.dll b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.dll index 6eaa8e5..235bad0 100644 Binary files a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.dll and b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.dll differ diff --git a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.pdb b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.pdb index ab34ede..3545bb8 100644 Binary files a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.pdb and b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.pdb differ diff --git a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagicPluginAPI.dll b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagicPluginAPI.dll index 13fe11d..9528185 100644 Binary files a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagicPluginAPI.dll and b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagicPluginAPI.dll differ diff --git a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagicPluginAPI.pdb b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagicPluginAPI.pdb index 0f685f4..00f7ba5 100644 Binary files a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagicPluginAPI.pdb and b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagicPluginAPI.pdb differ diff --git a/src/DesktopMagic/bin/Release/net5.0-windows/ref/DesktopMagic.dll b/src/DesktopMagic/bin/Release/net5.0-windows/ref/DesktopMagic.dll index b2a04dd..6ca9e43 100644 Binary files a/src/DesktopMagic/bin/Release/net5.0-windows/ref/DesktopMagic.dll and b/src/DesktopMagic/bin/Release/net5.0-windows/ref/DesktopMagic.dll differ diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/App.g.i.cs b/src/DesktopMagic/obj/Debug/net5.0-windows/App.g.i.cs index 7f0beab..8954f8f 100644 --- a/src/DesktopMagic/obj/Debug/net5.0-windows/App.g.i.cs +++ b/src/DesktopMagic/obj/Debug/net5.0-windows/App.g.i.cs @@ -62,7 +62,7 @@ public void InitializeComponent() { #line default #line hidden - System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;component/app.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/app.xaml", System.UriKind.Relative); #line 1 "..\..\..\App.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/CalendarWindow.g.i.cs b/src/DesktopMagic/obj/Debug/net5.0-windows/CalendarWindow.g.i.cs index b449027..734d1dc 100644 --- a/src/DesktopMagic/obj/Debug/net5.0-windows/CalendarWindow.g.i.cs +++ b/src/DesktopMagic/obj/Debug/net5.0-windows/CalendarWindow.g.i.cs @@ -85,7 +85,7 @@ public void InitializeComponent() { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;component/calendarwindow.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/calendarwindow.xaml", System.UriKind.Relative); #line 1 "..\..\..\CalendarWindow.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/CpuUsageWindow.g.i.cs b/src/DesktopMagic/obj/Debug/net5.0-windows/CpuUsageWindow.g.i.cs index fe6bff7..db74af3 100644 --- a/src/DesktopMagic/obj/Debug/net5.0-windows/CpuUsageWindow.g.i.cs +++ b/src/DesktopMagic/obj/Debug/net5.0-windows/CpuUsageWindow.g.i.cs @@ -85,7 +85,7 @@ public void InitializeComponent() { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;component/cpuusagewindow.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/cpuusagewindow.xaml", System.UriKind.Relative); #line 1 "..\..\..\CpuUsageWindow.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/DateWindow.g.i.cs b/src/DesktopMagic/obj/Debug/net5.0-windows/DateWindow.g.i.cs index f9b863d..1b22563 100644 --- a/src/DesktopMagic/obj/Debug/net5.0-windows/DateWindow.g.i.cs +++ b/src/DesktopMagic/obj/Debug/net5.0-windows/DateWindow.g.i.cs @@ -85,7 +85,7 @@ public void InitializeComponent() { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;component/datewindow.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/datewindow.xaml", System.UriKind.Relative); #line 1 "..\..\..\DateWindow.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.dll b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.dll index 734c866..93a0daa 100644 Binary files a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.dll and b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.dll differ diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.pdb b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.pdb index 731a302..b31758f 100644 Binary files a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.pdb and b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.pdb differ diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/InputDialog.g.i.cs b/src/DesktopMagic/obj/Debug/net5.0-windows/InputDialog.g.i.cs index 8654560..24c9bcf 100644 --- a/src/DesktopMagic/obj/Debug/net5.0-windows/InputDialog.g.i.cs +++ b/src/DesktopMagic/obj/Debug/net5.0-windows/InputDialog.g.i.cs @@ -86,7 +86,7 @@ public void InitializeComponent() { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;component/inputdialog.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/inputdialog.xaml", System.UriKind.Relative); #line 1 "..\..\..\InputDialog.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.g.i.cs b/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.g.i.cs index cc7d68a..838ec28 100644 --- a/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.g.i.cs +++ b/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.g.i.cs @@ -288,7 +288,7 @@ public void InitializeComponent() { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;component/mainwindow.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/mainwindow.xaml", System.UriKind.Relative); #line 1 "..\..\..\MainWindow.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/MusicVisualizerWindow.g.i.cs b/src/DesktopMagic/obj/Debug/net5.0-windows/MusicVisualizerWindow.g.i.cs index f4f2182..e2d5738 100644 --- a/src/DesktopMagic/obj/Debug/net5.0-windows/MusicVisualizerWindow.g.i.cs +++ b/src/DesktopMagic/obj/Debug/net5.0-windows/MusicVisualizerWindow.g.i.cs @@ -93,7 +93,7 @@ public void InitializeComponent() { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;component/musicvisualizerwindow.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/musicvisualizerwindow.xaml", System.UriKind.Relative); #line 1 "..\..\..\MusicVisualizerWindow.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/TimeWindow.g.i.cs b/src/DesktopMagic/obj/Debug/net5.0-windows/TimeWindow.g.i.cs index 6ee8656..6bce46b 100644 --- a/src/DesktopMagic/obj/Debug/net5.0-windows/TimeWindow.g.i.cs +++ b/src/DesktopMagic/obj/Debug/net5.0-windows/TimeWindow.g.i.cs @@ -85,7 +85,7 @@ public void InitializeComponent() { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;component/timewindow.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/timewindow.xaml", System.UriKind.Relative); #line 1 "..\..\..\TimeWindow.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); diff --git a/src/DesktopMagic/obj/DesktopMagic.csproj.nuget.dgspec.json b/src/DesktopMagic/obj/DesktopMagic.csproj.nuget.dgspec.json index 126335d..14cea52 100644 --- a/src/DesktopMagic/obj/DesktopMagic.csproj.nuget.dgspec.json +++ b/src/DesktopMagic/obj/DesktopMagic.csproj.nuget.dgspec.json @@ -5,7 +5,7 @@ }, "projects": { "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj": { - "version": "0.0.0.1", + "version": "0.0.0.2", "restore": { "projectUniqueName": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj", "projectName": "DesktopMagicPluginAPI", diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.dll b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.dll index 6eaa8e5..235bad0 100644 Binary files a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.dll and b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.dll differ diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.pdb b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.pdb index ab34ede..3545bb8 100644 Binary files a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.pdb and b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.pdb differ diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic_MarkupCompile.i.cache b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic_MarkupCompile.i.cache index 024e5fd..441fc7c 100644 --- a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic_MarkupCompile.i.cache +++ b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic_MarkupCompile.i.cache @@ -16,5 +16,5 @@ C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\App.xaml 226-1942221924 CalendarWindow.xaml;CpuUsageWindow.xaml;DateWindow.xaml;InputDialog.xaml;MainWindow.xaml;MusicVisualizerWindow.xaml;Plugin\PluginWindow.xaml;Resources\StringResources.de.xaml;Resources\StringResources.en.xaml;TimeWindow.xaml; -False +True diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/ref/DesktopMagic.dll b/src/DesktopMagic/obj/Release/net5.0-windows/ref/DesktopMagic.dll index b2a04dd..6ca9e43 100644 Binary files a/src/DesktopMagic/obj/Release/net5.0-windows/ref/DesktopMagic.dll and b/src/DesktopMagic/obj/Release/net5.0-windows/ref/DesktopMagic.dll differ diff --git a/src/DesktopMagic/obj/project.assets.json b/src/DesktopMagic/obj/project.assets.json index 93ac34e..1a67387 100644 --- a/src/DesktopMagic/obj/project.assets.json +++ b/src/DesktopMagic/obj/project.assets.json @@ -389,7 +389,7 @@ } } }, - "DesktopMagicPluginAPI/0.0.0.1": { + "DesktopMagicPluginAPI/0.0.0.2": { "type": "project", "framework": ".NETCoreApp,Version=v5.0", "dependencies": { @@ -1037,7 +1037,7 @@ "version.txt" ] }, - "DesktopMagicPluginAPI/0.0.0.1": { + "DesktopMagicPluginAPI/0.0.0.2": { "type": "project", "path": "../DesktopMagicPluginAPI/DesktopMagicPluginAPI.csproj", "msbuildProject": "../DesktopMagicPluginAPI/DesktopMagicPluginAPI.csproj" @@ -1045,7 +1045,7 @@ }, "projectFileDependencyGroups": { "net5.0-windows7.0": [ - "DesktopMagicPluginAPI >= 0.0.0.1", + "DesktopMagicPluginAPI >= 0.0.0.2", "Extended.Wpf.Toolkit >= 4.1.0", "Google.Apis.Calendar.v3 >= 1.51.0.2312", "Hardcodet.NotifyIcon.Wpf >= 1.1.0", diff --git a/src/DesktopMagic/obj/project.nuget.cache b/src/DesktopMagic/obj/project.nuget.cache index 6bc0378..a692bc4 100644 --- a/src/DesktopMagic/obj/project.nuget.cache +++ b/src/DesktopMagic/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "a1+5eLMBr+UgTaqJnFhqM6HDxVBpg9WhGtBlkKBemMLsauk2EQXXOVJyWiTemrRhRU8ml3KL7wOdiARNSBFqhw==", + "dgSpecHash": "oAwITt5tvNiCprC40hyspTeg+dMo2V26fEiHPAjLaDXxPUndMQBf+r7pox7iwMCiZaTqNSfC56CPdshwHIp45w==", "success": true, "projectFilePath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagic\\DesktopMagic.csproj", "expectedPackageFiles": [ @@ -28,8 +28,7 @@ "C:\\Users\\David\\.nuget\\packages\\system.drawing.common\\5.0.2\\system.drawing.common.5.0.2.nupkg.sha512", "C:\\Users\\David\\.nuget\\packages\\system.management\\5.0.0\\system.management.5.0.0.nupkg.sha512", "C:\\Users\\David\\.nuget\\packages\\system.security.accesscontrol\\5.0.0\\system.security.accesscontrol.5.0.0.nupkg.sha512", - "C:\\Users\\David\\.nuget\\packages\\system.security.principal.windows\\5.0.0\\system.security.principal.windows.5.0.0.nupkg.sha512", - "C:\\Users\\David\\.nuget\\packages\\desktopmagicpluginapi\\0.0.0.1\\desktopmagicpluginapi.0.0.0.1.nupkg.sha512" + "C:\\Users\\David\\.nuget\\packages\\system.security.principal.windows\\5.0.0\\system.security.principal.windows.5.0.0.nupkg.sha512" ], "logs": [ { diff --git a/src/DesktopMagicPlugin.Test/PluginScript.cs b/src/DesktopMagicPlugin.Test/PluginScript.cs index f2127ea..0ffe3eb 100644 --- a/src/DesktopMagicPlugin.Test/PluginScript.cs +++ b/src/DesktopMagicPlugin.Test/PluginScript.cs @@ -1,66 +1,39 @@ using DesktopMagicPluginAPI; using DesktopMagicPluginAPI.Inputs; -using System; -using System.Diagnostics; +using DesktopMagicPluginAPI.Drawing; using System.Drawing; namespace DesktopMagicPlugin.Test { - public class KEK : Plugin + public class InputExamplePlugin : Plugin { - [Element] - private Label heading = new Label("Heading", true); + public override int UpdateInterval { get; set; } = 0; - [Element] - private Label label = new Label(""); + [Element("Text:")] //Mark the property as element with the specified description + private TextBox textBox = new TextBox("abc"); //Create a text box with the specified default value. - [Element("Slider:")] - private Slider slider = new Slider(1, 23, 4); - - [Element("Text:")] - private TextBox textBox = new TextBox("abc"); - - [Element] - private Button button = new Button("Press me!"); - - public override int UpdateInterval { get; set; } - - public KEK() - { - slider.OnValueChanged += Slider_OnValueChanged; - textBox.OnValueChanged += TextBox_OnValueChanged; - button.OnClick += Button_OnClick; - } - - private void Button_OnClick() + public InputExamplePlugin() { - Debug.WriteLine("Button pressed"); - Application.UpdateWindow(); + textBox.OnValueChanged += TextBox_OnValueChanged; //Add an event handler to the "OnValueChanged" event. } private void TextBox_OnValueChanged() { - Debug.WriteLine("TextBox value changed:" + textBox.Value); - } - - private void Slider_OnValueChanged() - { - Debug.WriteLine("Slider value changed:" + slider.Value); + Application.UpdateWindow(); //Update the pugin window. (Calls the "Main" method.) } public override Bitmap Main() { - string str = $"{textBox.Value}: {slider.Value}"; - Bitmap bmp = new Bitmap(1000, 1000); - using Graphics g = Graphics.FromImage(bmp); - g.Clear(Application.Color); - g.DrawString(str, new Font(Application.Font, 100), Brushes.Black, new PointF(0, 0)); - label.Value = str; - slider.Value++; + using (Graphics g = Graphics.FromImage(bmp)) + { + g.Clear(Application.Color); //Set the background color to the color specified in the Desktop Magic application. + + g.DrawStringFixedWidth(textBox.Value, new Font(Application.Font, 100), Brushes.Black, new PointF(0, 0), 120); //Draw the value of the text box to the image. + } - return bmp; + return bmp; //Return the image. } } } \ No newline at end of file diff --git a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPlugin.Test.dll b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPlugin.Test.dll index adcd2fe..dd5e849 100644 Binary files a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPlugin.Test.dll and b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPlugin.Test.dll differ diff --git a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPlugin.Test.pdb b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPlugin.Test.pdb index 28783d7..0a216d6 100644 Binary files a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPlugin.Test.pdb and b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPlugin.Test.pdb differ diff --git a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPluginAPI.dll b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPluginAPI.dll index 1fafbc0..dc0530b 100644 Binary files a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPluginAPI.dll and b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPluginAPI.dll differ diff --git a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPluginAPI.pdb b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPluginAPI.pdb index 629027c..f05ce0a 100644 Binary files a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPluginAPI.pdb and b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPluginAPI.pdb differ diff --git a/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.dll b/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.dll index adcd2fe..dd5e849 100644 Binary files a/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.dll and b/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.dll differ diff --git a/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.pdb b/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.pdb index 28783d7..0a216d6 100644 Binary files a/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.pdb and b/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.pdb differ diff --git a/src/DesktopMagicPlugin.Test/obj/DesktopMagicPlugin.Test.csproj.nuget.dgspec.json b/src/DesktopMagicPlugin.Test/obj/DesktopMagicPlugin.Test.csproj.nuget.dgspec.json index f64981e..0120ffd 100644 --- a/src/DesktopMagicPlugin.Test/obj/DesktopMagicPlugin.Test.csproj.nuget.dgspec.json +++ b/src/DesktopMagicPlugin.Test/obj/DesktopMagicPlugin.Test.csproj.nuget.dgspec.json @@ -74,7 +74,7 @@ } }, "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj": { - "version": "0.0.0.1", + "version": "0.0.0.2", "restore": { "projectUniqueName": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj", "projectName": "DesktopMagicPluginAPI", diff --git a/src/DesktopMagicPlugin.Test/obj/project.assets.json b/src/DesktopMagicPlugin.Test/obj/project.assets.json index 94c7833..da58cf6 100644 --- a/src/DesktopMagicPlugin.Test/obj/project.assets.json +++ b/src/DesktopMagicPlugin.Test/obj/project.assets.json @@ -51,7 +51,7 @@ } } }, - "DesktopMagicPluginAPI/0.0.0.1": { + "DesktopMagicPluginAPI/0.0.0.2": { "type": "project", "framework": ".NETCoreApp,Version=v5.0", "dependencies": { @@ -155,7 +155,7 @@ "version.txt" ] }, - "DesktopMagicPluginAPI/0.0.0.1": { + "DesktopMagicPluginAPI/0.0.0.2": { "type": "project", "path": "../DesktopMagicPluginAPI/DesktopMagicPluginAPI.csproj", "msbuildProject": "../DesktopMagicPluginAPI/DesktopMagicPluginAPI.csproj" @@ -163,7 +163,7 @@ }, "projectFileDependencyGroups": { "net5.0": [ - "DesktopMagicPluginAPI >= 0.0.0.1", + "DesktopMagicPluginAPI >= 0.0.0.2", "System.Drawing.Common >= 5.0.2" ] }, diff --git a/src/DesktopMagicPlugin.Test/obj/project.nuget.cache b/src/DesktopMagicPlugin.Test/obj/project.nuget.cache index 26d4824..cc2684f 100644 --- a/src/DesktopMagicPlugin.Test/obj/project.nuget.cache +++ b/src/DesktopMagicPlugin.Test/obj/project.nuget.cache @@ -1,13 +1,12 @@ { "version": 2, - "dgSpecHash": "+xB+9SHPeT0+QftPe6l55Rd22BgcySMxqOdjBpYZMdQEARbh774pGeWD1Vpkd9GsKCAyEH6oVwzTMYgtwMBThw==", + "dgSpecHash": "usS3nGTjaiSEtOK/4WWNEhZD9yiQj08VI2xuGPW8arBZ4RHrSFj79oQZY282ELI+/1tPykIzPUVypcHmbmdW6Q==", "success": true, "projectFilePath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPlugin.Test\\DesktopMagicPlugin.Test.csproj", "expectedPackageFiles": [ "C:\\Users\\David\\.nuget\\packages\\microsoft.netcore.platforms\\5.0.0\\microsoft.netcore.platforms.5.0.0.nupkg.sha512", "C:\\Users\\David\\.nuget\\packages\\microsoft.win32.systemevents\\5.0.0\\microsoft.win32.systemevents.5.0.0.nupkg.sha512", - "C:\\Users\\David\\.nuget\\packages\\system.drawing.common\\5.0.2\\system.drawing.common.5.0.2.nupkg.sha512", - "C:\\Users\\David\\.nuget\\packages\\desktopmagicpluginapi\\0.0.0.1\\desktopmagicpluginapi.0.0.0.1.nupkg.sha512" + "C:\\Users\\David\\.nuget\\packages\\system.drawing.common\\5.0.2\\system.drawing.common.5.0.2.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/src/DesktopMagicPluginAPI/DesktopMagicPluginAPI.csproj b/src/DesktopMagicPluginAPI/DesktopMagicPluginAPI.csproj index 62b5427..6c7be81 100644 --- a/src/DesktopMagicPluginAPI/DesktopMagicPluginAPI.csproj +++ b/src/DesktopMagicPluginAPI/DesktopMagicPluginAPI.csproj @@ -4,10 +4,12 @@ net5.0 Stone_Red Stone_Red - 0.0.0.1 + 0.0.0.2 https://github.com/Stone-Red-Code/DesktopMagic LICENSE true + 0.0.0.2 + diff --git a/src/DesktopMagicPluginAPI/DesktopMagicPluginAPI.md b/src/DesktopMagicPluginAPI/DesktopMagicPluginAPI.md index 6bbcbc0..9fd0421 100644 --- a/src/DesktopMagicPluginAPI/DesktopMagicPluginAPI.md +++ b/src/DesktopMagicPluginAPI/DesktopMagicPluginAPI.md @@ -18,6 +18,11 @@ - [#ctor()](#M-DesktopMagicPluginAPI-Inputs-ElementAttribute-#ctor 'DesktopMagicPluginAPI.Inputs.ElementAttribute.#ctor') - [Name](#P-DesktopMagicPluginAPI-Inputs-ElementAttribute-Name 'DesktopMagicPluginAPI.Inputs.ElementAttribute.Name') - [OrderIndex](#P-DesktopMagicPluginAPI-Inputs-ElementAttribute-OrderIndex 'DesktopMagicPluginAPI.Inputs.ElementAttribute.OrderIndex') +- [GraphicsExtentions](#T-DesktopMagicPluginAPI-Drawing-GraphicsExtentions 'DesktopMagicPluginAPI.Drawing.GraphicsExtentions') + - [DrawStringFixedWidth(graphics,s,font,brush,x,y,width)](#M-DesktopMagicPluginAPI-Drawing-GraphicsExtentions-DrawStringFixedWidth-System-Drawing-Graphics,System-String,System-Drawing-Font,System-Drawing-Brush,System-Single,System-Single,System-Single- 'DesktopMagicPluginAPI.Drawing.GraphicsExtentions.DrawStringFixedWidth(System.Drawing.Graphics,System.String,System.Drawing.Font,System.Drawing.Brush,System.Single,System.Single,System.Single)') + - [DrawStringFixedWidth(graphics,s,font,brush,point,width)](#M-DesktopMagicPluginAPI-Drawing-GraphicsExtentions-DrawStringFixedWidth-System-Drawing-Graphics,System-String,System-Drawing-Font,System-Drawing-Brush,System-Drawing-PointF,System-Single- 'DesktopMagicPluginAPI.Drawing.GraphicsExtentions.DrawStringFixedWidth(System.Drawing.Graphics,System.String,System.Drawing.Font,System.Drawing.Brush,System.Drawing.PointF,System.Single)') + - [DrawStringMonospace(graphics,s,font,brush,x,y)](#M-DesktopMagicPluginAPI-Drawing-GraphicsExtentions-DrawStringMonospace-System-Drawing-Graphics,System-String,System-Drawing-Font,System-Drawing-Brush,System-Single,System-Single- 'DesktopMagicPluginAPI.Drawing.GraphicsExtentions.DrawStringMonospace(System.Drawing.Graphics,System.String,System.Drawing.Font,System.Drawing.Brush,System.Single,System.Single)') + - [DrawStringMonospace(graphics,s,font,brush,point)](#M-DesktopMagicPluginAPI-Drawing-GraphicsExtentions-DrawStringMonospace-System-Drawing-Graphics,System-String,System-Drawing-Font,System-Drawing-Brush,System-Drawing-PointF- 'DesktopMagicPluginAPI.Drawing.GraphicsExtentions.DrawStringMonospace(System.Drawing.Graphics,System.String,System.Drawing.Font,System.Drawing.Brush,System.Drawing.PointF)') - [IPluginData](#T-DesktopMagicPluginAPI-IPluginData 'DesktopMagicPluginAPI.IPluginData') - [Color](#P-DesktopMagicPluginAPI-IPluginData-Color 'DesktopMagicPluginAPI.IPluginData.Color') - [Font](#P-DesktopMagicPluginAPI-IPluginData-Font 'DesktopMagicPluginAPI.IPluginData.Font') @@ -130,14 +135,14 @@ DesktopMagicPluginAPI.Inputs ##### Summary -The element base class +The element base class. ### ValueChanged() `method` ##### Summary -Triggers the [](#E-DesktopMagicPluginAPI-Inputs-Element-OnValueChanged 'DesktopMagicPluginAPI.Inputs.Element.OnValueChanged') event +Triggers the [](#E-DesktopMagicPluginAPI-Inputs-Element-OnValueChanged 'DesktopMagicPluginAPI.Inputs.Element.OnValueChanged') event. ##### Parameters @@ -206,6 +211,89 @@ The name of the element. The order index of the element. + +## GraphicsExtentions `type` + +##### Namespace + +DesktopMagicPluginAPI.Drawing + +##### Summary + +Extentions for the [Graphics](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Graphics 'System.Drawing.Graphics') class. + + +### DrawStringFixedWidth(graphics,s,font,brush,x,y,width) `method` + +##### Summary + +Draws the specified text string at the specified location with the specified [Brush](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Brush 'System.Drawing.Brush') and [Font](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Font 'System.Drawing.Font') objects. + +##### Parameters + +| Name | Type | Description | +| ---- | ---- | ----------- | +| graphics | [System.Drawing.Graphics](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Graphics 'System.Drawing.Graphics') | Graphics object. | +| s | [System.String](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.String 'System.String') | String to draw. | +| font | [System.Drawing.Font](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Font 'System.Drawing.Font') | [Font](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Font 'System.Drawing.Font') that defines the text format of the string. | +| brush | [System.Drawing.Brush](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Brush 'System.Drawing.Brush') | [Brush](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Brush 'System.Drawing.Brush') that determines the color and texture of the drawn text. | +| x | [System.Single](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Single 'System.Single') | The x-coordinate of the upper-left corner of the drawn text. | +| y | [System.Single](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Single 'System.Single') | The y-coordinate of the upper-left corner of the drawn text. | +| width | [System.Single](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Single 'System.Single') | The specified width. | + + +### DrawStringFixedWidth(graphics,s,font,brush,point,width) `method` + +##### Summary + +Draws the specified text string at the specified location with the specified [Brush](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Brush 'System.Drawing.Brush') and [Font](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Font 'System.Drawing.Font') objects. + +##### Parameters + +| Name | Type | Description | +| ---- | ---- | ----------- | +| graphics | [System.Drawing.Graphics](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Graphics 'System.Drawing.Graphics') | Graphics object. | +| s | [System.String](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.String 'System.String') | String to draw. | +| font | [System.Drawing.Font](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Font 'System.Drawing.Font') | [Font](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Font 'System.Drawing.Font') that defines the text format of the string. | +| brush | [System.Drawing.Brush](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Brush 'System.Drawing.Brush') | [Brush](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Brush 'System.Drawing.Brush') that determines the color and texture of the drawn text. | +| point | [System.Drawing.PointF](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.PointF 'System.Drawing.PointF') | [PointF](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.PointF 'System.Drawing.PointF') structure that specifies the upper-left corner of the drawn text. | +| width | [System.Single](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Single 'System.Single') | The specified width. | + + +### DrawStringMonospace(graphics,s,font,brush,x,y) `method` + +##### Summary + +Draws the specified text string at the specified location with the specified [Brush](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Brush 'System.Drawing.Brush') and [Font](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Font 'System.Drawing.Font') objects. + +##### Parameters + +| Name | Type | Description | +| ---- | ---- | ----------- | +| graphics | [System.Drawing.Graphics](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Graphics 'System.Drawing.Graphics') | Graphics object. | +| s | [System.String](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.String 'System.String') | String to draw. | +| font | [System.Drawing.Font](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Font 'System.Drawing.Font') | [Font](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Font 'System.Drawing.Font') that defines the text format of the string. | +| brush | [System.Drawing.Brush](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Brush 'System.Drawing.Brush') | [Brush](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Brush 'System.Drawing.Brush') that determines the color and texture of the drawn text. | +| x | [System.Single](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Single 'System.Single') | The x-coordinate of the upper-left corner of the drawn text. | +| y | [System.Single](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Single 'System.Single') | The y-coordinate of the upper-left corner of the drawn text. | + + +### DrawStringMonospace(graphics,s,font,brush,point) `method` + +##### Summary + +Draws the specified text string at the specified location with the specified [Brush](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Brush 'System.Drawing.Brush') and [Font](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Font 'System.Drawing.Font') objects. + +##### Parameters + +| Name | Type | Description | +| ---- | ---- | ----------- | +| graphics | [System.Drawing.Graphics](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Graphics 'System.Drawing.Graphics') | Graphics object. | +| s | [System.String](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.String 'System.String') | String to draw. | +| font | [System.Drawing.Font](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Font 'System.Drawing.Font') | [Font](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Font 'System.Drawing.Font') that defines the text format of the string. | +| brush | [System.Drawing.Brush](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Brush 'System.Drawing.Brush') | [Brush](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.Brush 'System.Drawing.Brush') that determines the color and texture of the drawn text. | +| point | [System.Drawing.PointF](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.PointF 'System.Drawing.PointF') | [PointF](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Drawing.PointF 'System.Drawing.PointF') structure that specifies the upper-left corner of the drawn text. | + ## IPluginData `type` @@ -331,8 +419,8 @@ Initializes a new instance of the [Label](#T-DesktopMagicPluginAPI-Inputs-Label | Name | Type | Description | | ---- | ---- | ----------- | -| value | [System.String](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.String 'System.String') | | -| bold | [System.Boolean](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Boolean 'System.Boolean') | | +| value | [System.String](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.String 'System.String') | The text associated with this [Label](#T-DesktopMagicPluginAPI-Inputs-Label 'DesktopMagicPluginAPI.Inputs.Label') | +| bold | [System.Boolean](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.Boolean 'System.Boolean') | A value indicating whether the content of the [Label](#T-DesktopMagicPluginAPI-Inputs-Label 'DesktopMagicPluginAPI.Inputs.Label') is bold or not. | ### Bold `property` @@ -346,7 +434,7 @@ Gets or set a value indicating whether the content of the [Label](#T-DesktopMagi ##### Summary -Gets or sets the text associated with this control. +Gets or sets the text associated with this [Label](#T-DesktopMagicPluginAPI-Inputs-Label 'DesktopMagicPluginAPI.Inputs.Label'). ## Plugin `type` @@ -483,11 +571,11 @@ Initializes a new instance of the [TextBox](#T-DesktopMagicPluginAPI-Inputs-Text | Name | Type | Description | | ---- | ---- | ----------- | -| value | [System.String](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.String 'System.String') | | +| value | [System.String](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.String 'System.String') | The text associated with this control. | ### Value `property` ##### Summary -Gets or sets the text associated with this control. +Gets or sets the text associated with this [TextBox](#T-DesktopMagicPluginAPI-Inputs-TextBox 'DesktopMagicPluginAPI.Inputs.TextBox'). diff --git a/src/DesktopMagicPluginAPI/DesktopMagicPluginAPI.xml b/src/DesktopMagicPluginAPI/DesktopMagicPluginAPI.xml index d0eb209..468b558 100644 --- a/src/DesktopMagicPluginAPI/DesktopMagicPluginAPI.xml +++ b/src/DesktopMagicPluginAPI/DesktopMagicPluginAPI.xml @@ -4,6 +4,55 @@ DesktopMagicPluginAPI + + + Extentions for the class. + + + + + Draws the specified text string at the specified location with the specified and objects. + + Graphics object. + String to draw. + that defines the text format of the string. + that determines the color and texture of the drawn text. + The x-coordinate of the upper-left corner of the drawn text. + The y-coordinate of the upper-left corner of the drawn text. + + + + Draws the specified text string at the specified location with the specified and objects. + + Graphics object. + String to draw. + that defines the text format of the string. + that determines the color and texture of the drawn text. + structure that specifies the upper-left corner of the drawn text. + + + + Draws the specified text string at the specified location with the specified and objects. + + Graphics object. + String to draw. + that defines the text format of the string. + that determines the color and texture of the drawn text. + The x-coordinate of the upper-left corner of the drawn text. + The y-coordinate of the upper-left corner of the drawn text. + /// The specified width. + + + + Draws the specified text string at the specified location with the specified and objects. + + Graphics object. + String to draw. + that defines the text format of the string. + that determines the color and texture of the drawn text. + structure that specifies the upper-left corner of the drawn text. + The specified width. + Represents a button control. @@ -48,17 +97,17 @@ - The element base class + The element base class. - Occurs when the value has been changed + Occurs when the value has been changed. - Triggers the event + Triggers the event. @@ -128,7 +177,7 @@ - Gets or sets the text associated with this control. + Gets or sets the text associated with this . @@ -140,8 +189,8 @@ Initializes a new instance of the class with the provided . - - + The text associated with this + A value indicating whether the content of the is bold or not. @@ -178,14 +227,14 @@ - Gets or sets the text associated with this control. + Gets or sets the text associated with this . Initializes a new instance of the class with the provided . - + The text associated with this control. diff --git a/src/DesktopMagicPluginAPI/Drawing/FontComparer.cs b/src/DesktopMagicPluginAPI/Drawing/FontComparer.cs new file mode 100644 index 0000000..aa994a9 --- /dev/null +++ b/src/DesktopMagicPluginAPI/Drawing/FontComparer.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DesktopMagicPluginAPI.Drawing +{ + internal class FontComparer : IEqualityComparer + { + public bool Equals(Font font1, Font font2) + { + if (font1.Name != font2.Name) return false; + if (font1.SizeInPoints != font2.SizeInPoints) return false; + if (font1.Style != font2.Style) return false; + return true; + } + + public int GetHashCode([DisallowNull] Font obj) + { + return obj.GetHashCode(); + } + } +} \ No newline at end of file diff --git a/src/DesktopMagicPluginAPI/Drawing/GraphicsExtentions.cs b/src/DesktopMagicPluginAPI/Drawing/GraphicsExtentions.cs new file mode 100644 index 0000000..af38757 --- /dev/null +++ b/src/DesktopMagicPluginAPI/Drawing/GraphicsExtentions.cs @@ -0,0 +1,121 @@ +using System; +using System.Collections.Generic; +using System.Drawing; + +namespace DesktopMagicPluginAPI.Drawing +{ + /// + /// Extentions for the class. + /// + public static class GraphicsExtentions + { + private static readonly Dictionary fonts = new Dictionary(new FontComparer()); + + /// + /// Draws the specified text string at the specified location with the specified and objects. + /// + /// Graphics object. + /// String to draw. + /// that defines the text format of the string. + /// that determines the color and texture of the drawn text. + /// The x-coordinate of the upper-left corner of the drawn text. + /// The y-coordinate of the upper-left corner of the drawn text. + public static void DrawStringMonospace(this Graphics graphics, string s, Font font, Brush brush, float x, float y) + { + int widest = GetWidestChar(font); + + for (int i = 0; i < s.Length; i++) + { + graphics.DrawString(s[i].ToString(), font, brush, x, y); + + x += widest; + } + } + + /// + /// Draws the specified text string at the specified location with the specified and objects. + /// + /// Graphics object. + /// String to draw. + /// that defines the text format of the string. + /// that determines the color and texture of the drawn text. + /// structure that specifies the upper-left corner of the drawn text. + public static void DrawStringMonospace(this Graphics graphics, string s, Font font, Brush brush, PointF point) + { + int widest = GetWidestChar(font); + + for (int i = 0; i < s.Length; i++) + { + graphics.DrawString(s[i].ToString(), font, brush, point); + + point.X += widest; + } + } + + /// + /// Draws the specified text string at the specified location with the specified and objects. + /// + /// Graphics object. + /// String to draw. + /// that defines the text format of the string. + /// that determines the color and texture of the drawn text. + /// The x-coordinate of the upper-left corner of the drawn text. + /// The y-coordinate of the upper-left corner of the drawn text. + /// /// The specified width. + public static void DrawStringFixedWidth(this Graphics graphics, string s, Font font, Brush brush, float x, float y, float width) + { + for (int i = 0; i < s.Length; i++) + { + graphics.DrawString(s[i].ToString(), font, brush, x, y); + + x += width; + } + } + + /// + /// Draws the specified text string at the specified location with the specified and objects. + /// + /// Graphics object. + /// String to draw. + /// that defines the text format of the string. + /// that determines the color and texture of the drawn text. + /// structure that specifies the upper-left corner of the drawn text. + /// The specified width. + public static void DrawStringFixedWidth(this Graphics graphics, string s, Font font, Brush brush, PointF point, float width) + { + for (int i = 0; i < s.Length; i++) + { + graphics.DrawString(s[i].ToString(), font, brush, point); + + point.X += width; + } + } + + private static int GetWidestChar(Font font) + { + if (fonts.ContainsKey(font)) + return fonts[font]; + + Graphics graphics = Graphics.FromImage(new Bitmap(1, 1)); + float max = 0; + char maxx = ' '; + for (int i = 0; i <= 255; i++) + { + char c = (char)i; + if (char.IsLetterOrDigit(c)) + { + float neww = graphics.MeasureString(c.ToString(), font).Width; + if (neww >= max) + { + max = neww; + maxx = c; + } + } + } + Console.WriteLine((int)Math.Round(max, 0)); + Console.WriteLine(maxx); + fonts.Add(font, (int)Math.Round(max, 0)); + return (int)Math.Round(max, 0); + } + } +} \ No newline at end of file diff --git a/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.dll b/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.dll index 1fafbc0..dc0530b 100644 Binary files a/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.dll and b/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.dll differ diff --git a/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.pdb b/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.pdb index 629027c..f05ce0a 100644 Binary files a/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.pdb and b/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.pdb differ diff --git a/src/DesktopMagicPluginAPI/bin/Debug/net5.0/ref/DesktopMagicPluginAPI.dll b/src/DesktopMagicPluginAPI/bin/Debug/net5.0/ref/DesktopMagicPluginAPI.dll index 4f41ceb..77c7a44 100644 Binary files a/src/DesktopMagicPluginAPI/bin/Debug/net5.0/ref/DesktopMagicPluginAPI.dll and b/src/DesktopMagicPluginAPI/bin/Debug/net5.0/ref/DesktopMagicPluginAPI.dll differ diff --git a/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.deps.json b/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.deps.json index 67f47dd..d912b45 100644 --- a/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.deps.json +++ b/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.deps.json @@ -6,7 +6,7 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v5.0": { - "DesktopMagicPluginAPI/0.0.0.1": { + "DesktopMagicPluginAPI/0.0.0.2": { "dependencies": { "System.Drawing.Common": "5.0.2", "Vsxmd": "1.4.5" @@ -64,7 +64,7 @@ } }, "libraries": { - "DesktopMagicPluginAPI/0.0.0.1": { + "DesktopMagicPluginAPI/0.0.0.2": { "type": "project", "serviceable": false, "sha512": "" diff --git a/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.dll b/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.dll index 13fe11d..9528185 100644 Binary files a/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.dll and b/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.dll differ diff --git a/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.pdb b/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.pdb index 0f685f4..00f7ba5 100644 Binary files a/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.pdb and b/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.pdb differ diff --git a/src/DesktopMagicPluginAPI/bin/Release/net5.0/ref/DesktopMagicPluginAPI.dll b/src/DesktopMagicPluginAPI/bin/Release/net5.0/ref/DesktopMagicPluginAPI.dll index d422eb5..7f3d90e 100644 Binary files a/src/DesktopMagicPluginAPI/bin/Release/net5.0/ref/DesktopMagicPluginAPI.dll and b/src/DesktopMagicPluginAPI/bin/Release/net5.0/ref/DesktopMagicPluginAPI.dll differ diff --git a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.csproj.CoreCompileInputs.cache b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.csproj.CoreCompileInputs.cache index f3c6949..86c15f7 100644 --- a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.csproj.CoreCompileInputs.cache +++ b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -ced4ac85c0c7d0fe87e126147d10f5c33d432ea7 +c4d6aa24a0b6e4a4167479bdf6855cde0ebc6e09 diff --git a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.dll b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.dll index 1fafbc0..dc0530b 100644 Binary files a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.dll and b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.dll differ diff --git a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.pdb b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.pdb index 629027c..f05ce0a 100644 Binary files a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.pdb and b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.pdb differ diff --git a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/ref/DesktopMagicPluginAPI.dll b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/ref/DesktopMagicPluginAPI.dll index 4f41ceb..77c7a44 100644 Binary files a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/ref/DesktopMagicPluginAPI.dll and b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/ref/DesktopMagicPluginAPI.dll differ diff --git a/src/DesktopMagicPluginAPI/obj/DesktopMagicPluginAPI.csproj.nuget.dgspec.json b/src/DesktopMagicPluginAPI/obj/DesktopMagicPluginAPI.csproj.nuget.dgspec.json index d4ce958..03deded 100644 --- a/src/DesktopMagicPluginAPI/obj/DesktopMagicPluginAPI.csproj.nuget.dgspec.json +++ b/src/DesktopMagicPluginAPI/obj/DesktopMagicPluginAPI.csproj.nuget.dgspec.json @@ -5,7 +5,7 @@ }, "projects": { "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj": { - "version": "0.0.0.1", + "version": "0.0.0.2", "restore": { "projectUniqueName": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj", "projectName": "DesktopMagicPluginAPI", diff --git a/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.AssemblyInfo.cs b/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.AssemblyInfo.cs index 10996fc..f81d769 100644 --- a/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.AssemblyInfo.cs +++ b/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.AssemblyInfo.cs @@ -13,11 +13,11 @@ [assembly: System.Reflection.AssemblyCompanyAttribute("Stone_Red")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] -[assembly: System.Reflection.AssemblyFileVersionAttribute("0.0.0.1")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("0.0.0.1")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("0.0.0.2")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("0.0.0.2")] [assembly: System.Reflection.AssemblyProductAttribute("Stone_Red")] [assembly: System.Reflection.AssemblyTitleAttribute("DesktopMagicPluginAPI")] -[assembly: System.Reflection.AssemblyVersionAttribute("0.0.0.1")] +[assembly: System.Reflection.AssemblyVersionAttribute("0.0.0.2")] [assembly: System.Reflection.AssemblyMetadataAttribute("RepositoryUrl", "https://github.com/Stone-Red-Code/DesktopMagic")] // Von der MSBuild WriteCodeFragment-Klasse generiert. diff --git a/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.AssemblyInfoInputs.cache b/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.AssemblyInfoInputs.cache index 2626874..5b58223 100644 --- a/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.AssemblyInfoInputs.cache +++ b/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.AssemblyInfoInputs.cache @@ -1 +1 @@ -d7809b9abf4d9a475e2d576fb05d2d793ced1107 +b059d9ab67e4c5d6898d4ee73187cf3094dc2fb1 diff --git a/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.csproj.CoreCompileInputs.cache b/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.csproj.CoreCompileInputs.cache index aa97f33..c86ee88 100644 --- a/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.csproj.CoreCompileInputs.cache +++ b/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -801158c4d5ba4b4a8b0e6e57ad9e67f56077c71a +70efc92be71c8c7b6b52cfc181cb6ec6af57875e diff --git a/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.dll b/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.dll index 13fe11d..9528185 100644 Binary files a/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.dll and b/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.dll differ diff --git a/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.pdb b/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.pdb index 0f685f4..00f7ba5 100644 Binary files a/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.pdb and b/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.pdb differ diff --git a/src/DesktopMagicPluginAPI/obj/Release/net5.0/ref/DesktopMagicPluginAPI.dll b/src/DesktopMagicPluginAPI/obj/Release/net5.0/ref/DesktopMagicPluginAPI.dll index d422eb5..7f3d90e 100644 Binary files a/src/DesktopMagicPluginAPI/obj/Release/net5.0/ref/DesktopMagicPluginAPI.dll and b/src/DesktopMagicPluginAPI/obj/Release/net5.0/ref/DesktopMagicPluginAPI.dll differ diff --git a/src/DesktopMagicPluginAPI/obj/project.assets.json b/src/DesktopMagicPluginAPI/obj/project.assets.json index 6b53fc2..b49f29f 100644 --- a/src/DesktopMagicPluginAPI/obj/project.assets.json +++ b/src/DesktopMagicPluginAPI/obj/project.assets.json @@ -220,7 +220,7 @@ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {} }, "project": { - "version": "0.0.0.1", + "version": "0.0.0.2", "restore": { "projectUniqueName": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj", "projectName": "DesktopMagicPluginAPI", diff --git a/src/DesktopMagicPluginAPI/obj/project.nuget.cache b/src/DesktopMagicPluginAPI/obj/project.nuget.cache index a5ab2a5..5afffd8 100644 --- a/src/DesktopMagicPluginAPI/obj/project.nuget.cache +++ b/src/DesktopMagicPluginAPI/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "fOE+bI0gEfedmn7JaJivSPCHQ/HXI0iR7p6Pd4Ka/IfTuazMk4M0Vi0X5UnM0R4UXVcHDy8FnjtX6Ha/hR2qrg==", + "dgSpecHash": "ztYU0cVoZINBHAaAPNy5M0w/MqUUs2P1PxmiG36fzd1MSKmhHYayWyQa0H6apXODMcjRL5wdpujRtbMCjjfpmA==", "success": true, "projectFilePath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj", "expectedPackageFiles": [