diff --git a/src/.vs/DesktopMagic/DesignTimeBuild/.dtbcache.v2 b/src/.vs/DesktopMagic/DesignTimeBuild/.dtbcache.v2
index 9611e38..ca6feb7 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 5dad535..2f6f33e 100644
Binary files a/src/.vs/DesktopMagic/v16/.suo and b/src/.vs/DesktopMagic/v16/.suo differ
diff --git a/src/DesktopMagic.Installer/DesktopMagic.exe b/src/DesktopMagic.Installer/DesktopMagic.exe
index 1dd74ce..7f24175 100644
Binary files a/src/DesktopMagic.Installer/DesktopMagic.exe and b/src/DesktopMagic.Installer/DesktopMagic.exe differ
diff --git a/src/DesktopMagic/CalendarManagment.cs b/src/DesktopMagic/CalendarManagment.cs
index 368cedd..63bd82b 100644
--- a/src/DesktopMagic/CalendarManagment.cs
+++ b/src/DesktopMagic/CalendarManagment.cs
@@ -12,8 +12,6 @@ namespace DesktopMagic
{
internal class CalendarManagment
{
- // If Pluginifying these scopes, delete your previously saved credentials
- // at ~/.credentials/calendar-dotnet-quickstart.json
private static string[] Scopes = { CalendarService.Scope.CalendarReadonly };
private static string ApplicationName = "Google Calendar API .NET " + MainWindow.AppName;
diff --git a/src/DesktopMagic/InputDialog.xaml b/src/DesktopMagic/InputDialog.xaml
index 8733e86..790377a 100644
--- a/src/DesktopMagic/InputDialog.xaml
+++ b/src/DesktopMagic/InputDialog.xaml
@@ -8,9 +8,13 @@
Title="InputDialog" Height="152.812" Width="322.812"
ResizeMode="NoResize">
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/src/DesktopMagic/InputDialog.xaml.cs b/src/DesktopMagic/InputDialog.xaml.cs
index 0522ed8..8559ef7 100644
--- a/src/DesktopMagic/InputDialog.xaml.cs
+++ b/src/DesktopMagic/InputDialog.xaml.cs
@@ -1,4 +1,6 @@
-using System.Windows;
+using System;
+using System.Threading;
+using System.Windows;
namespace DesktopMagic
{
@@ -12,6 +14,7 @@ namespace DesktopMagic
InitializeComponent();
label.Content = content;
this.Title = title;
+ SetLanguageDictionary();
}
public string ResponseText
@@ -20,14 +23,30 @@ namespace DesktopMagic
set { textBox.Text = value; }
}
- private void okButton_Click(object sender, RoutedEventArgs e)
+ private void OkButton_Click(object sender, RoutedEventArgs e)
{
DialogResult = true;
}
- private void cancelButton_Click(object sender, RoutedEventArgs e)
+ private void CancelButton_Click(object sender, RoutedEventArgs e)
{
DialogResult = false;
}
+
+ private void SetLanguageDictionary()
+ {
+ ResourceDictionary dict = new ResourceDictionary();
+ string currentCulture = Thread.CurrentThread.CurrentCulture.ToString();
+
+ if (currentCulture.Contains("de"))
+ {
+ dict.Source = new Uri("..\\Resources\\StringResources.de.xaml", UriKind.Relative);
+ }
+ else
+ {
+ dict.Source = new Uri("..\\Resources\\StringResources.en.xaml", UriKind.Relative);
+ }
+ this.Resources.MergedDictionaries.Add(dict);
+ }
}
}
\ No newline at end of file
diff --git a/src/DesktopMagic/MainWindow.xaml b/src/DesktopMagic/MainWindow.xaml
index 0857e39..b9f2109 100644
--- a/src/DesktopMagic/MainWindow.xaml
+++ b/src/DesktopMagic/MainWindow.xaml
@@ -12,11 +12,11 @@
Width="550"
MinHeight="520"
MinWidth="500"
+ WindowState="Minimized"
StateChanged="Window_StateChanged"
Loaded="Window_Loaded">
-
@@ -30,8 +30,8 @@
-
-
+
+
@@ -45,7 +45,7 @@
-
+
@@ -61,7 +61,7 @@
-
+
diff --git a/src/DesktopMagic/MainWindow.xaml.cs b/src/DesktopMagic/MainWindow.xaml.cs
index e0677ca..6c0384d 100644
--- a/src/DesktopMagic/MainWindow.xaml.cs
+++ b/src/DesktopMagic/MainWindow.xaml.cs
@@ -43,11 +43,7 @@ namespace DesktopMagic
#endregion Plugins settings
- #region App Name
-
- public static string AppName { get; } = "Desktop Magic";
-
- #endregion App Name
+ public const string AppName = "Desktop Magic";
public static List Windows { get; protected set; } = new List();
public static List WindowNames { get; protected set; } = new List();
@@ -118,17 +114,6 @@ namespace DesktopMagic
{
string PluginsPath = applicationDataPath + "\\Plugins";
- foreach (string fileName in Directory.GetFiles(PluginsPath, "*.cs"))
- {
- string PluginName = fileName[(fileName.LastIndexOf("\\", StringComparison.InvariantCulture) + 1)..].Replace(fileName[fileName.LastIndexOf(".", StringComparison.InvariantCulture)..], "");
- try
- {
- _ = Directory.CreateDirectory(PluginsPath + "\\" + PluginName);
- File.Move(fileName, $"{PluginsPath}\\{PluginName}\\{PluginName}.cs");
- }
- catch (Exception ex) { Console.WriteLine(ex); }
- }
-
foreach (string fileName in Directory.GetFiles(PluginsPath, "*.dll"))
{
string PluginName = fileName[(fileName.LastIndexOf("\\", StringComparison.InvariantCulture) + 1)..].Replace(fileName[fileName.LastIndexOf(".", StringComparison.InvariantCulture)..], "");
@@ -226,20 +211,27 @@ namespace DesktopMagic
{
Dispatcher.Invoke(() =>
{
- /*
- for (int i = 0; i < OptionsList.Count; i++)
+ if (window is PluginWindow pluginWindow)
{
- if (OptionsList[i].Item1 == checkBox.Content.ToString())
+ Action onPluginLoaded = null;
+ onPluginLoaded = () =>
{
- if (!optionsComboBox.Items.Contains(new Tuple(checkBox.Content.ToString(), i)))
- optionsComboBox.Items.Add(new Tuple(checkBox.Content.ToString(), i));
- }
+ Dispatcher.Invoke(() =>
+ {
+ if (!optionsComboBox.Items.Contains(new Tuple(checkBox.Content.ToString(), 0)))
+ {
+ _ = optionsComboBox.Items.Add(new Tuple(checkBox.Content.ToString(), 0));
+ }
+ optionsComboBox.SelectedIndex = -1;
+ optionsComboBox.SelectedIndex = optionsComboBox.Items.IndexOf(new Tuple(checkBox.Content.ToString(), 0));
+ pluginWindow.PluginLoaded -= onPluginLoaded;
+ });
+ };
+ pluginWindow.PluginLoaded += onPluginLoaded;
}
- */
-
- if (!optionsComboBox.Items.Contains(checkBox.Content.ToString()))
+ else if (window is MusicVisualizerWindow musicVisualizerWindow)
{
- _ = optionsComboBox.Items.Add(new Tuple(checkBox.Content.ToString(), 0));
+ optionsComboBox.SelectedIndex = optionsComboBox.Items.IndexOf(new Tuple(checkBox.Content.ToString(), 0));
}
window.ShowInTaskbar = false;
@@ -282,7 +274,6 @@ namespace DesktopMagic
{
window.Hide();
}
- //taskbarIcon.Visibility = Visibility.Collapsed;
Environment.Exit(0);
}
@@ -303,9 +294,9 @@ namespace DesktopMagic
private void AmplifierLevelSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs e)
{
- amplifierLevelLabel.Content = (int)amplifierLevelSlider.Value + 1;
+ amplifierLevelLabel.Content = (int)amplifierLevelSlider.Value;
AmplifierLevel = (int)amplifierLevelSlider.Value;
- key.SetValue("AmplifierLevel", (int)amplifierLevelSlider.Value);
+ key.SetValue("AmplifierLevel", AmplifierLevel);
SaveLayout();
}
@@ -430,7 +421,8 @@ namespace DesktopMagic
TextBlock label = new()
{
Text = settingElement.Name,
- Padding = new Thickness(0, 0, 3, 0)
+ Padding = new Thickness(0, 0, 3, 0),
+ VerticalAlignment = VerticalAlignment.Center
};
_ = stackPanel.Children.Add(label);
@@ -444,12 +436,24 @@ namespace DesktopMagic
label.FontWeight = FontWeights.Bold;
label.Width = optionsPanel.ActualWidth;
label.TextWrapping = TextWrapping.WrapWithOverflow;
+ eHeading.OnValueChanged += () =>
+ {
+ Dispatcher.Invoke(() =>
+ {
+ label.Text = eHeading.Value;
+ Option_ValueChanged();
+ });
+ };
}
else if (settingElement.Element is DesktopMagicPluginAPI.Inputs.CheckBox eCheckBox)
{
- CheckBox checkBox = new();
- checkBox.IsChecked = eCheckBox.Value;
- checkBox.Width = optionsPanel.ActualWidth - label.ActualWidth;
+ CheckBox checkBox = new()
+ {
+ IsChecked = eCheckBox.Value,
+ Width = optionsPanel.ActualWidth - label.ActualWidth,
+ Style = (Style)FindResource("MaterialDesignDarkCheckBox"),
+ VerticalAlignment = VerticalAlignment.Center
+ };
checkBox.Click += (_s, _e) =>
{
eCheckBox.Value = checkBox.IsChecked.GetValueOrDefault();
@@ -471,7 +475,8 @@ namespace DesktopMagic
{
Text = eTextBox.Value,
TextWrapping = TextWrapping.Wrap,
- Width = optionsPanel.ActualWidth - label.ActualWidth
+ Width = optionsPanel.ActualWidth - label.ActualWidth,
+ VerticalAlignment = VerticalAlignment.Center
};
textBox.TextChanged += (_s, _e) =>
{
@@ -489,12 +494,14 @@ namespace DesktopMagic
}
else if (settingElement.Element is DesktopMagicPluginAPI.Inputs.IntegerUpDown eIntegerUpDown)
{
- Xceed.Wpf.Toolkit.IntegerUpDown integerUpDown = new();
-
- integerUpDown.Value = eIntegerUpDown.Value;
- integerUpDown.Minimum = eIntegerUpDown.Minimum;
- integerUpDown.Maximum = eIntegerUpDown.Maximum;
- integerUpDown.Width = optionsPanel.ActualWidth - label.ActualWidth;
+ Xceed.Wpf.Toolkit.IntegerUpDown integerUpDown = new()
+ {
+ Value = eIntegerUpDown.Value,
+ Minimum = eIntegerUpDown.Minimum,
+ Maximum = eIntegerUpDown.Maximum,
+ Width = optionsPanel.ActualWidth - label.ActualWidth,
+ VerticalAlignment = VerticalAlignment.Center
+ };
integerUpDown.ValueChanged += (_s, _e) =>
{
eIntegerUpDown.Value = integerUpDown.Value.GetValueOrDefault();
@@ -511,14 +518,16 @@ namespace DesktopMagic
}
else if (settingElement.Element is DesktopMagicPluginAPI.Inputs.Slider eSlider)
{
- Slider slider = new();
-
- slider.Value = eSlider.Value;
- slider.Minimum = eSlider.Minimum;
- slider.Maximum = eSlider.Maximum;
- slider.TickFrequency = 1;
- slider.IsSnapToTickEnabled = true;
- slider.Width = optionsPanel.ActualWidth - label.ActualWidth;
+ Slider slider = new()
+ {
+ Value = eSlider.Value,
+ Minimum = eSlider.Minimum,
+ Maximum = eSlider.Maximum,
+ TickFrequency = 1,
+ IsSnapToTickEnabled = true,
+ Width = optionsPanel.ActualWidth - label.ActualWidth,
+ VerticalAlignment = VerticalAlignment.Center
+ };
slider.ValueChanged += (_s, _e) =>
{
eSlider.Value = slider.Value;
@@ -541,8 +550,12 @@ namespace DesktopMagic
private void Option_ValueChanged()
{
string pluginName = ((Tuple)optionsComboBox.SelectedItem).Item1.ToString();
- string jsonSettings = JsonSerializer.Serialize(PluginsSettings[pluginName]);
- File.WriteAllText($"{applicationDataPath}\\Plugins\\{pluginName}\\{pluginName}.save", jsonSettings);
+
+ if (PluginsSettings.ContainsKey(pluginName))
+ {
+ string jsonSettings = JsonSerializer.Serialize(PluginsSettings[pluginName]);
+ File.WriteAllText($"{applicationDataPath}\\Plugins\\{pluginName}\\{pluginName}.save", jsonSettings);
+ }
}
#endregion options
@@ -550,7 +563,7 @@ namespace DesktopMagic
private void TextBlock_Loaded(object sender, RoutedEventArgs e)
{
int index = 0;
- char[] chars = { '1', '0' };
+ char[] chars = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' };
foreach (FontFamily ff in Fonts.SystemFontFamilies)
{
double charWidth = -1;
@@ -712,7 +725,9 @@ namespace DesktopMagic
content += inputDialog.ResponseText + "\n";
File.AppendAllText(applicationDataPath + "\\layouts.save", content);
+ key.SetValue("SelectedLayout", -1);
LoadLayoutNames();
+ layoutsComboBox.SelectedIndex = layoutsComboBox.Items.Count - 1;
}
}
@@ -882,8 +897,8 @@ namespace DesktopMagic
private void SetLanguageDictionary()
{
- ResourceDictionary dict = new();
- string currentCulture = (Thread.CurrentThread.CurrentCulture.ToString());
+ ResourceDictionary dict = new ResourceDictionary();
+ string currentCulture = Thread.CurrentThread.CurrentCulture.ToString();
if (currentCulture.Contains("de"))
{
diff --git a/src/DesktopMagic/MusicVisualizerWindow.xaml.cs b/src/DesktopMagic/MusicVisualizerWindow.xaml.cs
index 386966a..33da58d 100644
--- a/src/DesktopMagic/MusicVisualizerWindow.xaml.cs
+++ b/src/DesktopMagic/MusicVisualizerWindow.xaml.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
using System.Linq;
using System.Runtime.InteropServices;
using System.Timers;
@@ -132,9 +133,13 @@ namespace DesktopMagic
{
int v = i;
if (v < 20)
+ {
v = 20;
+ }
- fft.Add(Math.Abs(e.Result[i].Y * v / (100 - MainWindow.AmplifierLevel)));
+ int multiplier = 100 - MainWindow.AmplifierLevel * 2;
+ multiplier = multiplier == 0 ? 1 : multiplier;
+ fft.Add(Math.Abs(e.Result[i].Y * v / multiplier));
}
if (lastFft.Count != 0)
@@ -246,8 +251,8 @@ namespace DesktopMagic
if (!fftIndexReverse)
{
- points[pointIndex + 1] = new PointF(bm.Width - 15 - 4 * pointIndex, bm.Height / 2 + value);
- points[points.Length / 2 + pointIndex + 1] = new PointF(bm.Width - 15 - 4 * pointIndex, bm.Height / 2 - value);
+ points[pointIndex + 1] = new PointF(bm.Width - 4 * pointIndex, bm.Height / 2 + value);
+ points[points.Length / 2 + pointIndex + 1] = new PointF(bm.Width - 4 * pointIndex, bm.Height / 2 - value);
}
break;
@@ -337,11 +342,11 @@ namespace DesktopMagic
private BitmapSource BitmapToImageSource(Bitmap bitmap)
{
- var bitmapData = bitmap.LockBits(
- new Rectangle(0, 0, bitmap.Width, bitmap.Height),
- System.Drawing.Imaging.ImageLockMode.ReadOnly, bitmap.PixelFormat);
+ BitmapData bitmapData = bitmap.LockBits(
+ new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+ ImageLockMode.ReadOnly, bitmap.PixelFormat);
- var bitmapSource = BitmapSource.Create(
+ BitmapSource bitmapSource = BitmapSource.Create(
bitmapData.Width, bitmapData.Height,
bitmap.HorizontalResolution, bitmap.VerticalResolution,
System.Windows.Media.PixelFormats.Bgra32, null,
diff --git a/src/DesktopMagic/Plugin/PluginWindow.xaml.cs b/src/DesktopMagic/Plugin/PluginWindow.xaml.cs
index 60c916e..78ea236 100644
--- a/src/DesktopMagic/Plugin/PluginWindow.xaml.cs
+++ b/src/DesktopMagic/Plugin/PluginWindow.xaml.cs
@@ -32,7 +32,9 @@ namespace DesktopMagic
private string pluginFolderPath = "";
private bool stop = false;
- public PluginWindow(string _PluginName)
+ public event Action PluginLoaded;
+
+ public PluginWindow(string pluginName)
{
InitializeComponent();
@@ -55,7 +57,7 @@ namespace DesktopMagic
t.Elapsed += Elapsed;
t.Start();
- pluginName = _PluginName;
+ this.pluginName = pluginName;
key = Registry.CurrentUser.CreateSubKey(@"Software\" + MainWindow.AppName);
this.Top = double.Parse(key.GetValue(pluginName + "WindowTop", 100).ToString());
@@ -146,6 +148,7 @@ namespace DesktopMagic
MessageBox.Show("File execution error:\n" + e, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
return;
}
+ PluginLoaded?.Invoke();
}
private void ExecuteSource(string sourceText)
diff --git a/src/DesktopMagic/Resources/StringResources.de.xaml b/src/DesktopMagic/Resources/StringResources.de.xaml
index 30c02df..7666fcd 100644
--- a/src/DesktopMagic/Resources/StringResources.de.xaml
+++ b/src/DesktopMagic/Resources/StringResources.de.xaml
@@ -21,6 +21,8 @@
Signalverstärkung:
Neues Layout
Layout Löschen
+ Ok
+ Abbrechen
Unten
Mitte
diff --git a/src/DesktopMagic/Resources/StringResources.en.xaml b/src/DesktopMagic/Resources/StringResources.en.xaml
index f172f98..d351e65 100644
--- a/src/DesktopMagic/Resources/StringResources.en.xaml
+++ b/src/DesktopMagic/Resources/StringResources.en.xaml
@@ -21,6 +21,8 @@
Signal Amplification:
New Layout
Delete Layout
+ Ok
+ Cancel
Bottom
Middle
diff --git a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.dll b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.dll
index 2785a78..42738d4 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 a6610a2..b82cd41 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/ref/DesktopMagic.dll b/src/DesktopMagic/bin/Debug/net5.0-windows/ref/DesktopMagic.dll
index 0d44437..2275bd9 100644
Binary files a/src/DesktopMagic/bin/Debug/net5.0-windows/ref/DesktopMagic.dll and b/src/DesktopMagic/bin/Debug/net5.0-windows/ref/DesktopMagic.dll differ
diff --git a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.dll b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.dll
index 8015216..816018e 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 b405203..b2b3d9f 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 f37461b..8a6ea8e 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 fb65342..66a4c9f 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 75518a7..3c00d9c 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 8ede292..fd5b878 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 @@ namespace DesktopMagic {
#line default
#line hidden
- System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/app.xaml", System.UriKind.Relative);
+ System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;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 0ca7078..310883d 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 @@ namespace DesktopMagic {
return;
}
_contentLoaded = true;
- System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/calendarwindow.xaml", System.UriKind.Relative);
+ System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;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 9c3f7a3..7c8b9c0 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 @@ namespace DesktopMagic {
return;
}
_contentLoaded = true;
- System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/cpuusagewindow.xaml", System.UriKind.Relative);
+ System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;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 e3b4015..61a4a44 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 @@ namespace DesktopMagic {
return;
}
_contentLoaded = true;
- System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/datewindow.xaml", System.UriKind.Relative);
+ System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;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 2785a78..42738d4 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 a6610a2..b82cd41 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/DesktopMagic_MarkupCompile.cache b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic_MarkupCompile.cache
index 02f650f..9d7c4e9 100644
--- a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic_MarkupCompile.cache
+++ b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic_MarkupCompile.cache
@@ -16,5 +16,5 @@ C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\App.xaml
2261183705467
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/Debug/net5.0-windows/DesktopMagic_MarkupCompile.i.cache b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic_MarkupCompile.i.cache
index d890e94..a92993a 100644
--- a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic_MarkupCompile.i.cache
+++ b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic_MarkupCompile.i.cache
@@ -16,5 +16,5 @@ C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\App.xaml
2261183705467
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/Debug/net5.0-windows/InputDialog.baml b/src/DesktopMagic/obj/Debug/net5.0-windows/InputDialog.baml
deleted file mode 100644
index 6894b89..0000000
Binary files a/src/DesktopMagic/obj/Debug/net5.0-windows/InputDialog.baml and /dev/null differ
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.baml b/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.baml
index c232335..71b1354 100644
Binary files a/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.baml and b/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.baml differ
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.g.cs b/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.g.cs
index c27a4fa..86ab47e 100644
--- a/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.g.cs
+++ b/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "56A04FC33DFC60D7E526BF21765D414E7492102A"
+#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "F5EB8084736888948EF9EB2517B77A7CB9FE6BDF"
//------------------------------------------------------------------------------
//
// Dieser Code wurde von einem Tool generiert.
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 c27a4fa..649bf7d 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 @@ namespace DesktopMagic {
return;
}
_contentLoaded = true;
- System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/mainwindow.xaml", System.UriKind.Relative);
+ System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;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 e1680aa..0bd4e8e 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 @@ namespace DesktopMagic {
return;
}
_contentLoaded = true;
- System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/musicvisualizerwindow.xaml", System.UriKind.Relative);
+ System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;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 6abe00b..28ffa14 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 @@ namespace DesktopMagic {
return;
}
_contentLoaded = true;
- System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/timewindow.xaml", System.UriKind.Relative);
+ System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;component/timewindow.xaml", System.UriKind.Relative);
#line 1 "..\..\..\TimeWindow.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/ref/DesktopMagic.dll b/src/DesktopMagic/obj/Debug/net5.0-windows/ref/DesktopMagic.dll
index 0d44437..2275bd9 100644
Binary files a/src/DesktopMagic/obj/Debug/net5.0-windows/ref/DesktopMagic.dll and b/src/DesktopMagic/obj/Debug/net5.0-windows/ref/DesktopMagic.dll differ
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/App.g.i.cs b/src/DesktopMagic/obj/Release/net5.0-windows/App.g.i.cs
index 8ede292..fd5b878 100644
--- a/src/DesktopMagic/obj/Release/net5.0-windows/App.g.i.cs
+++ b/src/DesktopMagic/obj/Release/net5.0-windows/App.g.i.cs
@@ -62,7 +62,7 @@ namespace DesktopMagic {
#line default
#line hidden
- System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/app.xaml", System.UriKind.Relative);
+ System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;component/app.xaml", System.UriKind.Relative);
#line 1 "..\..\..\App.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/CalendarWindow.g.i.cs b/src/DesktopMagic/obj/Release/net5.0-windows/CalendarWindow.g.i.cs
index 0ca7078..310883d 100644
--- a/src/DesktopMagic/obj/Release/net5.0-windows/CalendarWindow.g.i.cs
+++ b/src/DesktopMagic/obj/Release/net5.0-windows/CalendarWindow.g.i.cs
@@ -85,7 +85,7 @@ namespace DesktopMagic {
return;
}
_contentLoaded = true;
- System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/calendarwindow.xaml", System.UriKind.Relative);
+ System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;component/calendarwindow.xaml", System.UriKind.Relative);
#line 1 "..\..\..\CalendarWindow.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/CpuUsageWindow.g.i.cs b/src/DesktopMagic/obj/Release/net5.0-windows/CpuUsageWindow.g.i.cs
index 9c3f7a3..7c8b9c0 100644
--- a/src/DesktopMagic/obj/Release/net5.0-windows/CpuUsageWindow.g.i.cs
+++ b/src/DesktopMagic/obj/Release/net5.0-windows/CpuUsageWindow.g.i.cs
@@ -85,7 +85,7 @@ namespace DesktopMagic {
return;
}
_contentLoaded = true;
- System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/cpuusagewindow.xaml", System.UriKind.Relative);
+ System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;component/cpuusagewindow.xaml", System.UriKind.Relative);
#line 1 "..\..\..\CpuUsageWindow.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/DateWindow.g.i.cs b/src/DesktopMagic/obj/Release/net5.0-windows/DateWindow.g.i.cs
index e3b4015..61a4a44 100644
--- a/src/DesktopMagic/obj/Release/net5.0-windows/DateWindow.g.i.cs
+++ b/src/DesktopMagic/obj/Release/net5.0-windows/DateWindow.g.i.cs
@@ -85,7 +85,7 @@ namespace DesktopMagic {
return;
}
_contentLoaded = true;
- System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/datewindow.xaml", System.UriKind.Relative);
+ System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;component/datewindow.xaml", System.UriKind.Relative);
#line 1 "..\..\..\DateWindow.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.dll b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.dll
index 8015216..816018e 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.g.resources b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.g.resources
index ee56418..37b2f8a 100644
Binary files a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.g.resources and b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.g.resources differ
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.pdb b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.pdb
index b405203..b2b3d9f 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 95c14fb..7a37683 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-1364174901
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/InputDialog.baml b/src/DesktopMagic/obj/Release/net5.0-windows/InputDialog.baml
index 76eee65..2d5105d 100644
Binary files a/src/DesktopMagic/obj/Release/net5.0-windows/InputDialog.baml and b/src/DesktopMagic/obj/Release/net5.0-windows/InputDialog.baml differ
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/InputDialog.g.cs b/src/DesktopMagic/obj/Release/net5.0-windows/InputDialog.g.cs
index 5fc60ec..59e385b 100644
--- a/src/DesktopMagic/obj/Release/net5.0-windows/InputDialog.g.cs
+++ b/src/DesktopMagic/obj/Release/net5.0-windows/InputDialog.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\InputDialog.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "69003CAB3985612DB9AB987164994394DEC44BA3"
+#pragma checksum "..\..\..\InputDialog.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E92EE63B86C66ACB37E5EDABBB5EC243DBD1F651"
//------------------------------------------------------------------------------
//
// Dieser Code wurde von einem Tool generiert.
@@ -43,37 +43,37 @@ namespace DesktopMagic {
public partial class InputDialog : System.Windows.Window, System.Windows.Markup.IComponentConnector {
- #line 11 "..\..\..\InputDialog.xaml"
- [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
- internal System.Windows.Controls.Button okButton;
-
- #line default
- #line hidden
-
-
#line 12 "..\..\..\InputDialog.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
- internal System.Windows.Controls.Button cancelButton;
-
- #line default
- #line hidden
-
-
- #line 13 "..\..\..\InputDialog.xaml"
- [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Label label;
#line default
#line hidden
- #line 14 "..\..\..\InputDialog.xaml"
+ #line 13 "..\..\..\InputDialog.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox textBox;
#line default
#line hidden
+
+ #line 15 "..\..\..\InputDialog.xaml"
+ [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+ internal System.Windows.Controls.Button okButton;
+
+ #line default
+ #line hidden
+
+
+ #line 16 "..\..\..\InputDialog.xaml"
+ [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+ internal System.Windows.Controls.Button cancelButton;
+
+ #line default
+ #line hidden
+
private bool _contentLoaded;
///
@@ -105,29 +105,29 @@ namespace DesktopMagic {
switch (connectionId)
{
case 1:
- this.okButton = ((System.Windows.Controls.Button)(target));
-
- #line 11 "..\..\..\InputDialog.xaml"
- this.okButton.Click += new System.Windows.RoutedEventHandler(this.okButton_Click);
-
- #line default
- #line hidden
- return;
- case 2:
- this.cancelButton = ((System.Windows.Controls.Button)(target));
-
- #line 12 "..\..\..\InputDialog.xaml"
- this.cancelButton.Click += new System.Windows.RoutedEventHandler(this.cancelButton_Click);
-
- #line default
- #line hidden
- return;
- case 3:
this.label = ((System.Windows.Controls.Label)(target));
return;
- case 4:
+ case 2:
this.textBox = ((System.Windows.Controls.TextBox)(target));
return;
+ case 3:
+ this.okButton = ((System.Windows.Controls.Button)(target));
+
+ #line 15 "..\..\..\InputDialog.xaml"
+ this.okButton.Click += new System.Windows.RoutedEventHandler(this.OkButton_Click);
+
+ #line default
+ #line hidden
+ return;
+ case 4:
+ this.cancelButton = ((System.Windows.Controls.Button)(target));
+
+ #line 16 "..\..\..\InputDialog.xaml"
+ this.cancelButton.Click += new System.Windows.RoutedEventHandler(this.CancelButton_Click);
+
+ #line default
+ #line hidden
+ return;
}
this._contentLoaded = true;
}
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/InputDialog.g.i.cs b/src/DesktopMagic/obj/Release/net5.0-windows/InputDialog.g.i.cs
index 5fc60ec..59e385b 100644
--- a/src/DesktopMagic/obj/Release/net5.0-windows/InputDialog.g.i.cs
+++ b/src/DesktopMagic/obj/Release/net5.0-windows/InputDialog.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\InputDialog.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "69003CAB3985612DB9AB987164994394DEC44BA3"
+#pragma checksum "..\..\..\InputDialog.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E92EE63B86C66ACB37E5EDABBB5EC243DBD1F651"
//------------------------------------------------------------------------------
//
// Dieser Code wurde von einem Tool generiert.
@@ -43,37 +43,37 @@ namespace DesktopMagic {
public partial class InputDialog : System.Windows.Window, System.Windows.Markup.IComponentConnector {
- #line 11 "..\..\..\InputDialog.xaml"
- [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
- internal System.Windows.Controls.Button okButton;
-
- #line default
- #line hidden
-
-
#line 12 "..\..\..\InputDialog.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
- internal System.Windows.Controls.Button cancelButton;
-
- #line default
- #line hidden
-
-
- #line 13 "..\..\..\InputDialog.xaml"
- [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Label label;
#line default
#line hidden
- #line 14 "..\..\..\InputDialog.xaml"
+ #line 13 "..\..\..\InputDialog.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox textBox;
#line default
#line hidden
+
+ #line 15 "..\..\..\InputDialog.xaml"
+ [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+ internal System.Windows.Controls.Button okButton;
+
+ #line default
+ #line hidden
+
+
+ #line 16 "..\..\..\InputDialog.xaml"
+ [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+ internal System.Windows.Controls.Button cancelButton;
+
+ #line default
+ #line hidden
+
private bool _contentLoaded;
///
@@ -105,29 +105,29 @@ namespace DesktopMagic {
switch (connectionId)
{
case 1:
- this.okButton = ((System.Windows.Controls.Button)(target));
-
- #line 11 "..\..\..\InputDialog.xaml"
- this.okButton.Click += new System.Windows.RoutedEventHandler(this.okButton_Click);
-
- #line default
- #line hidden
- return;
- case 2:
- this.cancelButton = ((System.Windows.Controls.Button)(target));
-
- #line 12 "..\..\..\InputDialog.xaml"
- this.cancelButton.Click += new System.Windows.RoutedEventHandler(this.cancelButton_Click);
-
- #line default
- #line hidden
- return;
- case 3:
this.label = ((System.Windows.Controls.Label)(target));
return;
- case 4:
+ case 2:
this.textBox = ((System.Windows.Controls.TextBox)(target));
return;
+ case 3:
+ this.okButton = ((System.Windows.Controls.Button)(target));
+
+ #line 15 "..\..\..\InputDialog.xaml"
+ this.okButton.Click += new System.Windows.RoutedEventHandler(this.OkButton_Click);
+
+ #line default
+ #line hidden
+ return;
+ case 4:
+ this.cancelButton = ((System.Windows.Controls.Button)(target));
+
+ #line 16 "..\..\..\InputDialog.xaml"
+ this.cancelButton.Click += new System.Windows.RoutedEventHandler(this.CancelButton_Click);
+
+ #line default
+ #line hidden
+ return;
}
this._contentLoaded = true;
}
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/MainWindow.baml b/src/DesktopMagic/obj/Release/net5.0-windows/MainWindow.baml
index 51b245f..e247621 100644
Binary files a/src/DesktopMagic/obj/Release/net5.0-windows/MainWindow.baml and b/src/DesktopMagic/obj/Release/net5.0-windows/MainWindow.baml differ
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/MainWindow.g.cs b/src/DesktopMagic/obj/Release/net5.0-windows/MainWindow.g.cs
index c27a4fa..b080a69 100644
--- a/src/DesktopMagic/obj/Release/net5.0-windows/MainWindow.g.cs
+++ b/src/DesktopMagic/obj/Release/net5.0-windows/MainWindow.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "56A04FC33DFC60D7E526BF21765D414E7492102A"
+#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E2A0CEAB1CE4E799C8F11878BEEF4140351A3388"
//------------------------------------------------------------------------------
//
// Dieser Code wurde von einem Tool generiert.
@@ -45,7 +45,7 @@ namespace DesktopMagic {
public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
- #line 18 "..\..\..\MainWindow.xaml"
+ #line 19 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Grid grid;
@@ -320,13 +320,13 @@ namespace DesktopMagic {
#line default
#line hidden
- #line 15 "..\..\..\MainWindow.xaml"
+ #line 16 "..\..\..\MainWindow.xaml"
((DesktopMagic.MainWindow)(target)).StateChanged += new System.EventHandler(this.Window_StateChanged);
#line default
#line hidden
- #line 16 "..\..\..\MainWindow.xaml"
+ #line 17 "..\..\..\MainWindow.xaml"
((DesktopMagic.MainWindow)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Window_Loaded);
#line default
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/MainWindow.g.i.cs b/src/DesktopMagic/obj/Release/net5.0-windows/MainWindow.g.i.cs
index c27a4fa..b080a69 100644
--- a/src/DesktopMagic/obj/Release/net5.0-windows/MainWindow.g.i.cs
+++ b/src/DesktopMagic/obj/Release/net5.0-windows/MainWindow.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "56A04FC33DFC60D7E526BF21765D414E7492102A"
+#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E2A0CEAB1CE4E799C8F11878BEEF4140351A3388"
//------------------------------------------------------------------------------
//
// Dieser Code wurde von einem Tool generiert.
@@ -45,7 +45,7 @@ namespace DesktopMagic {
public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
- #line 18 "..\..\..\MainWindow.xaml"
+ #line 19 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Grid grid;
@@ -320,13 +320,13 @@ namespace DesktopMagic {
#line default
#line hidden
- #line 15 "..\..\..\MainWindow.xaml"
+ #line 16 "..\..\..\MainWindow.xaml"
((DesktopMagic.MainWindow)(target)).StateChanged += new System.EventHandler(this.Window_StateChanged);
#line default
#line hidden
- #line 16 "..\..\..\MainWindow.xaml"
+ #line 17 "..\..\..\MainWindow.xaml"
((DesktopMagic.MainWindow)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Window_Loaded);
#line default
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/MusicVisualizerWindow.g.i.cs b/src/DesktopMagic/obj/Release/net5.0-windows/MusicVisualizerWindow.g.i.cs
index e1680aa..0bd4e8e 100644
--- a/src/DesktopMagic/obj/Release/net5.0-windows/MusicVisualizerWindow.g.i.cs
+++ b/src/DesktopMagic/obj/Release/net5.0-windows/MusicVisualizerWindow.g.i.cs
@@ -93,7 +93,7 @@ namespace DesktopMagic {
return;
}
_contentLoaded = true;
- System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/musicvisualizerwindow.xaml", System.UriKind.Relative);
+ System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;component/musicvisualizerwindow.xaml", System.UriKind.Relative);
#line 1 "..\..\..\MusicVisualizerWindow.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/Resources/StringResources.de.baml b/src/DesktopMagic/obj/Release/net5.0-windows/Resources/StringResources.de.baml
index 61f3a4a..9e45cd5 100644
Binary files a/src/DesktopMagic/obj/Release/net5.0-windows/Resources/StringResources.de.baml and b/src/DesktopMagic/obj/Release/net5.0-windows/Resources/StringResources.de.baml differ
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/Resources/StringResources.en.baml b/src/DesktopMagic/obj/Release/net5.0-windows/Resources/StringResources.en.baml
index f5fb43e..815749a 100644
Binary files a/src/DesktopMagic/obj/Release/net5.0-windows/Resources/StringResources.en.baml and b/src/DesktopMagic/obj/Release/net5.0-windows/Resources/StringResources.en.baml differ
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/TimeWindow.g.i.cs b/src/DesktopMagic/obj/Release/net5.0-windows/TimeWindow.g.i.cs
index 6abe00b..28ffa14 100644
--- a/src/DesktopMagic/obj/Release/net5.0-windows/TimeWindow.g.i.cs
+++ b/src/DesktopMagic/obj/Release/net5.0-windows/TimeWindow.g.i.cs
@@ -85,7 +85,7 @@ namespace DesktopMagic {
return;
}
_contentLoaded = true;
- System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/timewindow.xaml", System.UriKind.Relative);
+ System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;component/timewindow.xaml", System.UriKind.Relative);
#line 1 "..\..\..\TimeWindow.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
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 75518a7..3c00d9c 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/DesktopMagicPlugin.Test/PluginScript.cs b/src/DesktopMagicPlugin.Test/PluginScript.cs
index 4659f0a..360aa97 100644
--- a/src/DesktopMagicPlugin.Test/PluginScript.cs
+++ b/src/DesktopMagicPlugin.Test/PluginScript.cs
@@ -9,7 +9,7 @@ namespace DesktopMagicPlugin.Test
public class PluginScript : Plugin
{
[Element("Heading")]
- private Heading heading = new Heading("test");
+ private Heading heading = new Heading("");
[Element("Slider:")]
private Slider slider = new Slider(1, 23, 4);
@@ -35,11 +35,16 @@ namespace DesktopMagicPlugin.Test
public override Bitmap Main()
{
+ string str = $"{textBox.Value}: {slider.Value}";
+
Bitmap bmp = new Bitmap(100, 100);
using Graphics g = Graphics.FromImage(bmp);
g.Clear(Application.Color);
- g.DrawString(slider.Value.ToString(), new Font("arial", 10), Brushes.Black, new PointF(0, 0));
+ g.DrawString(str, new Font("arial", 10), Brushes.Black, new PointF(0, 0));
+
+ heading.Value = str;
slider.Value++;
+
return bmp;
}
}
diff --git a/src/DesktopMagicPluginAPI/Inputs/CheckBox.cs b/src/DesktopMagicPluginAPI/Inputs/CheckBox.cs
index 5be3ee5..2eec461 100644
--- a/src/DesktopMagicPluginAPI/Inputs/CheckBox.cs
+++ b/src/DesktopMagicPluginAPI/Inputs/CheckBox.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DesktopMagicPluginAPI.Inputs
+namespace DesktopMagicPluginAPI.Inputs
{
public class CheckBox : Element
{
diff --git a/src/DesktopMagicPluginAPI/Inputs/Element.cs b/src/DesktopMagicPluginAPI/Inputs/Element.cs
index 0da63cb..7854b74 100644
--- a/src/DesktopMagicPluginAPI/Inputs/Element.cs
+++ b/src/DesktopMagicPluginAPI/Inputs/Element.cs
@@ -1,8 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace DesktopMagicPluginAPI.Inputs
{
diff --git a/src/DesktopMagicPluginAPI/Inputs/ElementAttribute.cs b/src/DesktopMagicPluginAPI/Inputs/ElementAttribute.cs
index 21322bd..075e38e 100644
--- a/src/DesktopMagicPluginAPI/Inputs/ElementAttribute.cs
+++ b/src/DesktopMagicPluginAPI/Inputs/ElementAttribute.cs
@@ -1,8 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace DesktopMagicPluginAPI.Inputs
{
diff --git a/src/DesktopMagicPluginAPI/Inputs/Heading.cs b/src/DesktopMagicPluginAPI/Inputs/Heading.cs
index 99702cc..fdb5a3d 100644
--- a/src/DesktopMagicPluginAPI/Inputs/Heading.cs
+++ b/src/DesktopMagicPluginAPI/Inputs/Heading.cs
@@ -1,14 +1,21 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DesktopMagicPluginAPI.Inputs
+namespace DesktopMagicPluginAPI.Inputs
{
public class Heading : Element
{
- public string Value { get; }
+ private string _value;
+
+ public string Value
+ {
+ get => _value;
+ set
+ {
+ if (_value != value)
+ {
+ _value = value;
+ ValueChanged();
+ }
+ }
+ }
public Heading(string value)
{
diff --git a/src/DesktopMagicPluginAPI/Inputs/IntegerUpDown.cs b/src/DesktopMagicPluginAPI/Inputs/IntegerUpDown.cs
index 236e2b6..cc40e81 100644
--- a/src/DesktopMagicPluginAPI/Inputs/IntegerUpDown.cs
+++ b/src/DesktopMagicPluginAPI/Inputs/IntegerUpDown.cs
@@ -1,8 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace DesktopMagicPluginAPI.Inputs
{
diff --git a/src/DesktopMagicPluginAPI/Inputs/Slider.cs b/src/DesktopMagicPluginAPI/Inputs/Slider.cs
index e8307be..89dabf6 100644
--- a/src/DesktopMagicPluginAPI/Inputs/Slider.cs
+++ b/src/DesktopMagicPluginAPI/Inputs/Slider.cs
@@ -1,8 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace DesktopMagicPluginAPI.Inputs
{
diff --git a/src/DesktopMagicPluginAPI/Inputs/TextBox.cs b/src/DesktopMagicPluginAPI/Inputs/TextBox.cs
index bcc4ba2..2827876 100644
--- a/src/DesktopMagicPluginAPI/Inputs/TextBox.cs
+++ b/src/DesktopMagicPluginAPI/Inputs/TextBox.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DesktopMagicPluginAPI.Inputs
+namespace DesktopMagicPluginAPI.Inputs
{
public class TextBox : Element
{
diff --git a/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.dll b/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.dll
index f37461b..8a6ea8e 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 fb65342..66a4c9f 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 1b4a935..319d88e 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/Release/net5.0/DesktopMagicPluginAPI.dll b/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.dll
index f37461b..8a6ea8e 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 fb65342..66a4c9f 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 1b4a935..319d88e 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