diff --git a/ShareX.HelpersLib/Automate/AutomateForm.cs b/ShareX.HelpersLib/Automate/AutomateForm.cs index c86ad8516..7427c333f 100644 --- a/ShareX.HelpersLib/Automate/AutomateForm.cs +++ b/ShareX.HelpersLib/Automate/AutomateForm.cs @@ -34,7 +34,7 @@ namespace ShareX.HelpersLib { - public partial class AutomateForm : Form + public partial class AutomateForm : BaseForm { private static AutomateForm instance; @@ -49,7 +49,6 @@ public partial class AutomateForm : Form private AutomateForm(List scripts) { InitializeComponent(); - Icon = ShareXResources.Icon; rtbInput.AddContextMenu(); tokenizer.Keywords = FunctionManager.Functions.Select(x => x.Key).ToArray(); cbFunctions.Items.AddRange(tokenizer.Keywords); diff --git a/ShareX.HelpersLib/Colors/ColorPickerForm.cs b/ShareX.HelpersLib/Colors/ColorPickerForm.cs index 9175542b1..85216bcc6 100644 --- a/ShareX.HelpersLib/Colors/ColorPickerForm.cs +++ b/ShareX.HelpersLib/Colors/ColorPickerForm.cs @@ -29,7 +29,7 @@ namespace ShareX.HelpersLib { - public partial class ColorPickerForm : Form + public partial class ColorPickerForm : BaseForm { public MyColor NewColor { get; protected set; } public MyColor OldColor { get; private set; } @@ -66,7 +66,6 @@ public static Color GetColor(Color currentColor) private void Initialize(Color currentColor) { InitializeComponent(); - Icon = ShareXResources.Icon; if (currentColor.IsEmpty) { diff --git a/ShareX.HelpersLib/Colors/GradientPickerForm.cs b/ShareX.HelpersLib/Colors/GradientPickerForm.cs index b6b752cb1..08ec27126 100644 --- a/ShareX.HelpersLib/Colors/GradientPickerForm.cs +++ b/ShareX.HelpersLib/Colors/GradientPickerForm.cs @@ -30,7 +30,7 @@ namespace ShareX.HelpersLib { - public partial class GradientPickerForm : Form + public partial class GradientPickerForm : BaseForm { public GradientInfo Gradient { get; set; } @@ -40,7 +40,6 @@ public GradientPickerForm(GradientInfo gradient) { Gradient = gradient; InitializeComponent(); - Icon = ShareXResources.Icon; cbGradientType.Items.AddRange(Helpers.GetEnumNamesProper()); cbGradientType.SelectedIndex = (int)Gradient.Type; foreach (GradientStop gradientStop in Gradient.Colors) diff --git a/ShareX.HelpersLib/DNS/DNSChangerForm.cs b/ShareX.HelpersLib/DNS/DNSChangerForm.cs index 837c83df9..9268e15a4 100644 --- a/ShareX.HelpersLib/DNS/DNSChangerForm.cs +++ b/ShareX.HelpersLib/DNS/DNSChangerForm.cs @@ -29,12 +29,11 @@ namespace ShareX.HelpersLib { - public partial class DNSChangerForm : Form + public partial class DNSChangerForm : BaseForm { public DNSChangerForm() { InitializeComponent(); - Icon = ShareXResources.Icon; AddDNS(Resources.DNSChangerForm_DNSChangerForm_Manual); AddDNS("Google Public DNS", "8.8.8.8", "8.8.4.4"); // https://developers.google.com/speed/public-dns/ diff --git a/ShareX.HelpersLib/Forms/BaseForm.Designer.cs b/ShareX.HelpersLib/Forms/BaseForm.Designer.cs new file mode 100644 index 000000000..7f663c73f --- /dev/null +++ b/ShareX.HelpersLib/Forms/BaseForm.Designer.cs @@ -0,0 +1,46 @@ +namespace ShareX.HelpersLib +{ + partial class BaseForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.SuspendLayout(); + // + // BaseForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(300, 300); + this.Name = "BaseForm"; + this.Text = "ShareX"; + this.ResumeLayout(false); + + } + + #endregion + } +} \ No newline at end of file diff --git a/ShareX.HelpersLib/Forms/BaseForm.cs b/ShareX.HelpersLib/Forms/BaseForm.cs new file mode 100644 index 000000000..97c30e8cd --- /dev/null +++ b/ShareX.HelpersLib/Forms/BaseForm.cs @@ -0,0 +1,13 @@ +using System.Windows.Forms; + +namespace ShareX.HelpersLib +{ + public partial class BaseForm : Form + { + public BaseForm() + { + InitializeComponent(); + Icon = ShareXResources.Icon; + } + } +} \ No newline at end of file diff --git a/ShareX.HelpersLib/Forms/BaseForm.resx b/ShareX.HelpersLib/Forms/BaseForm.resx new file mode 100644 index 000000000..1af7de150 --- /dev/null +++ b/ShareX.HelpersLib/Forms/BaseForm.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ShareX.HelpersLib/Forms/ClipboardContentViewer.cs b/ShareX.HelpersLib/Forms/ClipboardContentViewer.cs index 804cd7a10..2172522c1 100644 --- a/ShareX.HelpersLib/Forms/ClipboardContentViewer.cs +++ b/ShareX.HelpersLib/Forms/ClipboardContentViewer.cs @@ -31,7 +31,7 @@ namespace ShareX.HelpersLib { - public partial class ClipboardContentViewer : Form + public partial class ClipboardContentViewer : BaseForm { public bool IsClipboardEmpty { get; private set; } @@ -40,7 +40,6 @@ public partial class ClipboardContentViewer : Form public ClipboardContentViewer(bool showCheckBox = false) { InitializeComponent(); - Icon = ShareXResources.Icon; cbDontShowThisWindow.Visible = showCheckBox; } diff --git a/ShareX.HelpersLib/Forms/DebugForm.cs b/ShareX.HelpersLib/Forms/DebugForm.cs index be027d4b7..d740e9197 100644 --- a/ShareX.HelpersLib/Forms/DebugForm.cs +++ b/ShareX.HelpersLib/Forms/DebugForm.cs @@ -31,14 +31,13 @@ namespace ShareX.HelpersLib { - public partial class DebugForm : Form + public partial class DebugForm : BaseForm { private Logger logger; public DebugForm(Logger logger) { InitializeComponent(); - Icon = ShareXResources.Icon; this.logger = logger; rtbDebug.Text = logger.ToString(); diff --git a/ShareX.HelpersLib/Forms/ErrorForm.cs b/ShareX.HelpersLib/Forms/ErrorForm.cs index 7ac800b35..414af5e0c 100644 --- a/ShareX.HelpersLib/Forms/ErrorForm.cs +++ b/ShareX.HelpersLib/Forms/ErrorForm.cs @@ -29,7 +29,7 @@ namespace ShareX.HelpersLib { - public partial class ErrorForm : Form + public partial class ErrorForm : BaseForm { public string LogPath { get; private set; } public string BugReportPath { get; private set; } @@ -42,7 +42,6 @@ public ErrorForm(Exception error, string logPath, string bugReportPath) public ErrorForm(string errorTitle, string errorMessage, string logPath, string bugReportPath) { InitializeComponent(); - Icon = ShareXResources.Icon; LogPath = logPath; BugReportPath = bugReportPath; diff --git a/ShareX.HelpersLib/Forms/HashCheckForm.cs b/ShareX.HelpersLib/Forms/HashCheckForm.cs index f512c3402..10ececb23 100644 --- a/ShareX.HelpersLib/Forms/HashCheckForm.cs +++ b/ShareX.HelpersLib/Forms/HashCheckForm.cs @@ -30,14 +30,13 @@ namespace ShareX.HelpersLib { - public partial class HashCheckForm : Form + public partial class HashCheckForm : BaseForm { private HashCheck hashCheck; public HashCheckForm() { InitializeComponent(); - Icon = ShareXResources.Icon; cbHashType.Items.AddRange(Helpers.GetEnumDescriptions()); cbHashType.SelectedIndex = (int)HashType.SHA1; diff --git a/ShareX.HelpersLib/Forms/ImageViewer.cs b/ShareX.HelpersLib/Forms/ImageViewer.cs index 6bd96abd2..2560b6b7b 100644 --- a/ShareX.HelpersLib/Forms/ImageViewer.cs +++ b/ShareX.HelpersLib/Forms/ImageViewer.cs @@ -30,7 +30,7 @@ namespace ShareX.HelpersLib { - public class ImageViewer : Form + public class ImageViewer : BaseForm { private Image screenshot; diff --git a/ShareX.HelpersLib/Forms/InputBox.cs b/ShareX.HelpersLib/Forms/InputBox.cs index eb425d60a..65358b838 100644 --- a/ShareX.HelpersLib/Forms/InputBox.cs +++ b/ShareX.HelpersLib/Forms/InputBox.cs @@ -28,7 +28,7 @@ namespace ShareX.HelpersLib { - public class InputBox : Form + public class InputBox : BaseForm { public string Title { get; set; } public string InputText { get; set; } @@ -36,7 +36,6 @@ public class InputBox : Form public InputBox(string title = null, string inputText = null) { InitializeComponent(); - Icon = ShareXResources.Icon; Title = title; InputText = inputText; diff --git a/ShareX.HelpersLib/Forms/MonitorTestForm.cs b/ShareX.HelpersLib/Forms/MonitorTestForm.cs index 017ef3e29..4b68cd19d 100644 --- a/ShareX.HelpersLib/Forms/MonitorTestForm.cs +++ b/ShareX.HelpersLib/Forms/MonitorTestForm.cs @@ -30,7 +30,7 @@ namespace ShareX.HelpersLib { - public partial class MonitorTestForm : Form + public partial class MonitorTestForm : BaseForm { public MonitorTestForm() { diff --git a/ShareX.HelpersLib/Forms/MyMessageBox.cs b/ShareX.HelpersLib/Forms/MyMessageBox.cs index 06eb68b4d..4215eeb73 100644 --- a/ShareX.HelpersLib/Forms/MyMessageBox.cs +++ b/ShareX.HelpersLib/Forms/MyMessageBox.cs @@ -29,7 +29,7 @@ namespace ShareX.HelpersLib { - public class MyMessageBox : Form + public class MyMessageBox : BaseForm { private const int LabelHorizontalPadding = 15; private const int LabelVerticalPadding = 20; diff --git a/ShareX.HelpersLib/Forms/OutputBox.cs b/ShareX.HelpersLib/Forms/OutputBox.cs index 696e8a3ca..f1c9772f1 100644 --- a/ShareX.HelpersLib/Forms/OutputBox.cs +++ b/ShareX.HelpersLib/Forms/OutputBox.cs @@ -28,12 +28,11 @@ namespace ShareX.HelpersLib { - public partial class OutputBox : Form + public partial class OutputBox : BaseForm { public OutputBox(string text, string title) { InitializeComponent(); - Icon = ShareXResources.Icon; Text = "ShareX - " + title; txtText.Text = text; } diff --git a/ShareX.HelpersLib/Forms/QRCodeForm.cs b/ShareX.HelpersLib/Forms/QRCodeForm.cs index 8c01f1b36..100afd57c 100644 --- a/ShareX.HelpersLib/Forms/QRCodeForm.cs +++ b/ShareX.HelpersLib/Forms/QRCodeForm.cs @@ -33,14 +33,13 @@ namespace ShareX.HelpersLib { - public partial class QRCodeForm : Form + public partial class QRCodeForm : BaseForm { public bool EditMode { get; set; } public QRCodeForm(string text = null) { InitializeComponent(); - Icon = ShareXResources.Icon; ClientSize = new Size(400, 400); if (!string.IsNullOrEmpty(text)) diff --git a/ShareX.HelpersLib/Forms/TrayForm.cs b/ShareX.HelpersLib/Forms/TrayForm.cs index deded4113..cb95c02cf 100644 --- a/ShareX.HelpersLib/Forms/TrayForm.cs +++ b/ShareX.HelpersLib/Forms/TrayForm.cs @@ -28,7 +28,7 @@ namespace ShareX.HelpersLib { - public class TrayForm : Form + public class TrayForm : BaseForm { protected NotifyIcon TrayIcon = null; diff --git a/ShareX.HelpersLib/Native/LayeredForm.cs b/ShareX.HelpersLib/Native/LayeredForm.cs index f20e30a9d..6fd17eda1 100644 --- a/ShareX.HelpersLib/Native/LayeredForm.cs +++ b/ShareX.HelpersLib/Native/LayeredForm.cs @@ -30,7 +30,7 @@ namespace ShareX.HelpersLib { - public class LayeredForm : Form + public class LayeredForm : BaseForm { public LayeredForm() { diff --git a/ShareX.HelpersLib/Printer/PrintForm.cs b/ShareX.HelpersLib/Printer/PrintForm.cs index ecadbe1a8..3190f5c51 100644 --- a/ShareX.HelpersLib/Printer/PrintForm.cs +++ b/ShareX.HelpersLib/Printer/PrintForm.cs @@ -30,7 +30,7 @@ namespace ShareX.HelpersLib { - public partial class PrintForm : Form + public partial class PrintForm : BaseForm { private PrintHelper printHelper; private PrintSettings printSettings; diff --git a/ShareX.HelpersLib/Printer/PrintTextForm.cs b/ShareX.HelpersLib/Printer/PrintTextForm.cs index ff77cf0f3..5316e34c3 100644 --- a/ShareX.HelpersLib/Printer/PrintTextForm.cs +++ b/ShareX.HelpersLib/Printer/PrintTextForm.cs @@ -30,7 +30,7 @@ namespace ShareX.HelpersLib { - public partial class PrintTextForm : Form + public partial class PrintTextForm : BaseForm { private PrintHelper printHelper; private PrintSettings printSettings; diff --git a/ShareX.HelpersLib/ShareX.HelpersLib.csproj b/ShareX.HelpersLib/ShareX.HelpersLib.csproj index ee0b5b868..290209468 100644 --- a/ShareX.HelpersLib/ShareX.HelpersLib.csproj +++ b/ShareX.HelpersLib/ShareX.HelpersLib.csproj @@ -130,6 +130,12 @@ + + Form + + + BaseForm.cs + Form @@ -561,6 +567,9 @@ DNSChangerForm.cs + + BaseForm.cs + ClipboardContentViewer.cs diff --git a/ShareX.HelpersLib/UpdateChecker/DownloaderForm.cs b/ShareX.HelpersLib/UpdateChecker/DownloaderForm.cs index 3459540bf..ac1c70335 100644 --- a/ShareX.HelpersLib/UpdateChecker/DownloaderForm.cs +++ b/ShareX.HelpersLib/UpdateChecker/DownloaderForm.cs @@ -36,7 +36,7 @@ namespace ShareX.HelpersLib { - public partial class DownloaderForm : Form + public partial class DownloaderForm : BaseForm { public delegate void DownloaderInstallEventHandler(string filePath); public event DownloaderInstallEventHandler InstallRequested; @@ -60,7 +60,6 @@ public partial class DownloaderForm : Form private DownloaderForm() { InitializeComponent(); - Icon = ShareXResources.Icon; fillRect = new Rectangle(0, 0, ClientSize.Width, ClientSize.Height); diff --git a/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.cs b/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.cs index 9f41c75fa..4771fe1a2 100644 --- a/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.cs +++ b/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.cs @@ -30,7 +30,7 @@ namespace ShareX.HelpersLib { - public partial class UpdateMessageBox : Form + public partial class UpdateMessageBox : BaseForm { public static bool IsOpen { get; private set; } public static bool DontShow { get; private set; } @@ -43,7 +43,6 @@ public UpdateMessageBox() { InitializeComponent(); - Icon = ShareXResources.Icon; Text = Resources.UpdateMessageBox_UpdateMessageBox_update_is_available; lblText.Text = string.Format(Resources.UpdateMessageBox_UpdateMessageBox_, Application.ProductName); diff --git a/ShareX.HistoryLib/HistoryForm.cs b/ShareX.HistoryLib/HistoryForm.cs index 87692edbc..f59652c0f 100644 --- a/ShareX.HistoryLib/HistoryForm.cs +++ b/ShareX.HistoryLib/HistoryForm.cs @@ -34,7 +34,7 @@ namespace ShareX.HistoryLib { - public partial class HistoryForm : Form + public partial class HistoryForm : BaseForm { public string HistoryPath { get; private set; } public int MaxItemCount { get; set; } @@ -46,7 +46,6 @@ public partial class HistoryForm : Form public HistoryForm(string historyPath, int maxItemCount = -1) { InitializeComponent(); - Icon = ShareXResources.Icon; Text = "ShareX - " + string.Format(Resources.HistoryForm_HistoryForm_History_, historyPath); HistoryPath = historyPath; diff --git a/ShareX.HistoryLib/HistoryItemInfoForm.cs b/ShareX.HistoryLib/HistoryItemInfoForm.cs index 276878df6..22bc48271 100644 --- a/ShareX.HistoryLib/HistoryItemInfoForm.cs +++ b/ShareX.HistoryLib/HistoryItemInfoForm.cs @@ -23,11 +23,12 @@ #endregion License Information (GPL v3) +using ShareX.HelpersLib; using System.Windows.Forms; namespace ShareX.HistoryLib { - public partial class HistoryItemInfoForm : Form + public partial class HistoryItemInfoForm : BaseForm { public HistoryItemInfoForm(object hi) { diff --git a/ShareX.HistoryLib/ImageHistoryForm.cs b/ShareX.HistoryLib/ImageHistoryForm.cs index 46009023c..608dea674 100644 --- a/ShareX.HistoryLib/ImageHistoryForm.cs +++ b/ShareX.HistoryLib/ImageHistoryForm.cs @@ -35,7 +35,7 @@ namespace ShareX.HistoryLib { - public partial class ImageHistoryForm : Form + public partial class ImageHistoryForm : BaseForm { public string HistoryPath { get; private set; } public int MaxItemCount { get; set; } @@ -74,7 +74,6 @@ public Size ThumbnailSize public ImageHistoryForm(string historyPath, int viewMode, Size thumbnailSize, int maxItemCount = -1) { InitializeComponent(); - Icon = ShareXResources.Icon; Text = "ShareX - " + string.Format("Image history: {0}", historyPath); HistoryPath = historyPath; diff --git a/ShareX.IRCLib/IRCClient/IRCClientForm.cs b/ShareX.IRCLib/IRCClient/IRCClientForm.cs index 5623a56aa..cf0bfd6b8 100644 --- a/ShareX.IRCLib/IRCClient/IRCClientForm.cs +++ b/ShareX.IRCLib/IRCClient/IRCClientForm.cs @@ -30,7 +30,7 @@ namespace ShareX.IRCLib { - public partial class IRCClientForm : Form + public partial class IRCClientForm : BaseForm { public IRCInfo Info { get; private set; } public IRC IRC { get; private set; } @@ -45,7 +45,6 @@ public IRCClientForm() : this(new IRCInfo()) public IRCClientForm(IRCInfo info) { InitializeComponent(); - Icon = ShareXResources.Icon; ((ToolStripDropDownMenu)tsmiColors.DropDown).ShowImageMargin = false; tabManager = new TabManager(tcMessages); diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.cs b/ShareX.ImageEffectsLib/ImageEffectsForm.cs index 3d38c36fb..0a021a6db 100644 --- a/ShareX.ImageEffectsLib/ImageEffectsForm.cs +++ b/ShareX.ImageEffectsLib/ImageEffectsForm.cs @@ -34,7 +34,7 @@ namespace ShareX.ImageEffectsLib { - public partial class ImageEffectsForm : Form + public partial class ImageEffectsForm : BaseForm { public Image DefaultImage { get; private set; } @@ -43,7 +43,6 @@ public partial class ImageEffectsForm : Form public ImageEffectsForm(Image img, List effects = null) { InitializeComponent(); - Icon = ShareXResources.Icon; DefaultImage = img; eiImageEffects.ObjectType = typeof(List); AddAllEffectsToContextMenu(); diff --git a/ShareX.ImageEffectsLib/WatermarkForm.cs b/ShareX.ImageEffectsLib/WatermarkForm.cs index 193116143..1522078cc 100644 --- a/ShareX.ImageEffectsLib/WatermarkForm.cs +++ b/ShareX.ImageEffectsLib/WatermarkForm.cs @@ -32,7 +32,7 @@ namespace ShareX.ImageEffectsLib { - public partial class WatermarkForm : Form + public partial class WatermarkForm : BaseForm { private WatermarkConfig config; private bool IsGuiReady; diff --git a/ShareX.MediaLib/Forms/VideoThumbnailerForm.cs b/ShareX.MediaLib/Forms/VideoThumbnailerForm.cs index 2f751fff0..a47bd60f6 100644 --- a/ShareX.MediaLib/Forms/VideoThumbnailerForm.cs +++ b/ShareX.MediaLib/Forms/VideoThumbnailerForm.cs @@ -33,7 +33,7 @@ namespace ShareX.MediaLib { - public partial class VideoThumbnailerForm : Form + public partial class VideoThumbnailerForm : BaseForm { public event Action> ThumbnailsTaken; @@ -45,7 +45,6 @@ public VideoThumbnailerForm(string ffmpegPath, VideoThumbnailOptions options) FFmpegPath = ffmpegPath; Options = options; InitializeComponent(); - Icon = ShareXResources.Icon; txtMediaPath.Text = Options.LastVideoPath ?? string.Empty; pgOptions.SelectedObject = Options; } diff --git a/ShareX.ScreenCaptureLib/Forms/RectangleAnnotate.cs b/ShareX.ScreenCaptureLib/Forms/RectangleAnnotate.cs index 8bc18b10d..1e04bf5a1 100644 --- a/ShareX.ScreenCaptureLib/Forms/RectangleAnnotate.cs +++ b/ShareX.ScreenCaptureLib/Forms/RectangleAnnotate.cs @@ -35,7 +35,7 @@ namespace ShareX.ScreenCaptureLib { - public class RectangleAnnotate : Form + public class RectangleAnnotate : BaseForm { public static Rectangle LastSelectionRectangle0Based { get; private set; } diff --git a/ShareX.ScreenCaptureLib/Forms/RectangleLight.cs b/ShareX.ScreenCaptureLib/Forms/RectangleLight.cs index 4ba0ab531..820256e1b 100644 --- a/ShareX.ScreenCaptureLib/Forms/RectangleLight.cs +++ b/ShareX.ScreenCaptureLib/Forms/RectangleLight.cs @@ -34,7 +34,7 @@ namespace ShareX.ScreenCaptureLib { - public class RectangleLight : Form + public class RectangleLight : BaseForm { public static Rectangle LastSelectionRectangle0Based { get; private set; } diff --git a/ShareX.ScreenCaptureLib/Forms/Surface.cs b/ShareX.ScreenCaptureLib/Forms/Surface.cs index 2d11d15a4..d1476f7bd 100644 --- a/ShareX.ScreenCaptureLib/Forms/Surface.cs +++ b/ShareX.ScreenCaptureLib/Forms/Surface.cs @@ -37,7 +37,7 @@ namespace ShareX.ScreenCaptureLib { - public class Surface : Form + public class Surface : BaseForm { public Image SurfaceImage { get; set; } public SurfaceOptions Config { get; set; } diff --git a/ShareX.ScreenCaptureLib/Screencast/FFmpegOptionsForm.cs b/ShareX.ScreenCaptureLib/Screencast/FFmpegOptionsForm.cs index 81dcffa0e..b76300531 100644 --- a/ShareX.ScreenCaptureLib/Screencast/FFmpegOptionsForm.cs +++ b/ShareX.ScreenCaptureLib/Screencast/FFmpegOptionsForm.cs @@ -33,7 +33,7 @@ namespace ShareX.ScreenCaptureLib { - public partial class FFmpegOptionsForm : Form + public partial class FFmpegOptionsForm : BaseForm { public ScreencastOptions Options { get; private set; } public string DefaultToolsPath { get; set; } @@ -43,7 +43,6 @@ public partial class FFmpegOptionsForm : Form public FFmpegOptionsForm(ScreencastOptions options) { InitializeComponent(); - Icon = ShareXResources.Icon; Options = options; eiFFmpeg.ObjectType = typeof(FFmpegOptions); diff --git a/ShareX.UploadersLib/FTPClient/FTPClientForm.Designer.cs b/ShareX.UploadersLib/FTPClient/FTPClientForm.Designer.cs index 57cace6ee..ed08a2778 100644 --- a/ShareX.UploadersLib/FTPClient/FTPClientForm.Designer.cs +++ b/ShareX.UploadersLib/FTPClient/FTPClientForm.Designer.cs @@ -33,7 +33,7 @@ private void InitializeComponent() this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.lblStatus = new System.Windows.Forms.ToolStripStatusLabel(); - this.lvFTPList = new UploadersLib.ListViewEx(); + this.lvFTPList = new ShareX.UploadersLib.ListViewEx(); this.chFilename = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.chFilesize = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.chFiletype = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); diff --git a/ShareX.UploadersLib/FTPClient/FTPClientForm.cs b/ShareX.UploadersLib/FTPClient/FTPClientForm.cs index 71d149860..9f57eb173 100644 --- a/ShareX.UploadersLib/FTPClient/FTPClientForm.cs +++ b/ShareX.UploadersLib/FTPClient/FTPClientForm.cs @@ -36,7 +36,7 @@ namespace ShareX.UploadersLib { - public partial class FTPClientForm : Form + public partial class FTPClientForm : BaseForm { private const string Root = "/"; @@ -49,7 +49,6 @@ public partial class FTPClientForm : Form public FTPClientForm(FTPAccount account) { InitializeComponent(); - Icon = ShareXResources.Icon; lblStatus.Text = string.Empty; lvFTPList.SubItemEndEditing += lvFTPList_SubItemEndEditing; diff --git a/ShareX.UploadersLib/FTPClient/FTPClientForm.resx b/ShareX.UploadersLib/FTPClient/FTPClientForm.resx index 0cbd1a901..8dc23b041 100644 --- a/ShareX.UploadersLib/FTPClient/FTPClientForm.resx +++ b/ShareX.UploadersLib/FTPClient/FTPClientForm.resx @@ -280,7 +280,7 @@ lvFTPList - UploadersLib.ListViewEx, UploadersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + ShareX.UploadersLib.ListViewEx, ShareX.UploadersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null toolStripContainer1.ContentPanel @@ -919,6 +919,6 @@ FTPClientForm - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ShareX.HelpersLib.BaseForm, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/ShareX.UploadersLib/Forms/DropboxFilesForm.cs b/ShareX.UploadersLib/Forms/DropboxFilesForm.cs index 03f76730a..b505b21ce 100644 --- a/ShareX.UploadersLib/Forms/DropboxFilesForm.cs +++ b/ShareX.UploadersLib/Forms/DropboxFilesForm.cs @@ -35,7 +35,7 @@ namespace ShareX.UploadersLib.Forms { - public partial class DropboxFilesForm : Form + public partial class DropboxFilesForm : BaseForm { public string CurrentFolderPath { get; private set; } diff --git a/ShareX.UploadersLib/Forms/EmailForm.cs b/ShareX.UploadersLib/Forms/EmailForm.cs index 026e49bde..0d5be4a00 100644 --- a/ShareX.UploadersLib/Forms/EmailForm.cs +++ b/ShareX.UploadersLib/Forms/EmailForm.cs @@ -29,7 +29,7 @@ namespace ShareX.UploadersLib.GUI { - public partial class EmailForm : Form + public partial class EmailForm : BaseForm { public string ToEmail { get; private set; } public string Subject { get; private set; } @@ -38,7 +38,6 @@ public partial class EmailForm : Form public EmailForm() { InitializeComponent(); - Icon = ShareXResources.Icon; } public EmailForm(string toEmail, string subject, string body) diff --git a/ShareX.UploadersLib/Forms/JiraUpload.cs b/ShareX.UploadersLib/Forms/JiraUpload.cs index cc5aada25..96f598c20 100644 --- a/ShareX.UploadersLib/Forms/JiraUpload.cs +++ b/ShareX.UploadersLib/Forms/JiraUpload.cs @@ -31,9 +31,10 @@ namespace ShareX.UploadersLib.GUI { + using ShareX.HelpersLib; using System.Threading.Tasks; - public partial class JiraUpload : Form + public partial class JiraUpload : BaseForm { public delegate string GetSummaryHandler(string issueId); diff --git a/ShareX.UploadersLib/Forms/OAuthWebForm.cs b/ShareX.UploadersLib/Forms/OAuthWebForm.cs index bb6e04bbb..f09df97ee 100644 --- a/ShareX.UploadersLib/Forms/OAuthWebForm.cs +++ b/ShareX.UploadersLib/Forms/OAuthWebForm.cs @@ -31,7 +31,7 @@ namespace ShareX.UploadersLib.GUI { - public partial class OAuthWebForm : Form + public partial class OAuthWebForm : BaseForm { public string AuthorizeURL { get; set; } public string CallbackURL { get; set; } @@ -40,7 +40,6 @@ public partial class OAuthWebForm : Form public OAuthWebForm(string authorizeURL, string callbackURL) { InitializeComponent(); - Icon = ShareXResources.Icon; AuthorizeURL = authorizeURL; CallbackURL = callbackURL; tstbURL.Text = authorizeURL; diff --git a/ShareX.UploadersLib/Forms/ResponseForm.cs b/ShareX.UploadersLib/Forms/ResponseForm.cs index cdb040d1f..971a4705e 100644 --- a/ShareX.UploadersLib/Forms/ResponseForm.cs +++ b/ShareX.UploadersLib/Forms/ResponseForm.cs @@ -29,7 +29,7 @@ namespace ShareX.UploadersLib { - public partial class ResponseForm : Form + public partial class ResponseForm : BaseForm { public string Response { get; private set; } @@ -38,7 +38,6 @@ public partial class ResponseForm : Form public ResponseForm(string response) { InitializeComponent(); - Icon = ShareXResources.Icon; Response = response; txtSource.Text = Response; } diff --git a/ShareX.UploadersLib/Forms/TwitterTweetForm.cs b/ShareX.UploadersLib/Forms/TwitterTweetForm.cs index 8146cc7a3..adbc56453 100644 --- a/ShareX.UploadersLib/Forms/TwitterTweetForm.cs +++ b/ShareX.UploadersLib/Forms/TwitterTweetForm.cs @@ -32,7 +32,7 @@ namespace ShareX.UploadersLib { - public partial class TwitterTweetForm : Form + public partial class TwitterTweetForm : BaseForm { public string Message { diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs index 6ca07ccf3..8804a0aa5 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs @@ -39,7 +39,7 @@ namespace ShareX.UploadersLib { - public partial class UploadersConfigForm : Form + public partial class UploadersConfigForm : BaseForm { public UploadersConfig Config { get; private set; } @@ -54,8 +54,6 @@ public UploadersConfigForm(UploadersConfig uploadersConfig) { Text += " - " + Config.FilePath; } - - Icon = ShareXResources.Icon; } private void UploadersConfigForm_Shown(object sender, EventArgs e) diff --git a/ShareX.UploadersLib/Forms/UserPassBox.cs b/ShareX.UploadersLib/Forms/UserPassBox.cs index b3fd08ade..bfe0294d5 100644 --- a/ShareX.UploadersLib/Forms/UserPassBox.cs +++ b/ShareX.UploadersLib/Forms/UserPassBox.cs @@ -23,12 +23,13 @@ #endregion License Information (GPL v3) +using ShareX.HelpersLib; using System; using System.Windows.Forms; namespace ShareX.UploadersLib { - public partial class UserPassBox : Form + public partial class UserPassBox : BaseForm { public string FullName { get; private set; } public string UserName { get; private set; } diff --git a/ShareX/Forms/AboutForm.cs b/ShareX/Forms/AboutForm.cs index 28e86e711..06cd0a1d1 100644 --- a/ShareX/Forms/AboutForm.cs +++ b/ShareX/Forms/AboutForm.cs @@ -32,12 +32,11 @@ namespace ShareX { - public partial class AboutForm : Form + public partial class AboutForm : BaseForm { public AboutForm() { InitializeComponent(); - Icon = ShareXResources.Icon; lblProductName.Text = Program.Title; rtbShareXInfo.AddContextMenu(); diff --git a/ShareX/Forms/ActionsForm.cs b/ShareX/Forms/ActionsForm.cs index f52c4d8b4..ea0e415be 100644 --- a/ShareX/Forms/ActionsForm.cs +++ b/ShareX/Forms/ActionsForm.cs @@ -30,7 +30,7 @@ namespace ShareX { - public partial class ActionsForm : Form + public partial class ActionsForm : BaseForm { public ExternalProgram FileAction { get; private set; } @@ -42,7 +42,6 @@ public ActionsForm() public ActionsForm(ExternalProgram fileAction) { InitializeComponent(); - Icon = ShareXResources.Icon; FileAction = fileAction; txtName.Text = fileAction.Name ?? ""; txtPath.Text = fileAction.Path ?? ""; diff --git a/ShareX/Forms/AfterCaptureForm.cs b/ShareX/Forms/AfterCaptureForm.cs index 16ac6fa99..fb2032a1a 100644 --- a/ShareX/Forms/AfterCaptureForm.cs +++ b/ShareX/Forms/AfterCaptureForm.cs @@ -31,7 +31,7 @@ namespace ShareX { - public partial class AfterCaptureForm : Form + public partial class AfterCaptureForm : BaseForm { public AfterCaptureTasks AfterCaptureTasks { get; private set; } public AfterCaptureFormResult Result { get; private set; } @@ -39,7 +39,6 @@ public partial class AfterCaptureForm : Form public AfterCaptureForm(Image img, TaskSettings taskSettings) { InitializeComponent(); - Icon = ShareXResources.Icon; ImageList imageList = new ImageList { ColorDepth = ColorDepth.Depth32Bit }; imageList.Images.Add(Resources.checkbox_uncheck); diff --git a/ShareX/Forms/AfterUploadForm.cs b/ShareX/Forms/AfterUploadForm.cs index ff030bbae..f579bfc4c 100644 --- a/ShareX/Forms/AfterUploadForm.cs +++ b/ShareX/Forms/AfterUploadForm.cs @@ -31,7 +31,7 @@ namespace ShareX { - public partial class AfterUploadForm : Form + public partial class AfterUploadForm : BaseForm { public TaskInfo Info { get; private set; } @@ -46,7 +46,6 @@ public partial class AfterUploadForm : Form public AfterUploadForm(TaskInfo info) { InitializeComponent(); - Icon = ShareXResources.Icon; Info = info; if (Info.TaskSettings.AdvancedSettings.AutoCloseAfterUploadForm) tmrClose.Start(); diff --git a/ShareX/Forms/ApplicationSettingsForm.cs b/ShareX/Forms/ApplicationSettingsForm.cs index d088a92c0..17ed98ff0 100644 --- a/ShareX/Forms/ApplicationSettingsForm.cs +++ b/ShareX/Forms/ApplicationSettingsForm.cs @@ -34,7 +34,7 @@ namespace ShareX { - public partial class ApplicationSettingsForm : Form + public partial class ApplicationSettingsForm : BaseForm { private bool loaded; private const int MaxBufferSizePower = 14; @@ -48,8 +48,6 @@ public ApplicationSettingsForm() private void LoadSettings() { - Icon = ShareXResources.Icon; - // General foreach (SupportedLanguage language in Helpers.GetEnums()) diff --git a/ShareX/Forms/AutoCaptureForm.cs b/ShareX/Forms/AutoCaptureForm.cs index 0dcb425a6..c032f1388 100644 --- a/ShareX/Forms/AutoCaptureForm.cs +++ b/ShareX/Forms/AutoCaptureForm.cs @@ -33,7 +33,7 @@ namespace ShareX { - public partial class AutoCaptureForm : Form + public partial class AutoCaptureForm : BaseForm { private static AutoCaptureForm instance; @@ -63,7 +63,6 @@ public static AutoCaptureForm Instance private AutoCaptureForm() { InitializeComponent(); - Icon = ShareXResources.Icon; niTray.Icon = Resources.clock.ToIcon(); screenshotTimer = new System.Timers.Timer(); diff --git a/ShareX/Forms/BeforeUploadForm.cs b/ShareX/Forms/BeforeUploadForm.cs index d715b6662..a9bc9aca2 100644 --- a/ShareX/Forms/BeforeUploadForm.cs +++ b/ShareX/Forms/BeforeUploadForm.cs @@ -30,12 +30,11 @@ namespace ShareX { - public partial class BeforeUploadForm : Form + public partial class BeforeUploadForm : BaseForm { public BeforeUploadForm(TaskInfo info) { InitializeComponent(); - Icon = ShareXResources.Icon; DialogResult = DialogResult.OK; ucBeforeUpload.InitCompleted += currentDestination => diff --git a/ShareX/Forms/ChromeForm.cs b/ShareX/Forms/ChromeForm.cs index 9ee9c56c0..f403d5175 100644 --- a/ShareX/Forms/ChromeForm.cs +++ b/ShareX/Forms/ChromeForm.cs @@ -38,12 +38,11 @@ namespace ShareX { - public partial class ChromeForm : Form + public partial class ChromeForm : BaseForm { public ChromeForm() { InitializeComponent(); - Icon = ShareXResources.Icon; } private void CreateChromeHostManifest(string filepath) diff --git a/ShareX/Forms/ClipboardFormatForm.cs b/ShareX/Forms/ClipboardFormatForm.cs index 51a73c039..f6b90945d 100644 --- a/ShareX/Forms/ClipboardFormatForm.cs +++ b/ShareX/Forms/ClipboardFormatForm.cs @@ -30,7 +30,7 @@ namespace ShareX { - public partial class ClipboardFormatForm : Form + public partial class ClipboardFormatForm : BaseForm { public ClipboardFormat ClipboardFormat { get; private set; } diff --git a/ShareX/Forms/EncoderProgramForm.cs b/ShareX/Forms/EncoderProgramForm.cs index 16c63f6d3..bacc299f4 100644 --- a/ShareX/Forms/EncoderProgramForm.cs +++ b/ShareX/Forms/EncoderProgramForm.cs @@ -30,7 +30,7 @@ namespace ShareX { - public partial class EncoderProgramForm : Form + public partial class EncoderProgramForm : BaseForm { public VideoEncoder encoder { get; private set; } @@ -41,7 +41,6 @@ public EncoderProgramForm() public EncoderProgramForm(VideoEncoder encoder) { - Icon = ShareXResources.Icon; this.encoder = encoder; InitializeComponent(); txtName.Text = encoder.Name ?? ""; diff --git a/ShareX/Forms/FileExistForm.cs b/ShareX/Forms/FileExistForm.cs index ed65803c3..acb6c5138 100644 --- a/ShareX/Forms/FileExistForm.cs +++ b/ShareX/Forms/FileExistForm.cs @@ -31,7 +31,7 @@ namespace ShareX { - public partial class FileExistForm : Form + public partial class FileExistForm : BaseForm { public string Filepath { get; private set; } @@ -41,7 +41,6 @@ public partial class FileExistForm : Form public FileExistForm(string filepath) { InitializeComponent(); - Icon = ShareXResources.Icon; Filepath = filepath; filename = Path.GetFileNameWithoutExtension(Filepath); diff --git a/ShareX/Forms/HotkeyForm.cs b/ShareX/Forms/HotkeyForm.cs index ef4d8a31c..472540598 100644 --- a/ShareX/Forms/HotkeyForm.cs +++ b/ShareX/Forms/HotkeyForm.cs @@ -29,7 +29,7 @@ namespace ShareX { - public class HotkeyForm : Form + public class HotkeyForm : BaseForm { public int HotkeyRepeatLimit { get; set; } diff --git a/ShareX/Forms/HotkeySettingsForm.cs b/ShareX/Forms/HotkeySettingsForm.cs index 1a22627e1..cbf8e2d37 100644 --- a/ShareX/Forms/HotkeySettingsForm.cs +++ b/ShareX/Forms/HotkeySettingsForm.cs @@ -32,7 +32,7 @@ namespace ShareX { - public partial class HotkeySettingsForm : Form + public partial class HotkeySettingsForm : BaseForm { public HotkeySelectionControl Selected { get; private set; } @@ -41,7 +41,6 @@ public partial class HotkeySettingsForm : Form public HotkeySettingsForm() { InitializeComponent(); - Icon = ShareXResources.Icon; if (Program.HotkeyManager != null) { diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 3b54214ae..777d20be8 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -84,7 +84,6 @@ private void InitControls() InitializeComponent(); Text = Program.Title; - Icon = ShareXResources.Icon; ((ToolStripDropDownMenu)tsddbWorkflows.DropDown).ShowImageMargin = ((ToolStripDropDownMenu)tsmiTrayWorkflows.DropDown).ShowImageMargin = ((ToolStripDropDownMenu)tsmiMonitor.DropDown).ShowImageMargin = ((ToolStripDropDownMenu)tsmiTrayMonitor.DropDown).ShowImageMargin = diff --git a/ShareX/Forms/NotificationForm.cs b/ShareX/Forms/NotificationForm.cs index f6f28129b..8f5a7585f 100644 --- a/ShareX/Forms/NotificationForm.cs +++ b/ShareX/Forms/NotificationForm.cs @@ -31,7 +31,7 @@ namespace ShareX { - public class NotificationForm : Form + public class NotificationForm : BaseForm { public NotificationFormConfig ToastConfig { get; private set; } diff --git a/ShareX/Forms/ScreenRegionForm.cs b/ShareX/Forms/ScreenRegionForm.cs index 1d21961d9..65b9bffc8 100644 --- a/ShareX/Forms/ScreenRegionForm.cs +++ b/ShareX/Forms/ScreenRegionForm.cs @@ -33,7 +33,7 @@ namespace ShareX { - public partial class ScreenRegionForm : Form + public partial class ScreenRegionForm : BaseForm { public event Action StopRequested; diff --git a/ShareX/Forms/TaskSettingsForm.cs b/ShareX/Forms/TaskSettingsForm.cs index a3917e751..62c1646bf 100644 --- a/ShareX/Forms/TaskSettingsForm.cs +++ b/ShareX/Forms/TaskSettingsForm.cs @@ -37,7 +37,7 @@ namespace ShareX { - public partial class TaskSettingsForm : Form + public partial class TaskSettingsForm : BaseForm { public TaskSettings TaskSettings { get; private set; } public bool IsDefault { get; private set; } @@ -48,7 +48,6 @@ public partial class TaskSettingsForm : Form public TaskSettingsForm(TaskSettings hotkeySetting, bool isDefault = false) { InitializeComponent(); - Icon = ShareXResources.Icon; TaskSettings = hotkeySetting; IsDefault = isDefault; diff --git a/ShareX/Forms/VideoEncodersForm.cs b/ShareX/Forms/VideoEncodersForm.cs index 5a62124f6..7d8cb6c47 100644 --- a/ShareX/Forms/VideoEncodersForm.cs +++ b/ShareX/Forms/VideoEncodersForm.cs @@ -30,7 +30,7 @@ namespace ShareX { - public partial class VideoEncodersForm : Form + public partial class VideoEncodersForm : BaseForm { public VideoEncodersForm() { diff --git a/ShareX/Forms/WatchFolderForm.cs b/ShareX/Forms/WatchFolderForm.cs index 8dccae296..736aa2435 100644 --- a/ShareX/Forms/WatchFolderForm.cs +++ b/ShareX/Forms/WatchFolderForm.cs @@ -30,7 +30,7 @@ namespace ShareX { - public partial class WatchFolderForm : Form + public partial class WatchFolderForm : BaseForm { public WatchFolderSettings WatchFolder { get; private set; } diff --git a/ShareX/Forms/WebpageCaptureForm.cs b/ShareX/Forms/WebpageCaptureForm.cs index 3210a5eec..e84ee0246 100644 --- a/ShareX/Forms/WebpageCaptureForm.cs +++ b/ShareX/Forms/WebpageCaptureForm.cs @@ -32,7 +32,7 @@ namespace ShareX { - public partial class WebpageCaptureForm : Form + public partial class WebpageCaptureForm : BaseForm { public event Action OnImageUploadRequested; public event Action OnImageCopyRequested; @@ -45,7 +45,6 @@ public partial class WebpageCaptureForm : Form public WebpageCaptureForm() { InitializeComponent(); - Icon = ShareXResources.Icon; LoadSettings(); webpageCapture = new WebpageCapture(); webpageCapture.CaptureCompleted += webpageCapture_CaptureCompleted; diff --git a/ShareX/UploadInfoManager.cs b/ShareX/UploadInfoManager.cs index 3d66bef8a..793f85550 100644 --- a/ShareX/UploadInfoManager.cs +++ b/ShareX/UploadInfoManager.cs @@ -340,7 +340,6 @@ public void ShowResponse() { using (ResponseForm form = new ResponseForm(SelectedItem.Info.Result.Response)) { - form.Icon = ShareXResources.Icon; form.ShowDialog(); } } diff --git a/ShareX/WorkerTask.cs b/ShareX/WorkerTask.cs index 9e477f5be..2f4f3d74a 100644 --- a/ShareX/WorkerTask.cs +++ b/ShareX/WorkerTask.cs @@ -1007,8 +1007,6 @@ public UploadResult UploadFile(Stream stream, string fileName) using (EmailForm emailForm = new EmailForm(Program.UploadersConfig.EmailRememberLastTo ? Program.UploadersConfig.EmailLastTo : string.Empty, Program.UploadersConfig.EmailDefaultSubject, Program.UploadersConfig.EmailDefaultBody)) { - emailForm.Icon = ShareXResources.Icon; - if (emailForm.ShowDialog() == DialogResult.OK) { if (Program.UploadersConfig.EmailRememberLastTo)