diff --git a/ScreenCaptureLib/Forms/RegionCapturePreview.Designer.cs b/ScreenCaptureLib/Forms/RegionCapturePreview.Designer.cs index 1ec80f7a5..30240640a 100644 --- a/ScreenCaptureLib/Forms/RegionCapturePreview.Designer.cs +++ b/ScreenCaptureLib/Forms/RegionCapturePreview.Designer.cs @@ -88,7 +88,7 @@ private void InitializeComponent() this.tsbWindowRectangle.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbWindowRectangle.Name = "tsbWindowRectangle"; this.tsbWindowRectangle.Size = new System.Drawing.Size(139, 20); - this.tsbWindowRectangle.Text = "Window && Rectangle"; + this.tsbWindowRectangle.Text = "Window and Rectangle"; this.tsbWindowRectangle.Click += new System.EventHandler(this.tsbWindowRectangle_Click); // // tsbRectangle diff --git a/ShareX/Enums.cs b/ShareX/Enums.cs index db91a8210..23cd836b7 100644 --- a/ShareX/Enums.cs +++ b/ShareX/Enums.cs @@ -132,7 +132,7 @@ public enum HotkeyType ClipboardUploadWithContentViewer, [Description("File upload")] FileUpload, - [Description("Drag & drop upload")] + [Description("Drag and drop upload")] DragDropUpload, [Description("Capture entire screen")] PrintScreen, diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs index 207cf8d07..0acc1c72c 100644 --- a/ShareX/Forms/MainForm.Designer.cs +++ b/ShareX/Forms/MainForm.Designer.cs @@ -49,6 +49,7 @@ private void InitializeComponent() this.tsmiLastRegion = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiScreenRecorder = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiAutoCapture = new System.Windows.Forms.ToolStripMenuItem(); + this.tsddbWorkflows = new System.Windows.Forms.ToolStripDropDownButton(); this.tsddbAfterCaptureTasks = new System.Windows.Forms.ToolStripDropDownButton(); this.tsddbAfterUploadTasks = new System.Windows.Forms.ToolStripDropDownButton(); this.tsddbDestinations = new System.Windows.Forms.ToolStripDropDownButton(); @@ -218,6 +219,7 @@ private void InitializeComponent() this.tsbFileUpload, this.tsbDragDropUpload, this.tsddbCapture, + this.tsddbWorkflows, this.tsddbAfterCaptureTasks, this.tsddbAfterUploadTasks, this.tsddbDestinations, @@ -239,7 +241,7 @@ private void InitializeComponent() this.tsMain.Name = "tsMain"; this.tsMain.Padding = new System.Windows.Forms.Padding(6); this.tsMain.ShowItemToolTips = false; - this.tsMain.Size = new System.Drawing.Size(160, 452); + this.tsMain.Size = new System.Drawing.Size(160, 474); this.tsMain.TabIndex = 0; // // tsbClipboardUpload @@ -269,7 +271,7 @@ private void InitializeComponent() this.tsbDragDropUpload.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbDragDropUpload.Name = "tsbDragDropUpload"; this.tsbDragDropUpload.Size = new System.Drawing.Size(147, 20); - this.tsbDragDropUpload.Text = "Drag && drop upload..."; + this.tsbDragDropUpload.Text = "Drag and drop upload..."; this.tsbDragDropUpload.Click += new System.EventHandler(this.tsbDragDropUpload_Click); // // tsddbCapture @@ -407,6 +409,15 @@ private void InitializeComponent() this.tsmiAutoCapture.Text = "Auto capture..."; this.tsmiAutoCapture.Click += new System.EventHandler(this.tsmiAutoCapture_Click); // + // tsddbWorkflows + // + this.tsddbWorkflows.Image = global::ShareX.Properties.Resources.application_wave; + this.tsddbWorkflows.ImageAlign = System.Drawing.ContentAlignment.BottomLeft; + this.tsddbWorkflows.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsddbWorkflows.Name = "tsddbWorkflows"; + this.tsddbWorkflows.Size = new System.Drawing.Size(147, 20); + this.tsddbWorkflows.Text = "Workflows"; + // // tsddbAfterCaptureTasks // this.tsddbAfterCaptureTasks.Image = global::ShareX.Properties.Resources.image_export; @@ -758,7 +769,7 @@ private void InitializeComponent() // scMain.Panel2 // this.scMain.Panel2.Controls.Add(this.pbPreview); - this.scMain.Size = new System.Drawing.Size(784, 452); + this.scMain.Size = new System.Drawing.Size(784, 474); this.scMain.SplitterDistance = 400; this.scMain.SplitterWidth = 6; this.scMain.TabIndex = 1; @@ -775,7 +786,7 @@ private void InitializeComponent() this.lblDragAndDropTip.Location = new System.Drawing.Point(8, 92); this.lblDragAndDropTip.Name = "lblDragAndDropTip"; this.lblDragAndDropTip.Padding = new System.Windows.Forms.Padding(30, 20, 30, 30); - this.lblDragAndDropTip.Size = new System.Drawing.Size(384, 268); + this.lblDragAndDropTip.Size = new System.Drawing.Size(384, 290); this.lblDragAndDropTip.TabIndex = 2; this.lblDragAndDropTip.Text = "You can drag and drop files to this window"; this.lblDragAndDropTip.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -787,7 +798,7 @@ private void InitializeComponent() this.lblSplitter.Dock = System.Windows.Forms.DockStyle.Left; this.lblSplitter.Location = new System.Drawing.Point(0, 0); this.lblSplitter.Name = "lblSplitter"; - this.lblSplitter.Size = new System.Drawing.Size(1, 452); + this.lblSplitter.Size = new System.Drawing.Size(1, 474); this.lblSplitter.TabIndex = 0; // // lvUploads @@ -812,7 +823,7 @@ private void InitializeComponent() this.lvUploads.Location = new System.Drawing.Point(0, 0); this.lvUploads.Name = "lvUploads"; this.lvUploads.ShowItemToolTips = true; - this.lvUploads.Size = new System.Drawing.Size(400, 452); + this.lvUploads.Size = new System.Drawing.Size(400, 474); this.lvUploads.TabIndex = 1; this.lvUploads.UseCompatibleStateImageBehavior = false; this.lvUploads.View = System.Windows.Forms.View.Details; @@ -874,7 +885,7 @@ private void InitializeComponent() this.pbPreview.FullscreenOnClick = true; this.pbPreview.Location = new System.Drawing.Point(0, 0); this.pbPreview.Name = "pbPreview"; - this.pbPreview.Size = new System.Drawing.Size(378, 452); + this.pbPreview.Size = new System.Drawing.Size(378, 474); this.pbPreview.TabIndex = 0; // // cmsUploadInfo @@ -1286,7 +1297,7 @@ private void InitializeComponent() this.tsmiTrayDragDropUpload.Image = global::ShareX.Properties.Resources.inbox_plus; this.tsmiTrayDragDropUpload.Name = "tsmiTrayDragDropUpload"; this.tsmiTrayDragDropUpload.Size = new System.Drawing.Size(189, 22); - this.tsmiTrayDragDropUpload.Text = "Drag && drop upload..."; + this.tsmiTrayDragDropUpload.Text = "Drag and drop upload..."; this.tsmiTrayDragDropUpload.Click += new System.EventHandler(this.tsbDragDropUpload_Click); // // tsmiTrayCapture @@ -1688,7 +1699,7 @@ private void InitializeComponent() this.AllowDrop = true; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(944, 452); + this.ClientSize = new System.Drawing.Size(944, 474); this.Controls.Add(this.scMain); this.Controls.Add(this.tsMain); this.DoubleBuffered = true; @@ -1884,5 +1895,6 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem tsmiTrayFTPClient; private System.Windows.Forms.ToolStripMenuItem tsmiImageEditor; private System.Windows.Forms.ToolStripMenuItem tsmiTrayImageEditor; + private System.Windows.Forms.ToolStripDropDownButton tsddbWorkflows; } } \ No newline at end of file diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 6da2d60aa..59da385ed 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -110,6 +110,17 @@ private void InitControls() uim = new UploadInfoManager(lvUploads); } + private void UpdateWorkflowsMenu() + { + tsddbWorkflows.DropDownItems.Clear(); + Program.HotkeyManager.Hotkeys.ForEach(x => + { + ToolStripMenuItem tsmi = new ToolStripMenuItem(x.TaskSettings.Description); + tsmi.Click += (sender, e) => HandleHotkeys(x); + tsddbWorkflows.DropDownItems.Add(tsmi); + }); + } + private void UpdateDestinationStates() { if (Program.UploadersConfig != null) @@ -706,6 +717,7 @@ private void tsbHotkeySettings_Click(object sender, EventArgs e) hotkeySettingsForm.ShowDialog(); } + UpdateWorkflowsMenu(); Program.HotkeysConfig.SaveAsync(Program.HotkeysConfigFilePath); } diff --git a/ShareX/Forms/MainForm_Capture.cs b/ShareX/Forms/MainForm_Capture.cs index 97359b9af..0a0ff7685 100644 --- a/ShareX/Forms/MainForm_Capture.cs +++ b/ShareX/Forms/MainForm_Capture.cs @@ -56,6 +56,8 @@ private void InitHotkeys() Program.HotkeyManager.HotkeyTrigger += HandleHotkeys; DebugHelper.WriteLine("HotkeyManager started"); + UpdateWorkflowsMenu(); + Program.WatchFolderManager = new WatchFolderManager(); DebugHelper.WriteLine("WatchFolderManager started"); })); diff --git a/ShareX/HotkeySettings.cs b/ShareX/HotkeySettings.cs index 545b12fe4..052ccf4b1 100644 --- a/ShareX/HotkeySettings.cs +++ b/ShareX/HotkeySettings.cs @@ -50,8 +50,7 @@ public override string ToString() { if (HotkeyInfo != null && TaskSettings != null) { - return string.Format("Hotkey: {0}{1}, Job: {2}", HotkeyInfo, - !string.IsNullOrEmpty(TaskSettings.Description) ? ", Description: " + TaskSettings.Description : "", TaskSettings.Job); + return string.Format("Hotkey: {0}{1}, Job: {2}", HotkeyInfo, ", Description: " + TaskSettings.Description, TaskSettings.Job); } return string.Empty; diff --git a/ShareX/Properties/Resources.Designer.cs b/ShareX/Properties/Resources.Designer.cs index aa38eb9d9..3bc19630f 100644 --- a/ShareX/Properties/Resources.Designer.cs +++ b/ShareX/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.34011 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -160,6 +160,16 @@ public class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap application_wave { + get { + object obj = ResourceManager.GetObject("application-wave", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/ShareX/Properties/Resources.resx b/ShareX/Properties/Resources.resx index 48b8638cc..6137d94fc 100644 --- a/ShareX/Properties/Resources.resx +++ b/ShareX/Properties/Resources.resx @@ -172,9 +172,6 @@ ..\Resources\folder-open-image.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\navigation-090-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\layers-ungroup.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -199,6 +196,9 @@ ..\Resources\image-export.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\au.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\keyboard--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -208,6 +208,9 @@ ..\Resources\hammer.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Window.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Polygon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -232,6 +235,9 @@ ..\Resources\application-blue.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Greenshot.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Triangle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -241,9 +247,6 @@ ..\Resources\address-book-blue.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\block.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -271,6 +274,9 @@ ..\Resources\ruler-triangle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\navigation-090-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\upload-cloud.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -313,9 +319,6 @@ ..\Resources\folder-tree.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\clock--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\globe-share.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -328,11 +331,11 @@ ..\Resources\pipette.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Window.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\au.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\clock--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\checkbox_uncheck.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -356,7 +359,7 @@ ..\Resources\application-task.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Greenshot.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\application-wave.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/ShareX/Resources/application-wave.png b/ShareX/Resources/application-wave.png new file mode 100644 index 000000000..cce78c7ec Binary files /dev/null and b/ShareX/Resources/application-wave.png differ diff --git a/ShareX/ShareX.csproj b/ShareX/ShareX.csproj index c94ac1bb7..bffc98e07 100644 --- a/ShareX/ShareX.csproj +++ b/ShareX/ShareX.csproj @@ -497,6 +497,7 @@ 7z.dll PreserveNewest + diff --git a/ShareX/TaskSettings.cs b/ShareX/TaskSettings.cs index 3bdc561fb..a31f999f1 100644 --- a/ShareX/TaskSettings.cs +++ b/ShareX/TaskSettings.cs @@ -39,7 +39,18 @@ namespace ShareX { public class TaskSettings { - public string Description = string.Empty; + private string description = string.Empty; + public string Description + { + get + { + return !string.IsNullOrEmpty(description) ? description : Job.GetDescription(); + } + set + { + description = value; + } + } public HotkeyType Job = HotkeyType.None; public bool UseDefaultAfterCaptureJob = true;