upgrade ProgressUpdater to .net6
This commit is contained in:
@@ -3,10 +3,11 @@ using global::System.IO;
|
||||
using global::System.Net;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
using global::DevComponents.DotNetBar;
|
||||
using global::Newtonsoft.Json.Linq;
|
||||
using global::WebDav;
|
||||
using System.Drawing;
|
||||
using Telerik.WinControls.UI;
|
||||
using Telerik.WinControls;
|
||||
|
||||
namespace SM64_ROM_Manager.ProgressUpdater
|
||||
{
|
||||
@@ -51,7 +52,7 @@ namespace SM64_ROM_Manager.ProgressUpdater
|
||||
|
||||
private void LoadTextBoxes()
|
||||
{
|
||||
ComboBoxEx_Version.Text = settings.Version;
|
||||
RadDropDownList_Version.Text = settings.Version;
|
||||
}
|
||||
|
||||
private void SaveConfig()
|
||||
@@ -89,19 +90,19 @@ namespace SM64_ROM_Manager.ProgressUpdater
|
||||
if (dmgr is object && dmgr.IsReady)
|
||||
dmgr.Stop();
|
||||
dmgr = new DiscordMgr(settings);
|
||||
dmgr.GotReady += (_, __) => ButtonX_DiscordSetup.Enabled = true;
|
||||
dmgr.GotReady += (_, __) => RadButton_DiscordSetup.Enabled = true;
|
||||
dmgr.Start();
|
||||
}
|
||||
|
||||
private Task LoadWebDavMgr()
|
||||
{
|
||||
ButtonX_Upload.Enabled = false;
|
||||
RadButton_Upload.Enabled = false;
|
||||
return Task.Run(() =>
|
||||
{
|
||||
wdmgr = new WebDavMgr(settings);
|
||||
if (wdmgr.Connect())
|
||||
{
|
||||
Invoke(new Action(() => ButtonX_Upload.Enabled = true));
|
||||
Invoke(new Action(() => RadButton_Upload.Enabled = true));
|
||||
LoadUsedVersions();
|
||||
}
|
||||
});
|
||||
@@ -109,10 +110,10 @@ namespace SM64_ROM_Manager.ProgressUpdater
|
||||
|
||||
private async void LoadUsedVersions()
|
||||
{
|
||||
Invoke(new Action(() => ComboBoxEx_Version.Items.Clear()));
|
||||
Invoke(new Action(() => RadDropDownList_Version.Items.Clear()));
|
||||
|
||||
foreach (var version in await wdmgr.GetUsedVersions())
|
||||
Invoke(new Action(() => ComboBoxEx_Version.Items.Add(version)));
|
||||
Invoke(new Action(() => RadDropDownList_Version.Items.Add(version.ToString())));
|
||||
}
|
||||
|
||||
private void InvertImage()
|
||||
@@ -141,25 +142,27 @@ namespace SM64_ROM_Manager.ProgressUpdater
|
||||
|
||||
private async void ButtonX_Upload_Click(object sender, EventArgs e)
|
||||
{
|
||||
RadButton_Upload.Image = null;
|
||||
|
||||
if (settings.DiscordUploadEnabled && !dmgr.IsReady)
|
||||
{
|
||||
ToastNotification.Show(this, "Discord ist noch nicht bereit!", eToastGlowColor.Orange, eToastPosition.BottomCenter);
|
||||
RadMessageBox.Show(this, "Discord ist noch nicht bereit!", string.Empty, MessageBoxButtons.OK, RadMessageIcon.Error);
|
||||
}
|
||||
else
|
||||
{
|
||||
Enabled = false;
|
||||
circularProgress1.Start();
|
||||
radWaitingBar1.StartWaiting();
|
||||
if (await wdmgr.UploadImage(PictureBox1.Image))
|
||||
{
|
||||
if (dmgr is object && dmgr.IsReady)
|
||||
await dmgr.SendMessage();
|
||||
ToastNotification.Show(this, "Erfolgreich hochgeladen!", eToastGlowColor.Green, eToastPosition.BottomCenter);
|
||||
RadButton_Upload.Image = MySymbols.icons8_ok_32px_4;
|
||||
}
|
||||
else
|
||||
{
|
||||
ToastNotification.Show(this, "Fehler beim Hochladen!", eToastGlowColor.Orange, eToastPosition.BottomCenter);
|
||||
RadMessageBox.Show(this, "Fehler beim Hochladen!", string.Empty, MessageBoxButtons.OK, RadMessageIcon.Error);
|
||||
}
|
||||
circularProgress1.Stop();
|
||||
radWaitingBar1.StopWaiting();
|
||||
Enabled = true;
|
||||
}
|
||||
}
|
||||
@@ -179,7 +182,7 @@ namespace SM64_ROM_Manager.ProgressUpdater
|
||||
|
||||
private void TextBoxX_Version_TextChanged(object sender, EventArgs e)
|
||||
{
|
||||
settings.Version = ComboBoxEx_Version.Text.Trim();
|
||||
settings.Version = RadDropDownList_Version.Text.Trim();
|
||||
}
|
||||
|
||||
private void ButtonX_DiscordSetup_Click(object sender, EventArgs e)
|
||||
@@ -208,4 +211,4 @@ namespace SM64_ROM_Manager.ProgressUpdater
|
||||
InvertImage();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user