From 81f586823235fb7f1b1c30509fb2764a1a163c1d Mon Sep 17 00:00:00 2001 From: Luke Anderson Date: Wed, 1 Nov 2017 20:36:07 +1030 Subject: [PATCH] Use Accept and Cancellation buttons where appropriate --- ShareX.HelpersLib/Colors/GradientPickerForm.Designer.cs | 2 ++ ShareX.HelpersLib/DNS/DNSChangerForm.Designer.cs | 2 ++ ShareX.HelpersLib/Forms/ClipboardContentViewer.Designer.cs | 1 + ShareX.HelpersLib/Forms/ErrorForm.Designer.cs | 2 ++ ShareX.HelpersLib/Printer/PrintForm.Designer.cs | 2 ++ ShareX.ImageEffectsLib/ImageEffectsForm.Designer.cs | 1 + ShareX.MediaLib/Forms/ImageCombinerForm.Designer.cs | 1 + ShareX.MediaLib/Forms/ImageThumbnailerForm.Designer.cs | 1 + ShareX.ScreenCaptureLib/Forms/CanvasSizeForm.Designer.cs | 2 ++ ShareX.ScreenCaptureLib/Forms/ImageSizeForm.Designer.cs | 2 ++ ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.Designer.cs | 1 + ShareX.UploadersLib/Forms/PuushLoginForm.Designer.cs | 1 + ShareX.UploadersLib/Forms/TwitterTweetForm.Designer.cs | 2 ++ ShareX/Forms/ActionsForm.Designer.cs | 1 + ShareX/Forms/AfterUploadForm.designer.cs | 1 + ShareX/Forms/ClipboardFormatForm.Designer.cs | 2 ++ ShareX/Forms/EncoderProgramForm.Designer.cs | 1 + ShareX/Forms/QuickTaskMenuEditorForm.Designer.cs | 1 + ShareX/Forms/TextUploadForm.Designer.cs | 2 ++ ShareX/Forms/WatchFolderForm.Designer.cs | 1 + 20 files changed, 29 insertions(+) diff --git a/ShareX.HelpersLib/Colors/GradientPickerForm.Designer.cs b/ShareX.HelpersLib/Colors/GradientPickerForm.Designer.cs index 4abd7c15a..70456247c 100644 --- a/ShareX.HelpersLib/Colors/GradientPickerForm.Designer.cs +++ b/ShareX.HelpersLib/Colors/GradientPickerForm.Designer.cs @@ -139,9 +139,11 @@ private void InitializeComponent() // // GradientPickerForm // + this.AcceptButton = this.btnOK; resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Window; + this.CancelButton = this.btnCancel; this.Controls.Add(this.pbPreview); this.Controls.Add(this.lblPreview); this.Controls.Add(this.btnCancel); diff --git a/ShareX.HelpersLib/DNS/DNSChangerForm.Designer.cs b/ShareX.HelpersLib/DNS/DNSChangerForm.Designer.cs index 7ea57c4b9..ce631269f 100644 --- a/ShareX.HelpersLib/DNS/DNSChangerForm.Designer.cs +++ b/ShareX.HelpersLib/DNS/DNSChangerForm.Designer.cs @@ -129,9 +129,11 @@ private void InitializeComponent() // // DNSChangerForm // + this.AcceptButton = this.btnSave; resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Window; + this.CancelButton = this.btnCancel; this.Controls.Add(this.btnPingSecondary); this.Controls.Add(this.btnPingPrimary); this.Controls.Add(this.cbAutomatic); diff --git a/ShareX.HelpersLib/Forms/ClipboardContentViewer.Designer.cs b/ShareX.HelpersLib/Forms/ClipboardContentViewer.Designer.cs index 0aaa4d464..007553665 100644 --- a/ShareX.HelpersLib/Forms/ClipboardContentViewer.Designer.cs +++ b/ShareX.HelpersLib/Forms/ClipboardContentViewer.Designer.cs @@ -94,6 +94,7 @@ private void InitializeComponent() resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Window; + this.CancelButton = this.btnCancel; this.Controls.Add(this.pbClipboard); this.Controls.Add(this.cbDontShowThisWindow); this.Controls.Add(this.btnCancel); diff --git a/ShareX.HelpersLib/Forms/ErrorForm.Designer.cs b/ShareX.HelpersLib/Forms/ErrorForm.Designer.cs index 4badcb761..31d58cb76 100644 --- a/ShareX.HelpersLib/Forms/ErrorForm.Designer.cs +++ b/ShareX.HelpersLib/Forms/ErrorForm.Designer.cs @@ -103,9 +103,11 @@ private void InitializeComponent() // // ErrorForm // + this.AcceptButton = this.btnContinue; resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Window; + this.CancelButton = this.btnClose; this.Controls.Add(this.lblErrorMessage); this.Controls.Add(this.flpMenu); this.Controls.Add(this.txtException); diff --git a/ShareX.HelpersLib/Printer/PrintForm.Designer.cs b/ShareX.HelpersLib/Printer/PrintForm.Designer.cs index b6b0ea54f..8230b73cc 100644 --- a/ShareX.HelpersLib/Printer/PrintForm.Designer.cs +++ b/ShareX.HelpersLib/Printer/PrintForm.Designer.cs @@ -100,9 +100,11 @@ private void InitializeComponent() // // PrintForm // + this.AcceptButton = this.btnPrint; resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Window; + this.CancelButton = this.btnCancel; this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnPrint); this.Controls.Add(this.btnShowPreview); diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.Designer.cs b/ShareX.ImageEffectsLib/ImageEffectsForm.Designer.cs index 77ac6df02..b2addbbe8 100644 --- a/ShareX.ImageEffectsLib/ImageEffectsForm.Designer.cs +++ b/ShareX.ImageEffectsLib/ImageEffectsForm.Designer.cs @@ -231,6 +231,7 @@ private void InitializeComponent() resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Window; + this.CancelButton = this.btnClose; this.Controls.Add(this.btnClose); this.Controls.Add(this.txtPresetName); this.Controls.Add(this.lblPresetName); diff --git a/ShareX.MediaLib/Forms/ImageCombinerForm.Designer.cs b/ShareX.MediaLib/Forms/ImageCombinerForm.Designer.cs index 56bdcd984..107a50d0b 100644 --- a/ShareX.MediaLib/Forms/ImageCombinerForm.Designer.cs +++ b/ShareX.MediaLib/Forms/ImageCombinerForm.Designer.cs @@ -135,6 +135,7 @@ private void InitializeComponent() // // ImageCombinerForm // + this.AcceptButton = this.btnCombine; this.AllowDrop = true; resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; diff --git a/ShareX.MediaLib/Forms/ImageThumbnailerForm.Designer.cs b/ShareX.MediaLib/Forms/ImageThumbnailerForm.Designer.cs index 54bbdd900..f48d8a721 100644 --- a/ShareX.MediaLib/Forms/ImageThumbnailerForm.Designer.cs +++ b/ShareX.MediaLib/Forms/ImageThumbnailerForm.Designer.cs @@ -157,6 +157,7 @@ private void InitializeComponent() // // ImageThumbnailerForm // + this.AcceptButton = this.btnGenerate; resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.btnOutputFolder); diff --git a/ShareX.ScreenCaptureLib/Forms/CanvasSizeForm.Designer.cs b/ShareX.ScreenCaptureLib/Forms/CanvasSizeForm.Designer.cs index 05cf42f30..a9ca68296 100644 --- a/ShareX.ScreenCaptureLib/Forms/CanvasSizeForm.Designer.cs +++ b/ShareX.ScreenCaptureLib/Forms/CanvasSizeForm.Designer.cs @@ -141,9 +141,11 @@ private void InitializeComponent() // // CanvasSizeForm // + this.AcceptButton = this.btnOK; resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Window; + this.CancelButton = this.btnCancel; this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnOK); this.Controls.Add(this.lblBottom); diff --git a/ShareX.ScreenCaptureLib/Forms/ImageSizeForm.Designer.cs b/ShareX.ScreenCaptureLib/Forms/ImageSizeForm.Designer.cs index 4c53f7ac6..4cd3bdf79 100644 --- a/ShareX.ScreenCaptureLib/Forms/ImageSizeForm.Designer.cs +++ b/ShareX.ScreenCaptureLib/Forms/ImageSizeForm.Designer.cs @@ -107,9 +107,11 @@ private void InitializeComponent() // // ImageSizeForm // + this.AcceptButton = this.btnOK; resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Window; + this.CancelButton = this.btnCancel; this.Controls.Add(this.lblHeightPixels); this.Controls.Add(this.lblWidthPixels); this.Controls.Add(this.btnCancel); diff --git a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.Designer.cs b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.Designer.cs index 66c80b5f8..8354703d7 100644 --- a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.Designer.cs +++ b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.Designer.cs @@ -531,6 +531,7 @@ private void InitializeComponent() // // ScrollingCaptureForm // + this.AcceptButton = this.btnCapture; resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Window; diff --git a/ShareX.UploadersLib/Forms/PuushLoginForm.Designer.cs b/ShareX.UploadersLib/Forms/PuushLoginForm.Designer.cs index e28d59d43..5f226b57f 100644 --- a/ShareX.UploadersLib/Forms/PuushLoginForm.Designer.cs +++ b/ShareX.UploadersLib/Forms/PuushLoginForm.Designer.cs @@ -107,6 +107,7 @@ private void InitializeComponent() // // PuushLoginForm // + this.AcceptButton = this.btnLogin; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Window; diff --git a/ShareX.UploadersLib/Forms/TwitterTweetForm.Designer.cs b/ShareX.UploadersLib/Forms/TwitterTweetForm.Designer.cs index 567c32745..b568d611d 100644 --- a/ShareX.UploadersLib/Forms/TwitterTweetForm.Designer.cs +++ b/ShareX.UploadersLib/Forms/TwitterTweetForm.Designer.cs @@ -64,9 +64,11 @@ private void InitializeComponent() // // TwitterTweetForm // + this.AcceptButton = this.btnOK; resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Window; + this.CancelButton = this.btnCancel; this.Controls.Add(this.txtTweet); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnOK); diff --git a/ShareX/Forms/ActionsForm.Designer.cs b/ShareX/Forms/ActionsForm.Designer.cs index 04d00925e..32c585f8a 100644 --- a/ShareX/Forms/ActionsForm.Designer.cs +++ b/ShareX/Forms/ActionsForm.Designer.cs @@ -128,6 +128,7 @@ private void InitializeComponent() resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Window; + this.CancelButton = this.btnCancel; this.Controls.Add(this.cbHiddenWindow); this.Controls.Add(this.lblOutputExtension); this.Controls.Add(this.txtOutputExtension); diff --git a/ShareX/Forms/AfterUploadForm.designer.cs b/ShareX/Forms/AfterUploadForm.designer.cs index 13160a325..7240f6dca 100644 --- a/ShareX/Forms/AfterUploadForm.designer.cs +++ b/ShareX/Forms/AfterUploadForm.designer.cs @@ -129,6 +129,7 @@ private void InitializeComponent() resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Window; + this.CancelButton = this.btnClose; this.Controls.Add(this.lvClipboardFormats); this.Controls.Add(this.btnClose); this.Controls.Add(this.btnOpenLink); diff --git a/ShareX/Forms/ClipboardFormatForm.Designer.cs b/ShareX/Forms/ClipboardFormatForm.Designer.cs index 394a5a17b..873cf5073 100644 --- a/ShareX/Forms/ClipboardFormatForm.Designer.cs +++ b/ShareX/Forms/ClipboardFormatForm.Designer.cs @@ -79,9 +79,11 @@ private void InitializeComponent() // // ClipboardFormatForm // + this.AcceptButton = this.btnOK; resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Window; + this.CancelButton = this.btnCancel; this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnOK); this.Controls.Add(this.lblExample); diff --git a/ShareX/Forms/EncoderProgramForm.Designer.cs b/ShareX/Forms/EncoderProgramForm.Designer.cs index e59701347..57605d75d 100644 --- a/ShareX/Forms/EncoderProgramForm.Designer.cs +++ b/ShareX/Forms/EncoderProgramForm.Designer.cs @@ -109,6 +109,7 @@ private void InitializeComponent() resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Window; + this.CancelButton = this.btnCancel; this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnOK); this.Controls.Add(this.btnPathBrowse); diff --git a/ShareX/Forms/QuickTaskMenuEditorForm.Designer.cs b/ShareX/Forms/QuickTaskMenuEditorForm.Designer.cs index d91136338..ce6a917c3 100644 --- a/ShareX/Forms/QuickTaskMenuEditorForm.Designer.cs +++ b/ShareX/Forms/QuickTaskMenuEditorForm.Designer.cs @@ -105,6 +105,7 @@ private void InitializeComponent() resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Window; + this.CancelButton = this.btnClose; this.Controls.Add(this.lblTip); this.Controls.Add(this.btnClose); this.Controls.Add(this.btnReset); diff --git a/ShareX/Forms/TextUploadForm.Designer.cs b/ShareX/Forms/TextUploadForm.Designer.cs index f8470e3fc..5e9ff5b59 100644 --- a/ShareX/Forms/TextUploadForm.Designer.cs +++ b/ShareX/Forms/TextUploadForm.Designer.cs @@ -69,8 +69,10 @@ private void InitializeComponent() // // TextUploadForm // + this.AcceptButton = this.btnUpload; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.btnCancel; this.ClientSize = new System.Drawing.Size(632, 520); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnUpload); diff --git a/ShareX/Forms/WatchFolderForm.Designer.cs b/ShareX/Forms/WatchFolderForm.Designer.cs index 9c982cd94..4f60a8995 100644 --- a/ShareX/Forms/WatchFolderForm.Designer.cs +++ b/ShareX/Forms/WatchFolderForm.Designer.cs @@ -98,6 +98,7 @@ private void InitializeComponent() resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Window; + this.CancelButton = this.btnCancel; this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnOK); this.Controls.Add(this.cbIncludeSubdirectories);