From 40cb1ab14dcc3b9dd63b68d0231dd9ab5470ac4f Mon Sep 17 00:00:00 2001 From: Serraniel Date: Sun, 25 Mar 2018 23:44:33 +0200 Subject: [PATCH 1/3] Added an option to set online state. Refresh timer added as it was required to display correct information in UI --- .../MainForm.Designer.cs | 89 +++++++++++++++---- Discord Media Loader.Application/MainForm.cs | 55 +++++++++++- .../MainForm.resx | 3 + 3 files changed, 130 insertions(+), 17 deletions(-) diff --git a/Discord Media Loader.Application/MainForm.Designer.cs b/Discord Media Loader.Application/MainForm.Designer.cs index 4b17af7..d3ea045 100644 --- a/Discord Media Loader.Application/MainForm.Designer.cs +++ b/Discord Media Loader.Application/MainForm.Designer.cs @@ -57,6 +57,12 @@ this.btnDelete = new System.Windows.Forms.Button(); this.lbxJobs = new System.Windows.Forms.ListBox(); this.tmrRefreshProgress = new System.Windows.Forms.Timer(this.components); + this.lbStatus = new System.Windows.Forms.ToolStripDropDownButton(); + this.onlineToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.doNotDenyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.doNotDisturbToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.invisibleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.tmrTriggerRefresh = new System.Windows.Forms.Timer(this.components); this.pnlSettings.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.edThreadLimit)).BeginInit(); this.groupBox1.SuspendLayout(); @@ -77,7 +83,7 @@ this.pnlSettings.Dock = System.Windows.Forms.DockStyle.Top; this.pnlSettings.Location = new System.Drawing.Point(0, 0); this.pnlSettings.Name = "pnlSettings"; - this.pnlSettings.Size = new System.Drawing.Size(553, 93); + this.pnlSettings.Size = new System.Drawing.Size(690, 93); this.pnlSettings.TabIndex = 0; this.pnlSettings.TabStop = false; this.pnlSettings.Text = "Settings"; @@ -113,7 +119,7 @@ // this.cbSkipExisting.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.cbSkipExisting.AutoSize = true; - this.cbSkipExisting.Location = new System.Drawing.Point(447, 42); + this.cbSkipExisting.Location = new System.Drawing.Point(584, 42); this.cbSkipExisting.Name = "cbSkipExisting"; this.cbSkipExisting.Size = new System.Drawing.Size(106, 17); this.cbSkipExisting.TabIndex = 5; @@ -127,7 +133,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.edNameScheme.Location = new System.Drawing.Point(113, 39); this.edNameScheme.Name = "edNameScheme"; - this.edNameScheme.Size = new System.Drawing.Size(328, 20); + this.edNameScheme.Size = new System.Drawing.Size(465, 20); this.edNameScheme.TabIndex = 4; this.edNameScheme.TextChanged += new System.EventHandler(this.DoSomethingChanged); // @@ -143,7 +149,7 @@ // btnSearchFolders // this.btnSearchFolders.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnSearchFolders.Location = new System.Drawing.Point(522, 11); + this.btnSearchFolders.Location = new System.Drawing.Point(659, 11); this.btnSearchFolders.Name = "btnSearchFolders"; this.btnSearchFolders.Size = new System.Drawing.Size(25, 23); this.btnSearchFolders.TabIndex = 2; @@ -157,7 +163,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.edOperatingFolder.Location = new System.Drawing.Point(113, 13); this.edOperatingFolder.Name = "edOperatingFolder"; - this.edOperatingFolder.Size = new System.Drawing.Size(403, 20); + this.edOperatingFolder.Size = new System.Drawing.Size(540, 20); this.edOperatingFolder.TabIndex = 1; this.edOperatingFolder.TextChanged += new System.EventHandler(this.DoSomethingChanged); // @@ -180,7 +186,7 @@ this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top; this.groupBox1.Location = new System.Drawing.Point(0, 93); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(553, 57); + this.groupBox1.Size = new System.Drawing.Size(690, 57); this.groupBox1.TabIndex = 1; this.groupBox1.TabStop = false; this.groupBox1.Text = "Add a job"; @@ -188,7 +194,7 @@ // btnAddJob // this.btnAddJob.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnAddJob.Location = new System.Drawing.Point(481, 19); + this.btnAddJob.Location = new System.Drawing.Point(618, 19); this.btnAddJob.Name = "btnAddJob"; this.btnAddJob.Size = new System.Drawing.Size(66, 23); this.btnAddJob.TabIndex = 4; @@ -203,7 +209,7 @@ this.cbChannel.FormattingEnabled = true; this.cbChannel.Location = new System.Drawing.Point(294, 19); this.cbChannel.Name = "cbChannel"; - this.cbChannel.Size = new System.Drawing.Size(181, 21); + this.cbChannel.Size = new System.Drawing.Size(318, 21); this.cbChannel.TabIndex = 3; // // lbChannel @@ -236,14 +242,15 @@ // statusStrip // this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.lbStatus, this.pgbProgress, this.lbProgress, this.lblVersionPlaceholder, this.lbVersion, this.btnDropDown}); - this.statusStrip.Location = new System.Drawing.Point(0, 311); + this.statusStrip.Location = new System.Drawing.Point(0, 393); this.statusStrip.Name = "statusStrip"; - this.statusStrip.Size = new System.Drawing.Size(553, 22); + this.statusStrip.Size = new System.Drawing.Size(690, 22); this.statusStrip.TabIndex = 2; this.statusStrip.Text = "statusStrip1"; // @@ -260,7 +267,7 @@ // lblVersionPlaceholder // this.lblVersionPlaceholder.Name = "lblVersionPlaceholder"; - this.lblVersionPlaceholder.Size = new System.Drawing.Size(302, 17); + this.lblVersionPlaceholder.Size = new System.Drawing.Size(426, 17); this.lblVersionPlaceholder.Spring = true; // // lbVersion @@ -301,7 +308,7 @@ this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox2.Location = new System.Drawing.Point(0, 150); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(553, 161); + this.groupBox2.Size = new System.Drawing.Size(690, 243); this.groupBox2.TabIndex = 3; this.groupBox2.TabStop = false; this.groupBox2.Text = "Jobs"; @@ -309,9 +316,9 @@ // btnDelete // this.btnDelete.Dock = System.Windows.Forms.DockStyle.Bottom; - this.btnDelete.Location = new System.Drawing.Point(3, 135); + this.btnDelete.Location = new System.Drawing.Point(3, 217); this.btnDelete.Name = "btnDelete"; - this.btnDelete.Size = new System.Drawing.Size(547, 23); + this.btnDelete.Size = new System.Drawing.Size(684, 23); this.btnDelete.TabIndex = 1; this.btnDelete.Text = "Delete selected"; this.btnDelete.UseVisualStyleBackColor = true; @@ -325,7 +332,7 @@ this.lbxJobs.FormattingEnabled = true; this.lbxJobs.Location = new System.Drawing.Point(6, 19); this.lbxJobs.Name = "lbxJobs"; - this.lbxJobs.Size = new System.Drawing.Size(541, 108); + this.lbxJobs.Size = new System.Drawing.Size(678, 186); this.lbxJobs.TabIndex = 0; // // tmrRefreshProgress @@ -334,11 +341,55 @@ this.tmrRefreshProgress.Interval = 500; this.tmrRefreshProgress.Tick += new System.EventHandler(this.tmrRefreshProgress_Tick); // + // lbStatus + // + this.lbStatus.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.invisibleToolStripMenuItem, + this.doNotDisturbToolStripMenuItem, + this.doNotDenyToolStripMenuItem, + this.onlineToolStripMenuItem}); + this.lbStatus.Name = "lbStatus"; + this.lbStatus.Size = new System.Drawing.Size(13, 20); + this.lbStatus.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.toolStripDropDownButton1_DropDownItemClicked); + // + // onlineToolStripMenuItem + // + this.onlineToolStripMenuItem.Name = "onlineToolStripMenuItem"; + this.onlineToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.onlineToolStripMenuItem.Tag = "0"; + this.onlineToolStripMenuItem.Text = "Online"; + // + // doNotDenyToolStripMenuItem + // + this.doNotDenyToolStripMenuItem.Name = "doNotDenyToolStripMenuItem"; + this.doNotDenyToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.doNotDenyToolStripMenuItem.Tag = "1"; + this.doNotDenyToolStripMenuItem.Text = "Idle"; + // + // doNotDisturbToolStripMenuItem + // + this.doNotDisturbToolStripMenuItem.Name = "doNotDisturbToolStripMenuItem"; + this.doNotDisturbToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.doNotDisturbToolStripMenuItem.Tag = "2"; + this.doNotDisturbToolStripMenuItem.Text = "Do not disturb"; + // + // invisibleToolStripMenuItem + // + this.invisibleToolStripMenuItem.Name = "invisibleToolStripMenuItem"; + this.invisibleToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.invisibleToolStripMenuItem.Tag = "3"; + this.invisibleToolStripMenuItem.Text = "Invisible"; + // + // tmrTriggerRefresh + // + this.tmrTriggerRefresh.Interval = 5000; + this.tmrTriggerRefresh.Tick += new System.EventHandler(this.tmrTriggerRefresh_Tick); + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(553, 333); + this.ClientSize = new System.Drawing.Size(690, 415); this.Controls.Add(this.groupBox2); this.Controls.Add(this.statusStrip); this.Controls.Add(this.groupBox1); @@ -391,5 +442,11 @@ private System.Windows.Forms.ToolStripSplitButton btnDropDown; private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem visitGithubToolStripMenuItem; + private System.Windows.Forms.ToolStripDropDownButton lbStatus; + private System.Windows.Forms.ToolStripMenuItem invisibleToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem doNotDisturbToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem doNotDenyToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem onlineToolStripMenuItem; + private System.Windows.Forms.Timer tmrTriggerRefresh; } } \ No newline at end of file diff --git a/Discord Media Loader.Application/MainForm.cs b/Discord Media Loader.Application/MainForm.cs index 20b91ba..2142fda 100644 --- a/Discord Media Loader.Application/MainForm.cs +++ b/Discord Media Loader.Application/MainForm.cs @@ -2,7 +2,9 @@ using System.Diagnostics; using System.Linq; using System.Reflection; +using System.Threading.Tasks; using System.Windows.Forms; +using Discord; using Discord.WebSocket; using DML.AppCore.Classes; using DML.Application.Classes; @@ -11,6 +13,13 @@ using static SweetLib.Utils.Logger.Logger; namespace DML.Application { + enum OnlineState + { + Online, + Idle, + DoNotDisturb, + Invisible + } public partial class MainForm : Form { private bool IsInitialized { get; set; } = false; @@ -31,7 +40,7 @@ namespace DML.Application { Debug("Refreshing components..."); - lbVersion.Text = $"v{Assembly.GetExecutingAssembly().GetName().Version} Copyright © by Serraniel"; + lbVersion.Text = $"v{Assembly.GetExecutingAssembly().GetName().Version} Copyright © by Serraniel"; Trace("Refreshing operating folder component..."); edOperatingFolder.Text = Core.Settings.OperatingFolder; @@ -62,6 +71,8 @@ namespace DML.Application $"{FindServerById(job.GuildId)?.Name}:{FindChannelById(FindServerById(job.GuildId), job.ChannelId)?.Name}"); } lbxJobs.SelectedIndex = oldIndex; + + lbStatus.Text = DMLClient.Client.CurrentUser.Status.ToString(); } private void DoSomethingChanged(object sender, System.EventArgs e) @@ -248,5 +259,47 @@ namespace DML.Application { Process.Start("https://github.com/Serraniel/DiscordMediaLoader/"); } + + private async void toolStripDropDownButton1_DropDownItemClicked(object sender, ToolStripItemClickedEventArgs e) + { + + + /* + * var uiScheduler = TaskScheduler.FromCurrentSynchronizationContext(); + Task.Factory.StartNew(delegate { DoBackgroundComputation(); }, + backgroundScheduler). + ContinueWith(delegate { UpdateUI(); }, uiScheduler). + */ + + var backgroundScheduler = TaskScheduler.Default; + var uiScheduler = TaskScheduler.FromCurrentSynchronizationContext(); + + OnlineState state = (OnlineState)Convert.ToInt32(e.ClickedItem.Tag); + + lbStatus.Text = state.ToString(); + tmrTriggerRefresh.Start(); + + switch (state) + { + case OnlineState.Online: + await DMLClient.Client.SetStatusAsync(UserStatus.Online); + break; + case OnlineState.Idle: + await DMLClient.Client.SetStatusAsync(UserStatus.Idle); + break; + case OnlineState.DoNotDisturb: + await DMLClient.Client.SetStatusAsync(UserStatus.DoNotDisturb); + break; + case OnlineState.Invisible: + await DMLClient.Client.SetStatusAsync(UserStatus.Invisible); + break; + } + } + + private void tmrTriggerRefresh_Tick(object sender, EventArgs e) + { + lbStatus.Text = DMLClient.Client.CurrentUser.Status.ToString(); + tmrTriggerRefresh.Stop(); + } } } diff --git a/Discord Media Loader.Application/MainForm.resx b/Discord Media Loader.Application/MainForm.resx index 7c9ffe0..ef73655 100644 --- a/Discord Media Loader.Application/MainForm.resx +++ b/Discord Media Loader.Application/MainForm.resx @@ -123,6 +123,9 @@ 126, 17 + + 284, 17 + From 7698c55da177b2b991d74ce8c9a552548e64a3a8 Mon Sep 17 00:00:00 2001 From: Serraniel Date: Sun, 25 Mar 2018 23:46:46 +0200 Subject: [PATCH 2/3] Build --- Discord Media Loader.Application/Properties/AssemblyInfo.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Discord Media Loader.Application/Properties/AssemblyInfo.cs b/Discord Media Loader.Application/Properties/AssemblyInfo.cs index 4b8ecc9..1e11210 100644 --- a/Discord Media Loader.Application/Properties/AssemblyInfo.cs +++ b/Discord Media Loader.Application/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.2.0")] -[assembly: AssemblyFileVersion("1.0.2.0")] +[assembly: AssemblyVersion("1.1.0.0")] +[assembly: AssemblyFileVersion("1.1.0.0")] From cbad923333c69caccde6b9bb49297cb36b35a77e Mon Sep 17 00:00:00 2001 From: Serraniel Date: Mon, 26 Mar 2018 00:01:03 +0200 Subject: [PATCH 3/3] Removed unneccasry parts of code --- Discord Media Loader.Application/MainForm.cs | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Discord Media Loader.Application/MainForm.cs b/Discord Media Loader.Application/MainForm.cs index 2142fda..59ccd1c 100644 --- a/Discord Media Loader.Application/MainForm.cs +++ b/Discord Media Loader.Application/MainForm.cs @@ -262,18 +262,6 @@ namespace DML.Application private async void toolStripDropDownButton1_DropDownItemClicked(object sender, ToolStripItemClickedEventArgs e) { - - - /* - * var uiScheduler = TaskScheduler.FromCurrentSynchronizationContext(); - Task.Factory.StartNew(delegate { DoBackgroundComputation(); }, - backgroundScheduler). - ContinueWith(delegate { UpdateUI(); }, uiScheduler). - */ - - var backgroundScheduler = TaskScheduler.Default; - var uiScheduler = TaskScheduler.FromCurrentSynchronizationContext(); - OnlineState state = (OnlineState)Convert.ToInt32(e.ClickedItem.Tag); lbStatus.Text = state.ToString();