From 0d297c4ef80aa0ca7de756f1979752ff9c312c39 Mon Sep 17 00:00:00 2001 From: MaikEight Date: Sat, 19 Aug 2023 00:05:20 +0200 Subject: [PATCH 01/10] =?UTF-8?q?=F0=9F=90=9BFixed=20a=20crashing=20bug=20?= =?UTF-8?q?when=20the=20chartCanvas=20is=20null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ExaltAccountManager/UI/UIDailyLogins.cs | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/ExaltAccountManager/UI/UIDailyLogins.cs b/ExaltAccountManager/UI/UIDailyLogins.cs index 372a2266..81ec054c 100644 --- a/ExaltAccountManager/UI/UIDailyLogins.cs +++ b/ExaltAccountManager/UI/UIDailyLogins.cs @@ -19,7 +19,7 @@ public sealed partial class UIDailyLogins : UserControl private DailyLogins dailyLogins = new DailyLogins(); private Bunifu.Charts.WinForms.BunifuChartCanvas chartCanvas = null; - + public UIDailyLogins(FrmMain _frm) { InitializeComponent(); @@ -36,7 +36,7 @@ public UIDailyLogins(FrmMain _frm) frm = _frm; frm.ThemeChanged += ApplyTheme; - this.Disposed += (object sender, EventArgs e) => frm.ThemeChanged -= ApplyTheme; + this.Disposed += (object sender, EventArgs e) => frm.ThemeChanged -= ApplyTheme; if (File.Exists(frm.dailyLoginsPath)) { @@ -196,8 +196,10 @@ private void UIDailyLogins_Load(object sender, EventArgs e) private void LoadUI() { - chartCanvas.Labels = GetDaysLabels(); - + if (chartCanvas != null) + { + chartCanvas.Labels = GetDaysLabels(); + } List success = new List() { 0, 0, 0, 0, 0, 0, 0 }; List failed = new List() { 0, 0, 0, 0, 0, 0, 0 }; @@ -232,11 +234,12 @@ private void LoadUI() success.Reverse(); failed.Reverse(); - - barChartSuccess.Data = success; - barChartFailed.Data = failed; - - timerAnimate.Start(); + if (chartCanvas != null && barChartSuccess != null && barChartFailed != null) + { + barChartSuccess.Data = success; + barChartFailed.Data = failed; + timerAnimate.Start(); + } } private void timerAnimate_Tick(object sender, EventArgs e) From 1b31190d0ceb68981c34ec8b582177d7f0f69183 Mon Sep 17 00:00:00 2001 From: MaikEight Date: Sat, 19 Aug 2023 00:05:56 +0200 Subject: [PATCH 02/10] =?UTF-8?q?=F0=9F=99=88=20Ignored=20some=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 + ... Login Service.csproj.FileListAbsolute.txt | 184 ------------------ .../obj/Debug/EAM Daily Login Service.pdb | Bin 73216 -> 0 bytes 3 files changed, 2 insertions(+), 184 deletions(-) delete mode 100644 EAM Daily Login Service/obj/Debug/EAM Daily Login Service.csproj.FileListAbsolute.txt delete mode 100644 EAM Daily Login Service/obj/Debug/EAM Daily Login Service.pdb diff --git a/.gitignore b/.gitignore index e26dc95a..3c45dd55 100644 --- a/.gitignore +++ b/.gitignore @@ -792,3 +792,5 @@ FodyWeavers.xsd /.vs/EAM/DesignTimeBuild/.dtbcache.v2 /EAM Daily Login Service/obj/Debug/EAM Daily Login Service.exe /EAM Daily Login Service/obj/Release/EAM Daily Login Service.exe +/EAM Daily Login Service/obj/Debug/EAM Daily Login Service.pdb +/EAM Daily Login Service/obj/Debug/EAM Daily Login Service.csproj.FileListAbsolute.txt diff --git a/EAM Daily Login Service/obj/Debug/EAM Daily Login Service.csproj.FileListAbsolute.txt b/EAM Daily Login Service/obj/Debug/EAM Daily Login Service.csproj.FileListAbsolute.txt deleted file mode 100644 index 70af734f..00000000 --- a/EAM Daily Login Service/obj/Debug/EAM Daily Login Service.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,184 +0,0 @@ -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\EAM Daily Login Service.exe.config -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\EAM Daily Login Service.exe -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\EAM Daily Login Service.pdb -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\ExaltAccountManager.exe -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\MK_EAM_Lib.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Microsoft.Win32.TaskScheduler.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\ExaltAccountManager.pdb -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\ExaltAccountManager.exe.config -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\MK_EAM_Lib.pdb -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Microsoft.Win32.TaskScheduler.xml -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\de\Microsoft.Win32.TaskScheduler.resources.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\es\Microsoft.Win32.TaskScheduler.resources.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\fr\Microsoft.Win32.TaskScheduler.resources.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\it\Microsoft.Win32.TaskScheduler.resources.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\pl\Microsoft.Win32.TaskScheduler.resources.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\ru\Microsoft.Win32.TaskScheduler.resources.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\zh-CN\Microsoft.Win32.TaskScheduler.resources.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Debug\EAM Daily Login Service.csproj.CoreCompileInputs.cache -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Debug\EAM Daily Login Service.csproj.CopyComplete -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Debug\EAM Daily Login Service.exe -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Debug\EAM Daily Login Service.pdb -C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\EAM Daily Login Service.exe.config -C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\EAM Daily Login Service.exe -C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\EAM Daily Login Service.pdb -C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\ExaltAccountManager.exe -C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\MK_EAM_Lib.dll -C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Microsoft.Win32.TaskScheduler.dll -C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\ExaltAccountManager.pdb -C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\ExaltAccountManager.exe.config -C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\MK_EAM_Lib.pdb -C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Microsoft.Win32.TaskScheduler.xml -C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\de\Microsoft.Win32.TaskScheduler.resources.dll -C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\es\Microsoft.Win32.TaskScheduler.resources.dll -C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\fr\Microsoft.Win32.TaskScheduler.resources.dll -C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\it\Microsoft.Win32.TaskScheduler.resources.dll -C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\pl\Microsoft.Win32.TaskScheduler.resources.dll -C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\ru\Microsoft.Win32.TaskScheduler.resources.dll -C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\zh-CN\Microsoft.Win32.TaskScheduler.resources.dll -C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Debug\EAM Daily Login Service.csprojAssemblyReference.cache -C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Debug\EAM Daily Login Service.csproj.CoreCompileInputs.cache -C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Debug\EAM Daily Login Service.csproj.CopyComplete -C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Debug\EAM Daily Login Service.exe -C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Debug\EAM Daily Login Service.pdb -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.Licensing.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Debug\EAM Daily Login Service.csproj.AssemblyReference.cache -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\CsvHelper.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Microsoft.Bcl.AsyncInterfaces.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\System.Threading.Tasks.Extensions.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Microsoft.Bcl.HashCode.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\System.Memory.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\System.Numerics.Vectors.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\System.Buffers.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\CsvHelper.xml -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Microsoft.Bcl.AsyncInterfaces.xml -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\System.Threading.Tasks.Extensions.xml -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Microsoft.Bcl.HashCode.xml -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\System.Memory.xml -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\System.Numerics.Vectors.xml -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\System.Buffers.xml -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Newtonsoft.Json.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Newtonsoft.Json.xml -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.1.5.3.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.1.5.3.xml -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\MK_EAM_Lib.dll.config -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.Charts.WinForms.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.Charts.WinForms.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\EAM Daily Login Service.exe.config -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\EAM Daily Login Service.exe -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\EAM Daily Login Service.pdb -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\ExaltAccountManager.exe -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\MK_EAM_Lib.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Newtonsoft.Json.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuPictureBox.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuCheckBox.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuToolTip.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuScrollBar.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuSeparator.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuSlider.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuTextBox.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.1.5.3.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuPanel.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuDropdown.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuToggleSwitch.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\CsvHelper.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuLoader.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuSnackbar.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuFormDock.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuButton.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuTransition.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuPages.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuCircleProgress.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Microsoft.Win32.TaskScheduler.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuShadowPanel.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.Charts.WinForms.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuDataGridView.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuRadioButton.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuLabel.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.Licensing.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Microsoft.Bcl.AsyncInterfaces.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\System.Threading.Tasks.Extensions.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Microsoft.Bcl.HashCode.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\System.Memory.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\System.Numerics.Vectors.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\System.Buffers.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\ExaltAccountManager.pdb -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\ExaltAccountManager.exe.config -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\MK_EAM_Lib.pdb -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\MK_EAM_Lib.dll.config -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Newtonsoft.Json.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuPictureBox.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuCheckBox.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuToolTip.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuScrollBar.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuSeparator.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuSlider.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuTextBox.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.1.5.3.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuPanel.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuDropdown.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuToggleSwitch.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\CsvHelper.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuLoader.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuSnackbar.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuFormDock.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuButton.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuTransition.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuPages.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuCircleProgress.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Microsoft.Win32.TaskScheduler.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuShadowPanel.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.Charts.WinForms.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuDataGridView.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuRadioButton.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuLabel.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Microsoft.Bcl.AsyncInterfaces.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\System.Threading.Tasks.Extensions.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\Microsoft.Bcl.HashCode.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\System.Memory.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\System.Numerics.Vectors.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\System.Buffers.xml -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\de\Microsoft.Win32.TaskScheduler.resources.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\es\Microsoft.Win32.TaskScheduler.resources.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\fr\Microsoft.Win32.TaskScheduler.resources.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\it\Microsoft.Win32.TaskScheduler.resources.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\pl\Microsoft.Win32.TaskScheduler.resources.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\ru\Microsoft.Win32.TaskScheduler.resources.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\zh-CN\Microsoft.Win32.TaskScheduler.resources.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\obj\Debug\EAM Daily Login Service.csproj.AssemblyReference.cache -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\obj\Debug\EAM Daily Login Service.csproj.SuggestedBindingRedirects.cache -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\obj\Debug\EAM Daily Login Service.csproj.CoreCompileInputs.cache -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\obj\Debug\EAM Daily Login Service.csproj.CopyComplete -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\obj\Debug\EAM Daily Login Service.exe -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\obj\Debug\EAM Daily Login Service.pdb -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\zh-Hant\Microsoft.Win32.TaskScheduler.resources.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\MK_EAM_Discord_Lib.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\DiscordRPC.dll -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\MK_EAM_Discord_Lib.pdb -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\DiscordRPC.pdb -C:\Users\Maik8\source\repos\ExaltAccountManager - Kopie\EAM Daily Login Service\bin\Debug\DiscordRPC.xml -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\MK_EAM_Discord_Lib.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\DiscordRPC.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\MK_EAM_Discord_Lib.pdb -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\DiscordRPC.pdb -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\DiscordRPC.xml -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\zh-Hant\Microsoft.Win32.TaskScheduler.resources.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Debug\EAM Daily Login Service.csproj.SuggestedBindingRedirects.cache -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\MK_EAM_Updater_Lib.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\MK_EAM_Analytics.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\MK_EAM_Analytics.pdb -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\MK_EAM_General_Services_Lib.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\MK_EAM_General_Services_Lib.pdb -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.xml -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.Licensing.pdb -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\MK_EAM_Captcha_Solver_UI_Lib.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\RestSharp.dll -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\MK_EAM_Updater_Lib.pdb -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\MK_EAM_Captcha_Solver_UI_Lib.pdb -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\MK_EAM_Captcha_Solver_UI_Lib.dll.config -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\RestSharp.xml diff --git a/EAM Daily Login Service/obj/Debug/EAM Daily Login Service.pdb b/EAM Daily Login Service/obj/Debug/EAM Daily Login Service.pdb deleted file mode 100644 index 36e6e408c769c7358a42dc4ace647e4eb7b43840..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 73216 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 From e1eba1be57ccc0c015a7093daa729678e5f2f09b Mon Sep 17 00:00:00 2001 From: MaikEight Date: Thu, 12 Oct 2023 20:12:49 +0200 Subject: [PATCH 03/10] =?UTF-8?q?=F0=9F=90=9B=20Fixed=20a=20potential=20cr?= =?UTF-8?q?ashing=20bug=20during=20saving=20of=20options?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ExaltAccountManager/FrmMain.cs | 36 +++++++++++++++++--- ExaltAccountManager/UI/UIOptions.cs | 52 +++++++++++++++++++++-------- 2 files changed, 70 insertions(+), 18 deletions(-) diff --git a/ExaltAccountManager/FrmMain.cs b/ExaltAccountManager/FrmMain.cs index 181b8677..bc91731e 100644 --- a/ExaltAccountManager/FrmMain.cs +++ b/ExaltAccountManager/FrmMain.cs @@ -439,10 +439,32 @@ public FrmMain(string[] args) { File.WriteAllBytes(optionsPath, ObjectToByteArray(OptionsData)); } - catch { } + catch + { + LogEvent(new MK_EAM_Lib.LogData( + "EAM", + MK_EAM_Lib.LogEventType.EAMError, + "Failed to save options.")); + } } } - catch { } + catch + { + LogEvent(new MK_EAM_Lib.LogData( + "EAM", + MK_EAM_Lib.LogEventType.EAMError, + "Failed to load options, using a temporary one.")); + LogButtonBlink(); + + OptionsData = new OptionsData() + { + exePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), @"RealmOfTheMadGod\Production\RotMG Exalt.exe"), + closeAfterConnection = false, + snackbarPosition = 8, + discordOptions = new DiscordOptions() { ShowAccountNames = true, ShowMenus = true, ShowState = true }, + analyticsOptions = new AnalyticsOptions() { Anonymization = false, OptOut = false }, + }; + } } else { @@ -458,7 +480,14 @@ public FrmMain(string[] args) }; File.WriteAllBytes(optionsPath, ObjectToByteArray(OptionsData)); } - catch { } + catch + { + LogEvent(new MK_EAM_Lib.LogData( + "EAM", + MK_EAM_Lib.LogEventType.EAMError, + "Failed to initialize options.")); + LogButtonBlink(); + } } if (OptionsData.discordOptions == null) @@ -1276,7 +1305,6 @@ public void UpdateAddNewUserGroup(Color clr, bool none = false) public void LogEvent(LogData data) { - if (File.Exists(pathLogs)) { try diff --git a/ExaltAccountManager/UI/UIOptions.cs b/ExaltAccountManager/UI/UIOptions.cs index 451bbd15..5569f5c4 100644 --- a/ExaltAccountManager/UI/UIOptions.cs +++ b/ExaltAccountManager/UI/UIOptions.cs @@ -1,5 +1,6 @@ using System; using System.Drawing; +using System.IO; using System.Linq; using System.Windows.Forms; @@ -18,6 +19,18 @@ public UIOptions(FrmMain _frm) frm = _frm; frm.ThemeChanged += ApplyTheme; + if(frm.OptionsData == null) + { + frm.OptionsData = new OptionsData() + { + exePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), @"RealmOfTheMadGod\Production\RotMG Exalt.exe"), + closeAfterConnection = false, + snackbarPosition = 8, + discordOptions = new DiscordOptions() { ShowAccountNames = true, ShowMenus = true, ShowState = true }, + analyticsOptions = new AnalyticsOptions() { Anonymization = false, OptOut = false }, + }; + } + btnSave.Anchor = lSave.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; LoadServers(); @@ -164,25 +177,36 @@ private void btnChangePath_Click(object sender, EventArgs e) private void btnSave_Click(object sender, EventArgs e) { - frm.OptionsData = new OptionsData() + try { - exePath = tbPath.Text, - closeAfterConnection = toggleCloseEAMAftergameStart.Checked, - serverToJoin = dropServers.SelectedItem.ToString().StartsWith("Last") ? "Last" : dropServers.SelectedItem.ToString(), + frm.OptionsData = new OptionsData() + { + exePath = tbPath.Text, + closeAfterConnection = toggleCloseEAMAftergameStart.Checked, + serverToJoin = dropServers.SelectedItem.ToString().StartsWith("Last") ? "Last" : dropServers.SelectedItem.ToString(), - alwaysrefreshDataOnLogin = toggleAlwaysRefreshDataOnLogin.Checked, + alwaysrefreshDataOnLogin = toggleAlwaysRefreshDataOnLogin.Checked, - searchRotmgUpdates = GameUpdateAndNotifications[0], - searchUpdateNotification = GameUpdateAndNotifications[1], - searchWarnings = GameUpdateAndNotifications[2], - deactivateKillswitch = GameUpdateAndNotifications[3], + searchRotmgUpdates = GameUpdateAndNotifications[0], + searchUpdateNotification = GameUpdateAndNotifications[1], + searchWarnings = GameUpdateAndNotifications[2], + deactivateKillswitch = GameUpdateAndNotifications[3], - useDarkmode = frm.UseDarkmode - }; + useDarkmode = frm.UseDarkmode + }; - frm.SaveOptions(frm.OptionsData, true); - btnSave.Visible = false; - frm.UpdateHasConfigChangesUI(false); + frm.SaveOptions(frm.OptionsData, true); + btnSave.Visible = false; + frm.UpdateHasConfigChangesUI(false); + } + catch (Exception ex) + { + frm.LogEvent(new MK_EAM_Lib.LogData( + "EAM", + MK_EAM_Lib.LogEventType.EAMError, + $"Failed to save options:{Environment.NewLine}{ex.Message}")); + } + } private void btnSave_MouseEnter(object sender, EventArgs e) From 1fad35e2db90a96669d5d45cefe51cbe98335bb3 Mon Sep 17 00:00:00 2001 From: MaikEight Date: Thu, 12 Oct 2023 20:46:54 +0200 Subject: [PATCH 04/10] =?UTF-8?q?=E2=9C=A8=20Added=20a=20new=20toggle=20to?= =?UTF-8?q?=20allow=20users=20to=20disable=20the=20snackbar=20on=20login?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ExaltAccountManager/FrmMain.cs | 2 + ExaltAccountManager/OLD/FrmOptions.cs | 1 + ExaltAccountManager/UI/UIAccounts.cs | 18 ++++++++- ExaltAccountManager/UI/UIOptions.Designer.cs | 42 ++++++++++++++++++-- ExaltAccountManager/UI/UIOptions.cs | 8 ++++ 5 files changed, 66 insertions(+), 5 deletions(-) diff --git a/ExaltAccountManager/FrmMain.cs b/ExaltAccountManager/FrmMain.cs index bc91731e..454c93b9 100644 --- a/ExaltAccountManager/FrmMain.cs +++ b/ExaltAccountManager/FrmMain.cs @@ -461,6 +461,7 @@ public FrmMain(string[] args) exePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), @"RealmOfTheMadGod\Production\RotMG Exalt.exe"), closeAfterConnection = false, snackbarPosition = 8, + showPlaySnackbar = true, discordOptions = new DiscordOptions() { ShowAccountNames = true, ShowMenus = true, ShowState = true }, analyticsOptions = new AnalyticsOptions() { Anonymization = false, OptOut = false }, }; @@ -475,6 +476,7 @@ public FrmMain(string[] args) exePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), @"RealmOfTheMadGod\Production\RotMG Exalt.exe"), closeAfterConnection = false, snackbarPosition = 8, + showPlaySnackbar = true, discordOptions = new DiscordOptions() { ShowAccountNames = true, ShowMenus = true, ShowState = true }, analyticsOptions = new AnalyticsOptions() { Anonymization = false, OptOut = false }, }; diff --git a/ExaltAccountManager/OLD/FrmOptions.cs b/ExaltAccountManager/OLD/FrmOptions.cs index 740295c2..953e627b 100644 --- a/ExaltAccountManager/OLD/FrmOptions.cs +++ b/ExaltAccountManager/OLD/FrmOptions.cs @@ -394,6 +394,7 @@ public sealed class OptionsData public bool deactivateKillswitch = true; public int snackbarPosition = 8; + public bool showPlaySnackbar = true; public DiscordOptions discordOptions = new DiscordOptions() { ShowAccountNames = true, ShowMenus = true, ShowState = true }; public AnalyticsOptions analyticsOptions = new AnalyticsOptions() { OptOut = false, Anonymization = false }; diff --git a/ExaltAccountManager/UI/UIAccounts.cs b/ExaltAccountManager/UI/UIAccounts.cs index 7a4055e2..1185f28e 100644 --- a/ExaltAccountManager/UI/UIAccounts.cs +++ b/ExaltAccountManager/UI/UIAccounts.cs @@ -137,6 +137,8 @@ public void ApplyTheme(object sender, EventArgs e) scrollbar.BackgroundColor = frm.UseDarkmode ? def : third; scrollbar.ThumbColor = frm.UseDarkmode ? third : Color.Gray; + #region DropDowns + dropServers.BackgroundColor = dropOrder.BackgroundColor = def; dropServers.ForeColor = @@ -152,6 +154,10 @@ public void ApplyTheme(object sender, EventArgs e) dropServers.Invalidate(); dropOrder.Invalidate(); + #endregion + + #region DataGridView + dataGridView.BackgroundColor = second; dataGridView.CurrentTheme.BackColor = frm.UseDarkmode ? Color.FromArgb(77, 10, 173) : Color.FromArgb(107, 40, 203); dataGridView.CurrentTheme.GridColor = dataGridView.GridColor = frm.UseDarkmode ? third : Color.WhiteSmoke; @@ -163,6 +169,10 @@ public void ApplyTheme(object sender, EventArgs e) dataGridView.ApplyTheme(dataGridView.CurrentTheme); + #endregion + + #region ToolTip + toolTip.BackColor = def; toolTip.TitleForeColor = font; toolTip.TextForeColor = frm.UseDarkmode ? Color.WhiteSmoke : Color.FromArgb(64, 64, 64); @@ -181,6 +191,8 @@ public void ApplyTheme(object sender, EventArgs e) toolTip.SetToolTipIcon(toggleShowInVP, frm.UseDarkmode ? Properties.Resources.btn_icon_chest_1 : Properties.Resources.btn_icon_chest_2); toolTip.SetToolTipIcon(lShowInVP, frm.UseDarkmode ? Properties.Resources.btn_icon_chest_1 : Properties.Resources.btn_icon_chest_2); + #endregion + FormsUtils.ResumeDrawing(this); } @@ -424,7 +436,11 @@ private bool StartGameForAccount(MK_EAM_Lib.AccountInfo _info) try { frm.LogEvent(new LogData(-1, "EAM AccUI", LogEventType.Login, $"Start login into account: {_info.email}.")); - frm.ShowSnackbar($"Start login into account: {_info.email}.", Bunifu.UI.WinForms.BunifuSnackbar.MessageTypes.Information, 3000); + + if (frm.OptionsData.showPlaySnackbar) + { + frm.ShowSnackbar($"Start login into account: {_info.email}.", Bunifu.UI.WinForms.BunifuSnackbar.MessageTypes.Information, 3000); + } string arguments = string.Format("\"data:{{platform:Deca,guid:{0},token:{1},tokenTimestamp:{2},tokenExpiration:{3},env:4,serverName:{4}}}\"", StringToBase64String(_info.email), StringToBase64String(_info.accessToken.token), StringToBase64String(_info.accessToken.creationTime), StringToBase64String(_info.accessToken.expirationTime), GetServerName(_info.serverName)); diff --git a/ExaltAccountManager/UI/UIOptions.Designer.cs b/ExaltAccountManager/UI/UIOptions.Designer.cs index 723ddb1e..828eda2b 100644 --- a/ExaltAccountManager/UI/UIOptions.Designer.cs +++ b/ExaltAccountManager/UI/UIOptions.Designer.cs @@ -67,6 +67,8 @@ private void InitializeComponent() this.label1 = new System.Windows.Forms.Label(); this.toggleAlwaysRefreshDataOnLogin = new Bunifu.UI.WinForms.BunifuToggleSwitch2(); this.label3 = new System.Windows.Forms.Label(); + this.label8 = new System.Windows.Forms.Label(); + this.toggleShowOnLogin = new Bunifu.UI.WinForms.BunifuToggleSwitch2(); this.bunifuShadowPanel1.SuspendLayout(); this.bunifuShadowPanel2.SuspendLayout(); this.bunifuShadowPanel3.SuspendLayout(); @@ -853,13 +855,15 @@ private void InitializeComponent() this.bunifuShadowPanel5.BorderColor = System.Drawing.Color.WhiteSmoke; this.bunifuShadowPanel5.BorderRadius = 9; this.bunifuShadowPanel5.BorderThickness = 1; + this.bunifuShadowPanel5.Controls.Add(this.toggleShowOnLogin); + this.bunifuShadowPanel5.Controls.Add(this.label8); this.bunifuShadowPanel5.Controls.Add(this.btnSnackbar); this.bunifuShadowPanel5.Controls.Add(this.label5); this.bunifuShadowPanel5.Controls.Add(this.toggleUseDarkmode); this.bunifuShadowPanel5.Controls.Add(this.label12); this.bunifuShadowPanel5.FillStyle = Bunifu.UI.WinForms.BunifuShadowPanel.FillStyles.Solid; this.bunifuShadowPanel5.GradientMode = Bunifu.UI.WinForms.BunifuShadowPanel.GradientModes.Vertical; - this.bunifuShadowPanel5.Location = new System.Drawing.Point(293, 183); + this.bunifuShadowPanel5.Location = new System.Drawing.Point(466, 183); this.bunifuShadowPanel5.Name = "bunifuShadowPanel5"; this.bunifuShadowPanel5.PanelColor = System.Drawing.Color.White; this.bunifuShadowPanel5.PanelColor2 = System.Drawing.Color.White; @@ -868,7 +872,7 @@ private void InitializeComponent() this.bunifuShadowPanel5.ShadowDepth = 4; this.bunifuShadowPanel5.ShadowStyle = Bunifu.UI.WinForms.BunifuShadowPanel.ShadowStyles.Surrounded; this.bunifuShadowPanel5.ShadowTopLeftVisible = false; - this.bunifuShadowPanel5.Size = new System.Drawing.Size(201, 145); + this.bunifuShadowPanel5.Size = new System.Drawing.Size(201, 196); this.bunifuShadowPanel5.Style = Bunifu.UI.WinForms.BunifuShadowPanel.BevelStyles.Flat; this.bunifuShadowPanel5.TabIndex = 20; // @@ -888,7 +892,7 @@ private void InitializeComponent() this.btnSnackbar.BackColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(175)))), ((int)(((byte)(98)))), ((int)(((byte)(0)))), ((int)(((byte)(238))))); this.btnSnackbar.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSnackbar.BackgroundImage"))); this.btnSnackbar.BorderStyle = Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderStyles.Solid; - this.btnSnackbar.ButtonText = "Snackbar options"; + this.btnSnackbar.ButtonText = "Snackbar position"; this.btnSnackbar.ButtonTextMarginLeft = 0; this.btnSnackbar.ColorContrastOnClick = 45; this.btnSnackbar.ColorContrastOnHover = 45; @@ -1028,7 +1032,7 @@ private void InitializeComponent() this.bunifuShadowPanel4.Controls.Add(this.label3); this.bunifuShadowPanel4.FillStyle = Bunifu.UI.WinForms.BunifuShadowPanel.FillStyles.Solid; this.bunifuShadowPanel4.GradientMode = Bunifu.UI.WinForms.BunifuShadowPanel.GradientModes.Vertical; - this.bunifuShadowPanel4.Location = new System.Drawing.Point(495, 183); + this.bunifuShadowPanel4.Location = new System.Drawing.Point(293, 183); this.bunifuShadowPanel4.Name = "bunifuShadowPanel4"; this.bunifuShadowPanel4.PanelColor = System.Drawing.Color.White; this.bunifuShadowPanel4.PanelColor2 = System.Drawing.Color.White; @@ -1079,6 +1083,34 @@ private void InitializeComponent() this.label3.TabIndex = 7; this.label3.Text = "Login"; // + // label8 + // + this.label8.AutoSize = true; + this.label8.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label8.Location = new System.Drawing.Point(12, 132); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(176, 21); + this.label8.TabIndex = 27; + this.label8.Text = "Show snackbar on login"; + this.label8.UseMnemonic = false; + // + // toggleShowOnLogin + // + this.toggleShowOnLogin.BackColor = System.Drawing.Color.Transparent; + this.toggleShowOnLogin.Checked = false; + this.toggleShowOnLogin.CheckedBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(156)))), ((int)(((byte)(95)))), ((int)(((byte)(244))))); + this.toggleShowOnLogin.CheckedSwitchColor = System.Drawing.Color.White; + this.toggleShowOnLogin.CheckedSwitchStyle = Bunifu.UI.WinForms.BunifuToggleSwitch2.SwitchStyles.Outline; + this.toggleShowOnLogin.Location = new System.Drawing.Point(16, 160); + this.toggleShowOnLogin.Name = "toggleShowOnLogin"; + this.toggleShowOnLogin.OutlineThickness = 2; + this.toggleShowOnLogin.Size = new System.Drawing.Size(44, 19); + this.toggleShowOnLogin.TabIndex = 28; + this.toggleShowOnLogin.UncheckedBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(189)))), ((int)(((byte)(189)))), ((int)(((byte)(189))))); + this.toggleShowOnLogin.UncheckedSwitchColor = System.Drawing.Color.White; + this.toggleShowOnLogin.UncheckedSwitchStyle = Bunifu.UI.WinForms.BunifuToggleSwitch2.SwitchStyles.Outline; + this.toggleShowOnLogin.CheckedChanged += new System.EventHandler(this.toggleShowOnLogin_CheckedChanged); + // // UIOptions // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 17F); @@ -1140,5 +1172,7 @@ private void InitializeComponent() private System.Windows.Forms.Label label1; private Bunifu.UI.WinForms.BunifuToggleSwitch2 toggleAlwaysRefreshDataOnLogin; private System.Windows.Forms.Label label3; + private Bunifu.UI.WinForms.BunifuToggleSwitch2 toggleShowOnLogin; + private System.Windows.Forms.Label label8; } } diff --git a/ExaltAccountManager/UI/UIOptions.cs b/ExaltAccountManager/UI/UIOptions.cs index 5569f5c4..197a3218 100644 --- a/ExaltAccountManager/UI/UIOptions.cs +++ b/ExaltAccountManager/UI/UIOptions.cs @@ -26,6 +26,7 @@ public UIOptions(FrmMain _frm) exePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), @"RealmOfTheMadGod\Production\RotMG Exalt.exe"), closeAfterConnection = false, snackbarPosition = 8, + showPlaySnackbar = true, discordOptions = new DiscordOptions() { ShowAccountNames = true, ShowMenus = true, ShowState = true }, analyticsOptions = new AnalyticsOptions() { Anonymization = false, OptOut = false }, }; @@ -113,6 +114,7 @@ public void ApplyOptions() frm.OptionsData.searchWarnings, frm.OptionsData.deactivateKillswitch }; + toggleShowOnLogin.Checked = frm.OptionsData.showPlaySnackbar; toggleUseDarkmode.Checked = frm.UseDarkmode; toggleAlwaysRefreshDataOnLogin.Checked = frm.OptionsData.alwaysrefreshDataOnLogin; @@ -186,6 +188,7 @@ private void btnSave_Click(object sender, EventArgs e) serverToJoin = dropServers.SelectedItem.ToString().StartsWith("Last") ? "Last" : dropServers.SelectedItem.ToString(), alwaysrefreshDataOnLogin = toggleAlwaysRefreshDataOnLogin.Checked, + showPlaySnackbar = toggleShowOnLogin.Checked, searchRotmgUpdates = GameUpdateAndNotifications[0], searchUpdateNotification = GameUpdateAndNotifications[1], @@ -290,5 +293,10 @@ private void toggleAlwaysRefreshDataOnLogin_CheckedChanged(object sender, EventA { HasChanges(); } + + private void toggleShowOnLogin_CheckedChanged(object sender, EventArgs e) + { + HasChanges(); + } } } From 3909681a1d4ad24a4b651b7f7ec9731ad33daea1 Mon Sep 17 00:00:00 2001 From: MaikEight Date: Thu, 12 Oct 2023 21:17:34 +0200 Subject: [PATCH 05/10] =?UTF-8?q?=F0=9F=90=9B=20Fixed=20a=20bug=20that=20d?= =?UTF-8?q?isabled=20the=20updater-ui=20during=20updating?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ExaltAccountManager/FrmMain.cs | 7 +++++-- ExaltAccountManager/UI/Elements/EleGameUpdater.cs | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ExaltAccountManager/FrmMain.cs b/ExaltAccountManager/FrmMain.cs index 454c93b9..889bd49a 100644 --- a/ExaltAccountManager/FrmMain.cs +++ b/ExaltAccountManager/FrmMain.cs @@ -461,7 +461,7 @@ public FrmMain(string[] args) exePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), @"RealmOfTheMadGod\Production\RotMG Exalt.exe"), closeAfterConnection = false, snackbarPosition = 8, - showPlaySnackbar = true, + hideSnackbarOnPlay = false, discordOptions = new DiscordOptions() { ShowAccountNames = true, ShowMenus = true, ShowState = true }, analyticsOptions = new AnalyticsOptions() { Anonymization = false, OptOut = false }, }; @@ -476,7 +476,7 @@ public FrmMain(string[] args) exePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), @"RealmOfTheMadGod\Production\RotMG Exalt.exe"), closeAfterConnection = false, snackbarPosition = 8, - showPlaySnackbar = true, + hideSnackbarOnPlay = false, discordOptions = new DiscordOptions() { ShowAccountNames = true, ShowMenus = true, ShowState = true }, analyticsOptions = new AnalyticsOptions() { Anonymization = false, OptOut = false }, }; @@ -2160,6 +2160,9 @@ public void RemoveShadowForm() public void SwitchLlamaState(bool showLlama) => pbHeader.Image = showLlama ? Properties.Resources.llama : Properties.Resources.ic_account_balance_wallet_white_48dp; + public void HidePbShowDiscordUser() => pbShowDiscordUser.Visible = false; + public void ShowPbShowDiscordUser() => pbShowDiscordUser.Visible = discordUser != null; + public void ShowEamLogoGif(string _url, Action action) { string url = API_BASE_URL + _url; diff --git a/ExaltAccountManager/UI/Elements/EleGameUpdater.cs b/ExaltAccountManager/UI/Elements/EleGameUpdater.cs index 3fd093b6..57f3ef36 100644 --- a/ExaltAccountManager/UI/Elements/EleGameUpdater.cs +++ b/ExaltAccountManager/UI/Elements/EleGameUpdater.cs @@ -63,6 +63,7 @@ private GameUpdaterUIState UIState break; case GameUpdaterUIState.UpdateInProgress: { + frm.HidePbShowDiscordUser(); this.Height = progressbar.Bottom + 17; pbClose.Enabled = @@ -82,6 +83,7 @@ private GameUpdaterUIState UIState break; case GameUpdaterUIState.UpdateDone: { + frm.ShowPbShowDiscordUser(); this.Height = btnDone.Bottom + 17; btnCheckForUpdate.Enabled = From 95ed0d227988757d63c8d8b04aa62347d693f6c5 Mon Sep 17 00:00:00 2001 From: MaikEight Date: Thu, 12 Oct 2023 21:19:22 +0200 Subject: [PATCH 06/10] =?UTF-8?q?=F0=9F=8E=A8=20Improved=20the=20options-c?= =?UTF-8?q?hanges?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ExaltAccountManager/OLD/FrmOptions.cs | 2 +- ExaltAccountManager/UI/UIAccounts.cs | 2 +- ExaltAccountManager/UI/UIOptions.cs | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ExaltAccountManager/OLD/FrmOptions.cs b/ExaltAccountManager/OLD/FrmOptions.cs index 953e627b..e2dc98dd 100644 --- a/ExaltAccountManager/OLD/FrmOptions.cs +++ b/ExaltAccountManager/OLD/FrmOptions.cs @@ -394,7 +394,7 @@ public sealed class OptionsData public bool deactivateKillswitch = true; public int snackbarPosition = 8; - public bool showPlaySnackbar = true; + public bool hideSnackbarOnPlay = false; public DiscordOptions discordOptions = new DiscordOptions() { ShowAccountNames = true, ShowMenus = true, ShowState = true }; public AnalyticsOptions analyticsOptions = new AnalyticsOptions() { OptOut = false, Anonymization = false }; diff --git a/ExaltAccountManager/UI/UIAccounts.cs b/ExaltAccountManager/UI/UIAccounts.cs index 1185f28e..4de95dcc 100644 --- a/ExaltAccountManager/UI/UIAccounts.cs +++ b/ExaltAccountManager/UI/UIAccounts.cs @@ -437,7 +437,7 @@ private bool StartGameForAccount(MK_EAM_Lib.AccountInfo _info) { frm.LogEvent(new LogData(-1, "EAM AccUI", LogEventType.Login, $"Start login into account: {_info.email}.")); - if (frm.OptionsData.showPlaySnackbar) + if (!frm.OptionsData.hideSnackbarOnPlay) { frm.ShowSnackbar($"Start login into account: {_info.email}.", Bunifu.UI.WinForms.BunifuSnackbar.MessageTypes.Information, 3000); } diff --git a/ExaltAccountManager/UI/UIOptions.cs b/ExaltAccountManager/UI/UIOptions.cs index 197a3218..48924396 100644 --- a/ExaltAccountManager/UI/UIOptions.cs +++ b/ExaltAccountManager/UI/UIOptions.cs @@ -26,7 +26,7 @@ public UIOptions(FrmMain _frm) exePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), @"RealmOfTheMadGod\Production\RotMG Exalt.exe"), closeAfterConnection = false, snackbarPosition = 8, - showPlaySnackbar = true, + hideSnackbarOnPlay = false, discordOptions = new DiscordOptions() { ShowAccountNames = true, ShowMenus = true, ShowState = true }, analyticsOptions = new AnalyticsOptions() { Anonymization = false, OptOut = false }, }; @@ -114,7 +114,7 @@ public void ApplyOptions() frm.OptionsData.searchWarnings, frm.OptionsData.deactivateKillswitch }; - toggleShowOnLogin.Checked = frm.OptionsData.showPlaySnackbar; + toggleShowOnLogin.Checked = !frm.OptionsData.hideSnackbarOnPlay; toggleUseDarkmode.Checked = frm.UseDarkmode; toggleAlwaysRefreshDataOnLogin.Checked = frm.OptionsData.alwaysrefreshDataOnLogin; @@ -188,7 +188,7 @@ private void btnSave_Click(object sender, EventArgs e) serverToJoin = dropServers.SelectedItem.ToString().StartsWith("Last") ? "Last" : dropServers.SelectedItem.ToString(), alwaysrefreshDataOnLogin = toggleAlwaysRefreshDataOnLogin.Checked, - showPlaySnackbar = toggleShowOnLogin.Checked, + hideSnackbarOnPlay = !toggleShowOnLogin.Checked, searchRotmgUpdates = GameUpdateAndNotifications[0], searchUpdateNotification = GameUpdateAndNotifications[1], From 6e2212b37a0d587b92ae2d2d67aeb619da328359 Mon Sep 17 00:00:00 2001 From: MaikEight Date: Thu, 12 Oct 2023 21:21:12 +0200 Subject: [PATCH 07/10] =?UTF-8?q?=F0=9F=93=9D=20Updated=20the=20changelog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EAM_Installer/wix/EAM_Installer.g.wxs | 68 +++++++++--------- ExaltAccountManager/UI/UIChangelog.cs | 21 ++++-- .../DesignTimeResolveAssemblyReferences.cache | Bin 92337 -> 3697 bytes .../Debug/exaltaccountmanager.exe.licenses | Bin 4305 -> 4305 bytes 4 files changed, 51 insertions(+), 38 deletions(-) diff --git a/EAM_Installer/wix/EAM_Installer.g.wxs b/EAM_Installer/wix/EAM_Installer.g.wxs index 8d2b778d..0dc33559 100644 --- a/EAM_Installer/wix/EAM_Installer.g.wxs +++ b/EAM_Installer/wix/EAM_Installer.g.wxs @@ -6,7 +6,7 @@ --> - + @@ -15,23 +15,23 @@ - + - + - + - + - + @@ -42,41 +42,41 @@ - + - + - + - + - + - + - + - + - + @@ -84,63 +84,63 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -148,7 +148,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -171,7 +171,7 @@ - + @@ -181,7 +181,7 @@ - + diff --git a/ExaltAccountManager/UI/UIChangelog.cs b/ExaltAccountManager/UI/UIChangelog.cs index 1785445c..6f64f6a5 100644 --- a/ExaltAccountManager/UI/UIChangelog.cs +++ b/ExaltAccountManager/UI/UIChangelog.cs @@ -12,16 +12,29 @@ public sealed partial class UIChangelog : UserControl private readonly BindingList changelogEntries = new BindingList() { + new ChangelogEntry() + { + ReleaseDate = new DateTime(2023, 10, 12), + Version = new Version(3, 3, 0), + Name = "More Bug fixes and improvements", + Description = $"OPTIONS{Environment.NewLine}{Environment.NewLine}" + + $"- Added a new toggle to hide the snackbar on login.{Environment.NewLine}" + + $"   This avoids the blinking in the taskbar.{Environment.NewLine}{Environment.NewLine}" + + $"BUG FIXES{Environment.NewLine}" + + $"- Fixed a crashing bug when the chartCanvas is null.{Environment.NewLine}" + + $"- Fixed a crashing bug when sving the options.{Environment.NewLine}" + + $"- Fixed a bug that disabled the updater-ui during updating the game.{Environment.NewLine}{Environment.NewLine}" + }, new ChangelogEntry() { ReleaseDate = new DateTime(2023, 07, 19), Version = new Version(3, 2, 1), Name = "Bug fixes and improvements", Description = $"BUG FIXES{Environment.NewLine}{Environment.NewLine}" + - $"- Fixed the scaling issues{Environment.NewLine}" + - $"- Fixed the top controls to the right side{Environment.NewLine}" + - $"- Fixed the discord username for the new usernames without discriminator{Environment.NewLine}" + - $"- Addded a check for the default game path, if the game.exe can't be found{Environment.NewLine}{Environment.NewLine}" + $"- Fixed the scaling issues.{Environment.NewLine}" + + $"- Fixed the top controls to the right side.{Environment.NewLine}" + + $"- Fixed the discord username for the new usernames without discriminator.{Environment.NewLine}" + + $"- Addded a check for the default game path, if the game.exe can't be found.{Environment.NewLine}{Environment.NewLine}" }, new ChangelogEntry() { diff --git a/ExaltAccountManager/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/ExaltAccountManager/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 092f51d31ba47311e791a8fea2b001b04312da03..65df3de26416d7d308efbd902a793bff70f96a6e 100644 GIT binary patch delta 140 zcmdmZk@cetD;py>1H<;dK*pCWjPa8N7=tH9YfWFM%NRZR6pz|ue#V-KtzFaiS~D6> z{$R|x{j)FQWJX4Y$&7jPCfj%UPG6M7=s9@-7soUXMz84soQx*Zp9z4K%59$#&)CN} r`7R$9V=B78K?s6?h!rXd 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 bzK*}@^~f?2TC6M>g*N=2%&^|tpR)D;#=^I? diff --git a/ExaltAccountManager/obj/Debug/exaltaccountmanager.exe.licenses b/ExaltAccountManager/obj/Debug/exaltaccountmanager.exe.licenses index 4aa33adbc3ddfd8ae30c2242f84046d828a2cf7c..665b7db296e8f5ac710fc34a9bd63c42cf11eab9 100644 GIT binary patch delta 758 zcmcbpcu{eK1-F7pa;j-ss$oi^rHO%|fw@s?icy+jnvsdAnT5GUN}B292yQjPiso@^ z5mxkq7)3@rnuJZN=FuUn=s1r$VMTnrL^wQxmzW?R#-ta#+JxO?%twU7tN1hsn{@IR+Kp9S8xLW2tv}D delta 758 zcmcbpcu{eK1-F8^MM{#XX|h?0rI|%qTC%BevPGhqfq_A?rMXFRikaEu2yQjPiso@^ z5mxkq7)3@rnuJZN=FuUn=s1r$VMTnrL^wQxmzW?R#-ta#+JxO?%twU7tN1hsn{@IR+Kp9S8xLWi0#v| From 0f64bb520727ab94274a03825f9ccb590cc84a43 Mon Sep 17 00:00:00 2001 From: MaikEight Date: Sat, 14 Oct 2023 21:59:17 +0200 Subject: [PATCH 08/10] =?UTF-8?q?=F0=9F=93=84=20Updated=20licenses=20&=20p?= =?UTF-8?q?reparations=20for=20v=203.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ... Login Service.csproj.FileListAbsolute.txt | 1 - .../obj/Release/EAM Daily Login Service.pdb | Bin 65024 -> 65024 bytes .../obj/Debug/eam pingchecker.exe.licenses | Bin 3907 -> 3907 bytes .../obj/Release/eam pingchecker.exe.licenses | Bin 3907 -> 3907 bytes .../obj/Debug/eam statistics.exe.licenses | Bin 3906 -> 3906 bytes .../obj/Release/eam statistics.exe.licenses | Bin 3906 -> 3906 bytes .../eam notification center.exe.licenses | Bin 901 -> 901 bytes .../eam notification center.exe.licenses | Bin 901 -> 901 bytes .../obj/Debug/eam vault peeker.exe.licenses | Bin 1886 -> 1853 bytes .../obj/Release/eam vault peeker.exe.licenses | Bin 1886 -> 1886 bytes EAM_Installer/wix/EAM_Installer.g.wxs | 68 +++++++++--------- .../Release/exaltaccountmanager.exe.licenses | Bin 4305 -> 4305 bytes 12 files changed, 34 insertions(+), 35 deletions(-) diff --git a/EAM Daily Login Service/obj/Release/EAM Daily Login Service.csproj.FileListAbsolute.txt b/EAM Daily Login Service/obj/Release/EAM Daily Login Service.csproj.FileListAbsolute.txt index e9ddafde..41ac7189 100644 --- a/EAM Daily Login Service/obj/Release/EAM Daily Login Service.csproj.FileListAbsolute.txt +++ b/EAM Daily Login Service/obj/Release/EAM Daily Login Service.csproj.FileListAbsolute.txt @@ -119,7 +119,6 @@ C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Re C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Newtonsoft.Json.dll C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Newtonsoft.Json.xml C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\MK_EAM_Lib.dll.config -C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Release\EAM Daily Login Service.csproj.SuggestedBindingRedirects.cache C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.dll C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.1.5.3.dll C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\MK_EAM_General_Services_Lib.dll diff --git a/EAM Daily Login Service/obj/Release/EAM Daily Login Service.pdb b/EAM Daily Login Service/obj/Release/EAM Daily Login Service.pdb index 0d6dd93d7c99216dd1e0a6d564c5e16d01c0d95e..05b6669383c48c9047eec669611219f68910066e 100644 GIT binary patch delta 115 zcmV-(0F3{D`~!ge1F#qpL%aeP0EnVPBOomxG%hzTFfB7KGBY$WHZC|TG&5o_VlXvh zV>D(oIWlHsHDqNlFlIJpHa9UhG%z_ZIWc5rIAmdAu|cH)vJ?c|7%vOhxd8wG05r3) V^}nOhLXZp)l4bx{jI$i@4r8F=Q}f zWo2PvF<~|}WMMEeF*jv2Ff%wcF<~)fIAJp|FgP}0u|cH)vJ?c|7%lCC+5rFn08D+q VX!A16N~C46e4$ctP_rEHscUW$NC6|Ipa;j-ss$oi^rHO%|fw@s?icy+jnvsdAnT5GUN}B29NG>hHiWYNe z5?1tvOP8=BOKu&)idwm~2`jq5O@zaxc+?1+l)$4-SkZDG4Z@1v^QaP5WWq~?Nj1Dg z1i^7$B7#7Wj|ew~@evUObNPsH_)|VD6GDkj$Eh?gGp#fvKRrDsHMl&pBsqf{07)3Y Ay8r+H delta 689 zcmX>scUW$NC6|J^MM{#XX|h?0rI|%qTC%BevPGhqfq_A?rMXFRikaEuNG>hHiWYNe z5?1tvOP8=BOKu&)idwm~2`jq5O@zaxc+?1+l)$4-SkZDG4Z@1v^QaP5WWq~?Nj1Dg z1i^7$B7#7Wj|ew~@evUObNPsH_)|VD6GDkj$Eh?gGp#fvKRrDsHMl&pBsqf{0E5lJ Aw*UYD diff --git a/EAM PingChecker/obj/Release/eam pingchecker.exe.licenses b/EAM PingChecker/obj/Release/eam pingchecker.exe.licenses index 2aeec1aceabb3826af7309015f3423139c99668a..d01ddba2e09a1f059773150c5a887790e7aba381 100644 GIT binary patch delta 689 zcmX>scUW$NC6|Ipa;j-ss$oi^rHO%|fw@s?icy+jnvsdAnT5GUN}B29NG>hHiWYNe z5?1tvOP8=BOKu&)idwm~2`jq5O@zaxc+?1+l)$4-SkZDG4Z@1v^QaP5WWq~?Nj1Dg z1i^7$B7#7Wj|ew~@evUObNPsH_)|VD6GDkj$Eh?gGp#fvKRrDsHMl&pBsqf{07)3Y Ay8r+H delta 689 zcmX>scUW$NC6|J^MM{#XX|h?0rI|%qTC%BevPGhqfq_A?rMXFRikaEuNG>hHiWYNe z5?1tvOP8=BOKu&)idwm~2`jq5O@zaxc+?1+l)$4-SkZDG4Z@1v^QaP5WWq~?Nj1Dg z1i^7$B7#7Wj|ew~@evUObNPsH_)|VD6GDkj$Eh?gGp#fvKRrDsHMl&pBsqf{0E5lJ Aw*UYD diff --git a/EAM Statistics/obj/Debug/eam statistics.exe.licenses b/EAM Statistics/obj/Debug/eam statistics.exe.licenses index d7fc8fa85a711e6e4680ad1c06029520c5670fd1..6829bff9e68a8cfe5dd2ed805ee2c48fb1f90427 100644 GIT binary patch delta 689 zcmX>kcSvr71($+Ja;j-ss$oi^rHO%|fw@s?icy+jnvsdAnT5GUN}B292rezciWYHc z5?1t@OP8=B3vM04idwj}2`f6!O@zZGdDIA-6wjkhSkW>b4Z@1v@u(73WXwy1N!7eW z1i>+0B7#7Gj|ew~@(~dPbNGmG_!B-Y6GDkj$Eh?gGp#fvKRrDsHMl&pBsqf{04c1% ArvLx| delta 689 zcmX>kcSvr71($-kMM{#XX|h?0rI|%qTC%BevPGhqfq_A?rMXFRikaEu2rezciWYHc z5?1t@OP8=B3vM04idwj}2`f6!O@zZGdDIA-6wjkhSkW>b4Z@1v@u(73WXwy1N!7eW z1i>+0B7#7Gj|ew~@(~dPbNGmG_!B-Y6GDkj$Eh?gGp#fvKRrDsHMl&pBsqf{0Ayjo AqW}N^ diff --git a/EAM Statistics/obj/Release/eam statistics.exe.licenses b/EAM Statistics/obj/Release/eam statistics.exe.licenses index d7fc8fa85a711e6e4680ad1c06029520c5670fd1..6829bff9e68a8cfe5dd2ed805ee2c48fb1f90427 100644 GIT binary patch delta 689 zcmX>kcSvr71($+Ja;j-ss$oi^rHO%|fw@s?icy+jnvsdAnT5GUN}B292rezciWYHc z5?1t@OP8=B3vM04idwj}2`f6!O@zZGdDIA-6wjkhSkW>b4Z@1v@u(73WXwy1N!7eW z1i>+0B7#7Gj|ew~@(~dPbNGmG_!B-Y6GDkj$Eh?gGp#fvKRrDsHMl&pBsqf{04c1% ArvLx| delta 689 zcmX>kcSvr71($-kMM{#XX|h?0rI|%qTC%BevPGhqfq_A?rMXFRikaEu2rezciWYHc z5?1t@OP8=B3vM04idwj}2`f6!O@zZGdDIA-6wjkhSkW>b4Z@1v@u(73WXwy1N!7eW z1i>+0B7#7Gj|ew~@(~dPbNGmG_!B-Y6GDkj$Eh?gGp#fvKRrDsHMl&pBsqf{0Ayjo AqW}N^ diff --git a/EAM Tasktray Tool/obj/Debug/eam notification center.exe.licenses b/EAM Tasktray Tool/obj/Debug/eam notification center.exe.licenses index 8d2ff5b53919aceeb83c009857247bc85760acc6..a548612f0ccf23e3878a5534f0f10024f1f9da7b 100644 GIT binary patch delta 118 zcmZo=Z)M-Gn@PbWIn^{R)i5Q|(!{{fz}zS`#VE}%&B(;m%);CvCCzm5Z6-~^id2}j K2`kEH76Sm-{UFx> delta 118 zcmZo=Z)M-Gn@PdkA|=VxG}$c0(##?)E!osK*&@-*z`!8c(%d9D#msE-Z6-~^id2}j K2`kEH76Sm?M delta 118 zcmZo=Z)M-Gn@PdkA|=VxG}$c0(##?)E!osK*&@-*z`!8c(%d9D#msE-Z6-~^id2}j K2`kEH76Sm?M --> - + @@ -15,23 +15,23 @@ - + - + - + - + - + @@ -42,41 +42,41 @@ - + - + - + - + - + - + - + - + - + @@ -84,63 +84,63 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -148,7 +148,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -171,7 +171,7 @@ - + @@ -181,7 +181,7 @@ - + diff --git a/ExaltAccountManager/obj/Release/exaltaccountmanager.exe.licenses b/ExaltAccountManager/obj/Release/exaltaccountmanager.exe.licenses index 4aa33adbc3ddfd8ae30c2242f84046d828a2cf7c..665b7db296e8f5ac710fc34a9bd63c42cf11eab9 100644 GIT binary patch delta 758 zcmcbpcu{eK1-F7pa;j-ss$oi^rHO%|fw@s?icy+jnvsdAnT5GUN}B292yQjPiso@^ z5mxkq7)3@rnuJZN=FuUn=s1r$VMTnrL^wQxmzW?R#-ta#+JxO?%twU7tN1hsn{@IR+Kp9S8xLW2tv}D delta 758 zcmcbpcu{eK1-F8^MM{#XX|h?0rI|%qTC%BevPGhqfq_A?rMXFRikaEu2yQjPiso@^ z5mxkq7)3@rnuJZN=FuUn=s1r$VMTnrL^wQxmzW?R#-ta#+JxO?%twU7tN1hsn{@IR+Kp9S8xLWi0#v| From 17ff786c030acee67a54b56028b02d7a65ffe49e Mon Sep 17 00:00:00 2001 From: MaikEight Date: Sat, 14 Oct 2023 22:00:18 +0200 Subject: [PATCH 09/10] =?UTF-8?q?=F0=9F=94=96=20Updated=20release=20versio?= =?UTF-8?q?n=20to=203.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ExaltAccountManager/FrmMain.cs | 2 +- ExaltAccountManager/UI/UIChangelog.cs | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ExaltAccountManager/FrmMain.cs b/ExaltAccountManager/FrmMain.cs index 889bd49a..5fadc3b1 100644 --- a/ExaltAccountManager/FrmMain.cs +++ b/ExaltAccountManager/FrmMain.cs @@ -26,7 +26,7 @@ namespace ExaltAccountManager { public sealed partial class FrmMain : Form { - public readonly Version version = new Version(3, 2, 1); + public readonly Version version = new Version(3, 3, 0); public const string GITHUB_PROJECT_URL = "https://github.com/MaikEight/ExaltAccountManager"; public const string DISCORD_INVITE_URL = "https://discord.exalt-account-manager.eu"; public string API_BASE_URL { get; internal set; } = "https://api.exalt-account-manager.eu/"; diff --git a/ExaltAccountManager/UI/UIChangelog.cs b/ExaltAccountManager/UI/UIChangelog.cs index 6f64f6a5..f8e06772 100644 --- a/ExaltAccountManager/UI/UIChangelog.cs +++ b/ExaltAccountManager/UI/UIChangelog.cs @@ -14,7 +14,7 @@ public sealed partial class UIChangelog : UserControl { new ChangelogEntry() { - ReleaseDate = new DateTime(2023, 10, 12), + ReleaseDate = new DateTime(2023, 10, 14), Version = new Version(3, 3, 0), Name = "More Bug fixes and improvements", Description = $"OPTIONS{Environment.NewLine}{Environment.NewLine}" + @@ -22,8 +22,9 @@ public sealed partial class UIChangelog : UserControl $"   This avoids the blinking in the taskbar.{Environment.NewLine}{Environment.NewLine}" + $"BUG FIXES{Environment.NewLine}" + $"- Fixed a crashing bug when the chartCanvas is null.{Environment.NewLine}" + - $"- Fixed a crashing bug when sving the options.{Environment.NewLine}" + - $"- Fixed a bug that disabled the updater-ui during updating the game.{Environment.NewLine}{Environment.NewLine}" + $"- Fixed a crashing bug when saving the options.{Environment.NewLine}" + + $"- Fixed a bug that disabled the UpdaterUI during the game update.{Environment.NewLine}{Environment.NewLine}" + + $"- Thanks to Ykao for reporting bugs and requesting features!" }, new ChangelogEntry() { @@ -89,12 +90,12 @@ public sealed partial class UIChangelog : UserControl $"   This is NO automation tool.{Environment.NewLine}" + $"ℹ️ The Captcha Aid tool is still in beta, please report feedback.{Environment.NewLine}{Environment.NewLine}" + $"INSTALLER{Environment.NewLine}" + - $"- Added a new simple installer for EAM.{Environment.NewLine}{Environment.NewLine}" + + $"- Added a new simple installer for EAM.{Environment.NewLine}{Environment.NewLine}" + $"EAM UPDATER{Environment.NewLine}" + $"- Added an updater to EAM, no manuall downloads needed anymore!{Environment.NewLine}{Environment.NewLine}" + $"EAM NEWS{Environment.NewLine}" + $"- Added a new system display custom news.{Environment.NewLine}" + - $"- Added multiple components to display.{Environment.NewLine}"+ + $"- Added multiple components to display.{Environment.NewLine}"+ $"- Added Polls to ask questions to you, the community.{Environment.NewLine}{Environment.NewLine}" + $"DISCORD INTEGRATION{Environment.NewLine}" + $"- Added Discord-RPC support.{Environment.NewLine}" + @@ -116,7 +117,7 @@ public sealed partial class UIChangelog : UserControl $"- Added anonym analytics for the EAM-usage.{Environment.NewLine}" + $"- Any data collected is anonym and does NOT contain login informations.{Environment.NewLine}" + $"- All collected data is sent encrypted (SSL) to the server.{Environment.NewLine}" + - $"- All collected data is used for improving EAM and it's features.{Environment.NewLine}" + + $"- All collected data is used for improving EAM and it's features.{Environment.NewLine}" + $"- You can choose to send no clientId or opt-out in the options.{Environment.NewLine}{Environment.NewLine}" + $"EAM MICROSERVICE{Environment.NewLine}" + $"- Added an REST-API that is running on a VPS.{Environment.NewLine}" + @@ -141,7 +142,7 @@ public sealed partial class UIChangelog : UserControl }, new ChangelogEntry() { ReleaseDate = new DateTime(2022, 02, 26), - Version = new Version(3, 0, 0), + Version = new Version(3, 0, 0), Name = "Complete overhaul, Muledump Replica: Vault Peeker and more", Description = $"COMPLETE OVERHAUL{Environment.NewLine}{Environment.NewLine}" + $"- Completely changed the UI.{Environment.NewLine}" + @@ -153,7 +154,7 @@ public sealed partial class UIChangelog : UserControl $"   Vault Peeker is limited to 50 accounts.{Environment.NewLine}" + $"- Improved performance a lot.{Environment.NewLine}{Environment.NewLine}" + $"MODULES{Environment.NewLine}" + - $"- Simple collection of all important tools.{Environment.NewLine}{Environment.NewLine}" + + $"- Simple collection of all important tools.{Environment.NewLine}{Environment.NewLine}" + $"IMPORT & EXPORT{Environment.NewLine}" + $"- Added a custom Importer for text-based formats.{Environment.NewLine}" + $"- Added a custom Exporter, to export your accounts as needed.{Environment.NewLine}" + @@ -312,7 +313,7 @@ public UIChangelog(FrmMain _frm) dataGridView.Columns[0].SortMode = DataGridViewColumnSortMode.Automatic; dataGridView.MouseWheel += dataGridView_MouseWheel; eleChangelog = new Elements.EleChangelog(frm); - + frm.ThemeChanged += ApplyTheme; ApplyTheme(frm, null); From ae4c16a90d90d08e43689547bb061446a6f063a1 Mon Sep 17 00:00:00 2001 From: MaikEight Date: Sat, 14 Oct 2023 22:01:44 +0200 Subject: [PATCH 10/10] =?UTF-8?q?=F0=9F=94=96Updated=20NotificationMessage?= =?UTF-8?q?=20for=20EAM=203.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NotificationMessages/EAMNotificationMessage.2_2_3 | 4 ++-- NotificationMessages/EAMNotificationMessage.3_0_0 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NotificationMessages/EAMNotificationMessage.2_2_3 b/NotificationMessages/EAMNotificationMessage.2_2_3 index 7311609e..6e0089c1 100644 --- a/NotificationMessages/EAMNotificationMessage.2_2_3 +++ b/NotificationMessages/EAMNotificationMessage.2_2_3 @@ -1,7 +1,7 @@ { - "id":4, + "id":5, "type":1, - "message":"Version 3.2.0 is now available, it includes: Captcha Aid improvements, discord update and bug fixes!", + "message":"Version 3.3.0 is now available, it includes: Captcha Aid improvements, discord update and many bug fixes!", "link":"https://github.com/MaikEight/ExaltAccountManager/releases/latest", "linkM":"https://github.com/MaikEight/ExaltAccountManager/releases/latest", "forceShow":true diff --git a/NotificationMessages/EAMNotificationMessage.3_0_0 b/NotificationMessages/EAMNotificationMessage.3_0_0 index e0301a49..3d2ff14d 100644 --- a/NotificationMessages/EAMNotificationMessage.3_0_0 +++ b/NotificationMessages/EAMNotificationMessage.3_0_0 @@ -1,7 +1,7 @@ { - "id":5, + "id":6, "type":1, - "message":"Version 3.2.0 is now available, it includes: Captcha Aid improvements, discord update and bug fixes!", + "message":"Version 3.3.0 is now available, it includes: Captcha Aid improvements, discord update and many bug fixes!", "link":"https://github.com/MaikEight/ExaltAccountManager/releases/latest", "linkM":"https://github.com/MaikEight/ExaltAccountManager/releases/latest", "forceShow":true