CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-07-03 13:40:34 +12:00
Code Issues Packages Projects Releases Wiki Activity

Code refactoring

Browse source
This commit is contained in:
Jaex 2021-10-14 16:05:57 +03:00
parent eba4c5b29a
commit 45ef5550bf
7 changed files with 132 additions and 158 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ShareX.HelpersLib/Forms/PrintForm.Designer.cs generated
View file

@ -103,7 +103,6 @@ private void InitializeComponent()
// //
this.AcceptButton = this.btnPrint; this.AcceptButton = this.btnPrint;
resources.ApplyResources(this, "$this"); resources.ApplyResources(this, "$this");
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.SystemColors.Window; this.BackColor = System.Drawing.SystemColors.Window;
this.CancelButton = this.btnCancel; this.CancelButton = this.btnCancel;
@ -118,6 +117,7 @@ private void InitializeComponent()
this.Controls.Add(this.cbAutoRotate); this.Controls.Add(this.cbAutoRotate);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "PrintForm"; this.Name = "PrintForm";
this.Shown += new System.EventHandler(this.PrintForm_Shown); this.Shown += new System.EventHandler(this.PrintForm_Shown);
((System.ComponentModel.ISupportInitialize)(this.nudMargin)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudMargin)).EndInit();

2
ShareX.HelpersLib/Forms/PrintForm.resx
View file

@ -355,7 +355,7 @@
<value>True</value> <value>True</value>
</metadata> </metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing"> <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>6, 13</value> <value>96, 96</value>
</data> </data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing"> <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>248, 222</value> <value>248, 222</value>

18
ShareX.HelpersLib/Printer/PrintHelper.cs
View file

@ -96,20 +96,19 @@ public void ShowPreview()
public void TryDefaultPrinterOverride() public void TryDefaultPrinterOverride()
{ {
string windowsDefault = printDocument.PrinterSettings.PrinterName; string defaultPrinterName = printDocument.PrinterSettings.PrinterName;
if (Settings.DefaultPrinterOverride.Length > 0)
if (!string.IsNullOrEmpty(Settings.DefaultPrinterOverride))
{ {
printDocument.PrinterSettings.PrinterName = Settings.DefaultPrinterOverride; printDocument.PrinterSettings.PrinterName = Settings.DefaultPrinterOverride;
} }
if (!printDocument.PrinterSettings.IsValid) if (!printDocument.PrinterSettings.IsValid)
{ {
printDocument.PrinterSettings.PrinterName = windowsDefault; printDocument.PrinterSettings.PrinterName = defaultPrinterName;
using (MyMessageBox msgbox = new MyMessageBox("Printer \'" + Settings.DefaultPrinterOverride + "\' does not exist. Continuing with windows default printer, you can set the default printer override in application settings",
"Specified Printer not Valid", MessageBox.Show("Printer \"" + Settings.DefaultPrinterOverride + "\" does not exist. Continuing with Windows default printer, you can set the default printer override in application settings.",
MessageBoxButtons.OK)) "Invalid printer name", MessageBoxButtons.OK, MessageBoxIcon.Information);
{
msgbox.ShowDialog();
}
} }
} }
@ -121,6 +120,7 @@ public bool Print()
{ {
printTextHelper.Font = Settings.TextFont; printTextHelper.Font = Settings.TextFont;
} }
TryDefaultPrinterOverride(); TryDefaultPrinterOverride();
printDocument.Print(); printDocument.Print();
return true; return true;

1
ShareX.HelpersLib/Printer/PrintSettings.cs
View file

@ -37,7 +37,6 @@ public class PrintSettings
public bool CenterImage { get; set; } public bool CenterImage { get; set; }
public XmlFont TextFont { get; set; } public XmlFont TextFont { get; set; }
public bool ShowPrintDialog { get; set; } public bool ShowPrintDialog { get; set; }
public string DefaultPrinterOverride { get; set; } public string DefaultPrinterOverride { get; set; }
public PrintSettings() public PrintSettings()

221
ShareX/Forms/ApplicationSettingsForm.Designer.cs generated
View file

@ -45,7 +45,6 @@ private void InitializeComponent()
this.btnEditQuickTaskMenu = new System.Windows.Forms.Button(); this.btnEditQuickTaskMenu = new System.Windows.Forms.Button();
this.cbShowTray = new System.Windows.Forms.CheckBox(); this.cbShowTray = new System.Windows.Forms.CheckBox();
this.cbTrayIconProgressEnabled = new System.Windows.Forms.CheckBox(); this.cbTrayIconProgressEnabled = new System.Windows.Forms.CheckBox();
this.btnLanguages = new ShareX.HelpersLib.MenuButton();
this.cmsLanguages = new System.Windows.Forms.ContextMenuStrip(this.components); this.cmsLanguages = new System.Windows.Forms.ContextMenuStrip(this.components);
this.cbRememberMainFormPosition = new System.Windows.Forms.CheckBox(); this.cbRememberMainFormPosition = new System.Windows.Forms.CheckBox();
this.cbSilentRun = new System.Windows.Forms.CheckBox(); this.cbSilentRun = new System.Windows.Forms.CheckBox();
@ -59,7 +58,6 @@ private void InitializeComponent()
this.cbThemes = new System.Windows.Forms.ComboBox(); this.cbThemes = new System.Windows.Forms.ComboBox();
this.pgTheme = new System.Windows.Forms.PropertyGrid(); this.pgTheme = new System.Windows.Forms.PropertyGrid();
this.cbUseCustomTheme = new System.Windows.Forms.CheckBox(); this.cbUseCustomTheme = new System.Windows.Forms.CheckBox();
this.eiTheme = new ShareX.HelpersLib.ExportImportControl();
this.tpIntegration = new System.Windows.Forms.TabPage(); this.tpIntegration = new System.Windows.Forms.TabPage();
this.gbFirefox = new System.Windows.Forms.GroupBox(); this.gbFirefox = new System.Windows.Forms.GroupBox();
this.cbFirefoxAddonSupport = new System.Windows.Forms.CheckBox(); this.cbFirefoxAddonSupport = new System.Windows.Forms.CheckBox();
@ -114,19 +112,10 @@ private void InitializeComponent()
this.btnClipboardFormatEdit = new System.Windows.Forms.Button(); this.btnClipboardFormatEdit = new System.Windows.Forms.Button();
this.btnClipboardFormatRemove = new System.Windows.Forms.Button(); this.btnClipboardFormatRemove = new System.Windows.Forms.Button();
this.btnClipboardFormatAdd = new System.Windows.Forms.Button(); this.btnClipboardFormatAdd = new System.Windows.Forms.Button();
this.lvClipboardFormats = new ShareX.HelpersLib.MyListView();
this.chDescription = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chFormat = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.tpUploadRetry = new System.Windows.Forms.TabPage(); this.tpUploadRetry = new System.Windows.Forms.TabPage();
this.gbSecondaryFileUploaders = new System.Windows.Forms.GroupBox(); this.gbSecondaryFileUploaders = new System.Windows.Forms.GroupBox();
this.lvSecondaryFileUploaders = new ShareX.HelpersLib.MyListView();
this.chSecondaryFileUploaders = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.gbSecondaryImageUploaders = new System.Windows.Forms.GroupBox(); this.gbSecondaryImageUploaders = new System.Windows.Forms.GroupBox();
this.lvSecondaryImageUploaders = new ShareX.HelpersLib.MyListView();
this.chSecondaryImageUploaders = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.gbSecondaryTextUploaders = new System.Windows.Forms.GroupBox(); this.gbSecondaryTextUploaders = new System.Windows.Forms.GroupBox();
this.lvSecondaryTextUploaders = new ShareX.HelpersLib.MyListView();
this.chSecondaryTextUploaders = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.cbUseSecondaryUploaders = new System.Windows.Forms.CheckBox(); this.cbUseSecondaryUploaders = new System.Windows.Forms.CheckBox();
this.cbIfUploadFailRetryOnce = new System.Windows.Forms.Label(); this.cbIfUploadFailRetryOnce = new System.Windows.Forms.Label();
this.nudRetryUpload = new System.Windows.Forms.NumericUpDown(); this.nudRetryUpload = new System.Windows.Forms.NumericUpDown();
@ -160,6 +149,17 @@ private void InitializeComponent()
this.txtProxyUsername = new System.Windows.Forms.TextBox(); this.txtProxyUsername = new System.Windows.Forms.TextBox();
this.tpAdvanced = new System.Windows.Forms.TabPage(); this.tpAdvanced = new System.Windows.Forms.TabPage();
this.pgSettings = new System.Windows.Forms.PropertyGrid(); this.pgSettings = new System.Windows.Forms.PropertyGrid();
this.btnLanguages = new ShareX.HelpersLib.MenuButton();
this.eiTheme = new ShareX.HelpersLib.ExportImportControl();
this.lvClipboardFormats = new ShareX.HelpersLib.MyListView();
this.chDescription = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chFormat = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.lvSecondaryFileUploaders = new ShareX.HelpersLib.MyListView();
this.chSecondaryFileUploaders = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.lvSecondaryImageUploaders = new ShareX.HelpersLib.MyListView();
this.chSecondaryImageUploaders = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.lvSecondaryTextUploaders = new ShareX.HelpersLib.MyListView();
this.chSecondaryTextUploaders = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.tttvMain = new ShareX.HelpersLib.TabToTreeView(); this.tttvMain = new ShareX.HelpersLib.TabToTreeView();
this.tcSettings.SuspendLayout(); this.tcSettings.SuspendLayout();
this.tpGeneral.SuspendLayout(); this.tpGeneral.SuspendLayout();
@ -315,16 +315,8 @@ private void InitializeComponent()
this.cbTrayIconProgressEnabled.UseVisualStyleBackColor = true; this.cbTrayIconProgressEnabled.UseVisualStyleBackColor = true;
this.cbTrayIconProgressEnabled.CheckedChanged += new System.EventHandler(this.cbTrayIconProgressEnabled_CheckedChanged); this.cbTrayIconProgressEnabled.CheckedChanged += new System.EventHandler(this.cbTrayIconProgressEnabled_CheckedChanged);
// //
// btnLanguages
//
resources.ApplyResources(this.btnLanguages, "btnLanguages");
this.btnLanguages.Menu = this.cmsLanguages;
this.btnLanguages.Name = "btnLanguages";
this.btnLanguages.UseVisualStyleBackColor = true;
//
// cmsLanguages // cmsLanguages
// //
this.cmsLanguages.ImageScalingSize = new System.Drawing.Size(20, 20);
this.cmsLanguages.Name = "cmsLanguages"; this.cmsLanguages.Name = "cmsLanguages";
resources.ApplyResources(this.cmsLanguages, "cmsLanguages"); resources.ApplyResources(this.cmsLanguages, "cmsLanguages");
// //
@ -418,16 +410,6 @@ private void InitializeComponent()
this.cbUseCustomTheme.UseVisualStyleBackColor = true; this.cbUseCustomTheme.UseVisualStyleBackColor = true;
this.cbUseCustomTheme.CheckedChanged += new System.EventHandler(this.CbUseCustomTheme_CheckedChanged); this.cbUseCustomTheme.CheckedChanged += new System.EventHandler(this.CbUseCustomTheme_CheckedChanged);
// //
// eiTheme
//
this.eiTheme.DefaultFileName = null;
resources.ApplyResources(this.eiTheme, "eiTheme");
this.eiTheme.Name = "eiTheme";
this.eiTheme.ObjectType = null;
this.eiTheme.SerializationBinder = null;
this.eiTheme.ExportRequested += new ShareX.HelpersLib.ExportImportControl.ExportEventHandler(this.EiTheme_ExportRequested);
this.eiTheme.ImportRequested += new ShareX.HelpersLib.ExportImportControl.ImportEventHandler(this.EiTheme_ImportRequested);
//
// tpIntegration // tpIntegration
// //
this.tpIntegration.BackColor = System.Drawing.SystemColors.Window; this.tpIntegration.BackColor = System.Drawing.SystemColors.Window;
@ -848,28 +830,6 @@ private void InitializeComponent()
this.btnClipboardFormatAdd.UseVisualStyleBackColor = true; this.btnClipboardFormatAdd.UseVisualStyleBackColor = true;
this.btnClipboardFormatAdd.Click += new System.EventHandler(this.btnAddClipboardFormat_Click); this.btnClipboardFormatAdd.Click += new System.EventHandler(this.btnAddClipboardFormat_Click);
// //
// lvClipboardFormats
//
resources.ApplyResources(this.lvClipboardFormats, "lvClipboardFormats");
this.lvClipboardFormats.AutoFillColumn = true;
this.lvClipboardFormats.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.chDescription,
this.chFormat});
this.lvClipboardFormats.FullRowSelect = true;
this.lvClipboardFormats.HideSelection = false;
this.lvClipboardFormats.Name = "lvClipboardFormats";
this.lvClipboardFormats.UseCompatibleStateImageBehavior = false;
this.lvClipboardFormats.View = System.Windows.Forms.View.Details;
this.lvClipboardFormats.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.lvClipboardFormats_MouseDoubleClick);
//
// chDescription
//
resources.ApplyResources(this.chDescription, "chDescription");
//
// chFormat
//
resources.ApplyResources(this.chFormat, "chFormat");
//
// tpUploadRetry // tpUploadRetry
// //
this.tpUploadRetry.BackColor = System.Drawing.SystemColors.Window; this.tpUploadRetry.BackColor = System.Drawing.SystemColors.Window;
@ -889,28 +849,6 @@ private void InitializeComponent()
this.gbSecondaryFileUploaders.Name = "gbSecondaryFileUploaders"; this.gbSecondaryFileUploaders.Name = "gbSecondaryFileUploaders";
this.gbSecondaryFileUploaders.TabStop = false; this.gbSecondaryFileUploaders.TabStop = false;
// //
// lvSecondaryFileUploaders
//
this.lvSecondaryFileUploaders.AllowDrop = true;
this.lvSecondaryFileUploaders.AllowItemDrag = true;
this.lvSecondaryFileUploaders.AutoFillColumn = true;
this.lvSecondaryFileUploaders.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.lvSecondaryFileUploaders.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.chSecondaryFileUploaders});
resources.ApplyResources(this.lvSecondaryFileUploaders, "lvSecondaryFileUploaders");
this.lvSecondaryFileUploaders.FullRowSelect = true;
this.lvSecondaryFileUploaders.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
this.lvSecondaryFileUploaders.HideSelection = false;
this.lvSecondaryFileUploaders.MultiSelect = false;
this.lvSecondaryFileUploaders.Name = "lvSecondaryFileUploaders";
this.lvSecondaryFileUploaders.UseCompatibleStateImageBehavior = false;
this.lvSecondaryFileUploaders.View = System.Windows.Forms.View.Details;
this.lvSecondaryFileUploaders.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lvSecondaryUploaders_MouseUp);
//
// chSecondaryFileUploaders
//
resources.ApplyResources(this.chSecondaryFileUploaders, "chSecondaryFileUploaders");
//
// gbSecondaryImageUploaders // gbSecondaryImageUploaders
// //
this.gbSecondaryImageUploaders.Controls.Add(this.lvSecondaryImageUploaders); this.gbSecondaryImageUploaders.Controls.Add(this.lvSecondaryImageUploaders);
@ -918,28 +856,6 @@ private void InitializeComponent()
this.gbSecondaryImageUploaders.Name = "gbSecondaryImageUploaders"; this.gbSecondaryImageUploaders.Name = "gbSecondaryImageUploaders";
this.gbSecondaryImageUploaders.TabStop = false; this.gbSecondaryImageUploaders.TabStop = false;
// //
// lvSecondaryImageUploaders
//
this.lvSecondaryImageUploaders.AllowDrop = true;
this.lvSecondaryImageUploaders.AllowItemDrag = true;
this.lvSecondaryImageUploaders.AutoFillColumn = true;
this.lvSecondaryImageUploaders.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.lvSecondaryImageUploaders.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.chSecondaryImageUploaders});
resources.ApplyResources(this.lvSecondaryImageUploaders, "lvSecondaryImageUploaders");
this.lvSecondaryImageUploaders.FullRowSelect = true;
this.lvSecondaryImageUploaders.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
this.lvSecondaryImageUploaders.HideSelection = false;
this.lvSecondaryImageUploaders.MultiSelect = false;
this.lvSecondaryImageUploaders.Name = "lvSecondaryImageUploaders";
this.lvSecondaryImageUploaders.UseCompatibleStateImageBehavior = false;
this.lvSecondaryImageUploaders.View = System.Windows.Forms.View.Details;
this.lvSecondaryImageUploaders.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lvSecondaryUploaders_MouseUp);
//
// chSecondaryImageUploaders
//
resources.ApplyResources(this.chSecondaryImageUploaders, "chSecondaryImageUploaders");
//
// gbSecondaryTextUploaders // gbSecondaryTextUploaders
// //
this.gbSecondaryTextUploaders.Controls.Add(this.lvSecondaryTextUploaders); this.gbSecondaryTextUploaders.Controls.Add(this.lvSecondaryTextUploaders);
@ -947,28 +863,6 @@ private void InitializeComponent()
this.gbSecondaryTextUploaders.Name = "gbSecondaryTextUploaders"; this.gbSecondaryTextUploaders.Name = "gbSecondaryTextUploaders";
this.gbSecondaryTextUploaders.TabStop = false; this.gbSecondaryTextUploaders.TabStop = false;
// //
// lvSecondaryTextUploaders
//
this.lvSecondaryTextUploaders.AllowDrop = true;
this.lvSecondaryTextUploaders.AllowItemDrag = true;
this.lvSecondaryTextUploaders.AutoFillColumn = true;
this.lvSecondaryTextUploaders.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.lvSecondaryTextUploaders.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.chSecondaryTextUploaders});
resources.ApplyResources(this.lvSecondaryTextUploaders, "lvSecondaryTextUploaders");
this.lvSecondaryTextUploaders.FullRowSelect = true;
this.lvSecondaryTextUploaders.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
this.lvSecondaryTextUploaders.HideSelection = false;
this.lvSecondaryTextUploaders.MultiSelect = false;
this.lvSecondaryTextUploaders.Name = "lvSecondaryTextUploaders";
this.lvSecondaryTextUploaders.UseCompatibleStateImageBehavior = false;
this.lvSecondaryTextUploaders.View = System.Windows.Forms.View.Details;
this.lvSecondaryTextUploaders.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lvSecondaryUploaders_MouseUp);
//
// chSecondaryTextUploaders
//
resources.ApplyResources(this.chSecondaryTextUploaders, "chSecondaryTextUploaders");
//
// cbUseSecondaryUploaders // cbUseSecondaryUploaders
// //
resources.ApplyResources(this.cbUseSecondaryUploaders, "cbUseSecondaryUploaders"); resources.ApplyResources(this.cbUseSecondaryUploaders, "cbUseSecondaryUploaders");
@ -1219,6 +1113,99 @@ private void InitializeComponent()
this.pgSettings.PropertySort = System.Windows.Forms.PropertySort.Categorized; this.pgSettings.PropertySort = System.Windows.Forms.PropertySort.Categorized;
this.pgSettings.ToolbarVisible = false; this.pgSettings.ToolbarVisible = false;
// //
// btnLanguages
//
resources.ApplyResources(this.btnLanguages, "btnLanguages");
this.btnLanguages.Menu = this.cmsLanguages;
this.btnLanguages.Name = "btnLanguages";
this.btnLanguages.UseVisualStyleBackColor = true;
//
// eiTheme
//
this.eiTheme.DefaultFileName = null;
resources.ApplyResources(this.eiTheme, "eiTheme");
this.eiTheme.Name = "eiTheme";
this.eiTheme.ObjectType = null;
this.eiTheme.SerializationBinder = null;
this.eiTheme.ExportRequested += new ShareX.HelpersLib.ExportImportControl.ExportEventHandler(this.EiTheme_ExportRequested);
this.eiTheme.ImportRequested += new ShareX.HelpersLib.ExportImportControl.ImportEventHandler(this.EiTheme_ImportRequested);
//
// lvClipboardFormats
//
resources.ApplyResources(this.lvClipboardFormats, "lvClipboardFormats");
this.lvClipboardFormats.AutoFillColumn = true;
this.lvClipboardFormats.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.chDescription,
this.chFormat});
this.lvClipboardFormats.FullRowSelect = true;
this.lvClipboardFormats.HideSelection = false;
this.lvClipboardFormats.Name = "lvClipboardFormats";
this.lvClipboardFormats.UseCompatibleStateImageBehavior = false;
this.lvClipboardFormats.View = System.Windows.Forms.View.Details;
this.lvClipboardFormats.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.lvClipboardFormats_MouseDoubleClick);
//
// chDescription
//
resources.ApplyResources(this.chDescription, "chDescription");
//
// chFormat
//
resources.ApplyResources(this.chFormat, "chFormat");
//
// lvSecondaryFileUploaders
//
this.lvSecondaryFileUploaders.AllowDrop = true;
this.lvSecondaryFileUploaders.AllowItemDrag = true;
this.lvSecondaryFileUploaders.AutoFillColumn = true;
this.lvSecondaryFileUploaders.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.lvSecondaryFileUploaders.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.chSecondaryFileUploaders});
resources.ApplyResources(this.lvSecondaryFileUploaders, "lvSecondaryFileUploaders");
this.lvSecondaryFileUploaders.FullRowSelect = true;
this.lvSecondaryFileUploaders.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
this.lvSecondaryFileUploaders.HideSelection = false;
this.lvSecondaryFileUploaders.MultiSelect = false;
this.lvSecondaryFileUploaders.Name = "lvSecondaryFileUploaders";
this.lvSecondaryFileUploaders.UseCompatibleStateImageBehavior = false;
this.lvSecondaryFileUploaders.View = System.Windows.Forms.View.Details;
this.lvSecondaryFileUploaders.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lvSecondaryUploaders_MouseUp);
//
// lvSecondaryImageUploaders
//
this.lvSecondaryImageUploaders.AllowDrop = true;
this.lvSecondaryImageUploaders.AllowItemDrag = true;
this.lvSecondaryImageUploaders.AutoFillColumn = true;
this.lvSecondaryImageUploaders.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.lvSecondaryImageUploaders.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.chSecondaryImageUploaders});
resources.ApplyResources(this.lvSecondaryImageUploaders, "lvSecondaryImageUploaders");
this.lvSecondaryImageUploaders.FullRowSelect = true;
this.lvSecondaryImageUploaders.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
this.lvSecondaryImageUploaders.HideSelection = false;
this.lvSecondaryImageUploaders.MultiSelect = false;
this.lvSecondaryImageUploaders.Name = "lvSecondaryImageUploaders";
this.lvSecondaryImageUploaders.UseCompatibleStateImageBehavior = false;
this.lvSecondaryImageUploaders.View = System.Windows.Forms.View.Details;
this.lvSecondaryImageUploaders.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lvSecondaryUploaders_MouseUp);
//
// lvSecondaryTextUploaders
//
this.lvSecondaryTextUploaders.AllowDrop = true;
this.lvSecondaryTextUploaders.AllowItemDrag = true;
this.lvSecondaryTextUploaders.AutoFillColumn = true;
this.lvSecondaryTextUploaders.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.lvSecondaryTextUploaders.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.chSecondaryTextUploaders});
resources.ApplyResources(this.lvSecondaryTextUploaders, "lvSecondaryTextUploaders");
this.lvSecondaryTextUploaders.FullRowSelect = true;
this.lvSecondaryTextUploaders.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
this.lvSecondaryTextUploaders.HideSelection = false;
this.lvSecondaryTextUploaders.MultiSelect = false;
this.lvSecondaryTextUploaders.Name = "lvSecondaryTextUploaders";
this.lvSecondaryTextUploaders.UseCompatibleStateImageBehavior = false;
this.lvSecondaryTextUploaders.View = System.Windows.Forms.View.Details;
this.lvSecondaryTextUploaders.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lvSecondaryUploaders_MouseUp);
//
// tttvMain // tttvMain
// //
resources.ApplyResources(this.tttvMain, "tttvMain"); resources.ApplyResources(this.tttvMain, "tttvMain");

12
ShareX/Forms/ApplicationSettingsForm.cs
View file

@ -228,7 +228,7 @@ private void UpdateControls()
cbDontShowPrintSettingDialog.Checked = Program.Settings.DontShowPrintSettingsDialog; cbDontShowPrintSettingDialog.Checked = Program.Settings.DontShowPrintSettingsDialog;
cbPrintDontShowWindowsDialog.Checked = !Program.Settings.PrintSettings.ShowPrintDialog; cbPrintDontShowWindowsDialog.Checked = !Program.Settings.PrintSettings.ShowPrintDialog;
txtDefaultPrinterOverride.Text = Program.Settings.PrintSettings.DefaultPrinterOverride; txtDefaultPrinterOverride.Text = Program.Settings.PrintSettings.DefaultPrinterOverride;
UpdatePrintControls(); lblDefaultPrinterOverride.Visible = txtDefaultPrinterOverride.Visible = !Program.Settings.PrintSettings.ShowPrintDialog;
// Advanced // Advanced
pgSettings.SelectedObject = Program.Settings; pgSettings.SelectedObject = Program.Settings;
@ -1004,15 +1004,9 @@ private void cbRecentTasksTrayMenuMostRecentFirst_CheckedChanged(object sender,
#region Print #region Print
private void UpdatePrintControls()
{
txtDefaultPrinterOverride.Enabled = !Program.Settings.PrintSettings.ShowPrintDialog;
}
private void cbDontShowPrintSettingDialog_CheckedChanged(object sender, EventArgs e) private void cbDontShowPrintSettingDialog_CheckedChanged(object sender, EventArgs e)
{ {
Program.Settings.DontShowPrintSettingsDialog = cbDontShowPrintSettingDialog.Checked; Program.Settings.DontShowPrintSettingsDialog = cbDontShowPrintSettingDialog.Checked;
UpdatePrintControls();
} }
private void btnShowImagePrintSettings_Click(object sender, EventArgs e) private void btnShowImagePrintSettings_Click(object sender, EventArgs e)
@ -1022,19 +1016,17 @@ private void btnShowImagePrintSettings_Click(object sender, EventArgs e)
{ {
printForm.ShowDialog(); printForm.ShowDialog();
} }
UpdatePrintControls();
} }
private void cbPrintDontShowWindowsDialog_CheckedChanged(object sender, EventArgs e) private void cbPrintDontShowWindowsDialog_CheckedChanged(object sender, EventArgs e)
{ {
Program.Settings.PrintSettings.ShowPrintDialog = !cbPrintDontShowWindowsDialog.Checked; Program.Settings.PrintSettings.ShowPrintDialog = !cbPrintDontShowWindowsDialog.Checked;
UpdatePrintControls(); lblDefaultPrinterOverride.Visible = txtDefaultPrinterOverride.Visible = !Program.Settings.PrintSettings.ShowPrintDialog;
} }
private void txtDefaultPrinterOverride_TextChanged(object sender, EventArgs e) private void txtDefaultPrinterOverride_TextChanged(object sender, EventArgs e)
{ {
Program.Settings.PrintSettings.DefaultPrinterOverride = txtDefaultPrinterOverride.Text; Program.Settings.PrintSettings.DefaultPrinterOverride = txtDefaultPrinterOverride.Text;
UpdatePrintControls();
} }
#endregion Print #endregion Print

34
ShareX/Forms/ApplicationSettingsForm.resx
View file

@ -487,7 +487,7 @@
<value>btnLanguages</value> <value>btnLanguages</value>
</data> </data>
<data name="&gt;&gt;btnLanguages.Type" xml:space="preserve"> <data name="&gt;&gt;btnLanguages.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=13.5.1.0, Culture=neutral, PublicKeyToken=null</value> <value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=13.6.2.0, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;btnLanguages.Parent" xml:space="preserve"> <data name="&gt;&gt;btnLanguages.Parent" xml:space="preserve">
<value>tpGeneral</value> <value>tpGeneral</value>
@ -841,7 +841,7 @@
<value>eiTheme</value> <value>eiTheme</value>
</data> </data>
<data name="&gt;&gt;eiTheme.Type" xml:space="preserve"> <data name="&gt;&gt;eiTheme.Type" xml:space="preserve">
<value>ShareX.HelpersLib.ExportImportControl, ShareX.HelpersLib, Version=13.5.1.0, Culture=neutral, PublicKeyToken=null</value> <value>ShareX.HelpersLib.ExportImportControl, ShareX.HelpersLib, Version=13.6.2.0, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;eiTheme.Parent" xml:space="preserve"> <data name="&gt;&gt;eiTheme.Parent" xml:space="preserve">
<value>tpTheme</value> <value>tpTheme</value>
@ -998,7 +998,6 @@
</data> </data>
<data name="gbSteam.Text" xml:space="preserve"> <data name="gbSteam.Text" xml:space="preserve">
<value>Steam</value> <value>Steam</value>
<comment>@Invariant</comment>
</data> </data>
<data name="&gt;&gt;gbSteam.Name" xml:space="preserve"> <data name="&gt;&gt;gbSteam.Name" xml:space="preserve">
<value>gbSteam</value> <value>gbSteam</value>
@ -1221,7 +1220,6 @@
</data> </data>
<data name="gbWindows.Text" xml:space="preserve"> <data name="gbWindows.Text" xml:space="preserve">
<value>Windows</value> <value>Windows</value>
<comment>@Invariant</comment>
</data> </data>
<data name="&gt;&gt;gbWindows.Name" xml:space="preserve"> <data name="&gt;&gt;gbWindows.Name" xml:space="preserve">
<value>gbWindows</value> <value>gbWindows</value>
@ -1333,7 +1331,6 @@
</data> </data>
<data name="lblPreviewPersonalFolderPath.Text" xml:space="preserve"> <data name="lblPreviewPersonalFolderPath.Text" xml:space="preserve">
<value>...</value> <value>...</value>
<comment>@Invariant</comment>
</data> </data>
<data name="&gt;&gt;lblPreviewPersonalFolderPath.Name" xml:space="preserve"> <data name="&gt;&gt;lblPreviewPersonalFolderPath.Name" xml:space="preserve">
<value>lblPreviewPersonalFolderPath</value> <value>lblPreviewPersonalFolderPath</value>
@ -1577,7 +1574,6 @@
</data> </data>
<data name="lblSaveImageSubFolderPatternPreview.Text" xml:space="preserve"> <data name="lblSaveImageSubFolderPatternPreview.Text" xml:space="preserve">
<value>...</value> <value>...</value>
<comment>@Invariant</comment>
</data> </data>
<data name="&gt;&gt;lblSaveImageSubFolderPatternPreview.Name" xml:space="preserve"> <data name="&gt;&gt;lblSaveImageSubFolderPatternPreview.Name" xml:space="preserve">
<value>lblSaveImageSubFolderPatternPreview</value> <value>lblSaveImageSubFolderPatternPreview</value>
@ -2276,7 +2272,7 @@
<value>lvClipboardFormats</value> <value>lvClipboardFormats</value>
</data> </data>
<data name="&gt;&gt;lvClipboardFormats.Type" xml:space="preserve"> <data name="&gt;&gt;lvClipboardFormats.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.5.1.0, Culture=neutral, PublicKeyToken=null</value> <value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.6.2.0, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;lvClipboardFormats.Parent" xml:space="preserve"> <data name="&gt;&gt;lvClipboardFormats.Parent" xml:space="preserve">
<value>gbClipboardFormats</value> <value>gbClipboardFormats</value>
@ -2351,7 +2347,7 @@
<value>lvSecondaryFileUploaders</value> <value>lvSecondaryFileUploaders</value>
</data> </data>
<data name="&gt;&gt;lvSecondaryFileUploaders.Type" xml:space="preserve"> <data name="&gt;&gt;lvSecondaryFileUploaders.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.5.1.0, Culture=neutral, PublicKeyToken=null</value> <value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.6.2.0, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;lvSecondaryFileUploaders.Parent" xml:space="preserve"> <data name="&gt;&gt;lvSecondaryFileUploaders.Parent" xml:space="preserve">
<value>gbSecondaryFileUploaders</value> <value>gbSecondaryFileUploaders</value>
@ -2402,7 +2398,7 @@
<value>lvSecondaryImageUploaders</value> <value>lvSecondaryImageUploaders</value>
</data> </data>
<data name="&gt;&gt;lvSecondaryImageUploaders.Type" xml:space="preserve"> <data name="&gt;&gt;lvSecondaryImageUploaders.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.5.1.0, Culture=neutral, PublicKeyToken=null</value> <value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.6.2.0, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;lvSecondaryImageUploaders.Parent" xml:space="preserve"> <data name="&gt;&gt;lvSecondaryImageUploaders.Parent" xml:space="preserve">
<value>gbSecondaryImageUploaders</value> <value>gbSecondaryImageUploaders</value>
@ -2453,7 +2449,7 @@
<value>lvSecondaryTextUploaders</value> <value>lvSecondaryTextUploaders</value>
</data> </data>
<data name="&gt;&gt;lvSecondaryTextUploaders.Type" xml:space="preserve"> <data name="&gt;&gt;lvSecondaryTextUploaders.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.5.1.0, Culture=neutral, PublicKeyToken=null</value> <value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.6.2.0, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;lvSecondaryTextUploaders.Parent" xml:space="preserve"> <data name="&gt;&gt;lvSecondaryTextUploaders.Parent" xml:space="preserve">
<value>gbSecondaryTextUploaders</value> <value>gbSecondaryTextUploaders</value>
@ -2966,19 +2962,19 @@
<value>NoControl</value> <value>NoControl</value>
</data> </data>
<data name="lblDefaultPrinterOverride.Location" type="System.Drawing.Point, System.Drawing"> <data name="lblDefaultPrinterOverride.Location" type="System.Drawing.Point, System.Drawing">
<value>17, 115</value> <value>13, 96</value>
</data> </data>
<data name="lblDefaultPrinterOverride.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> <data name="lblDefaultPrinterOverride.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 0, 4, 0</value> <value>4, 0, 4, 0</value>
</data> </data>
<data name="lblDefaultPrinterOverride.Size" type="System.Drawing.Size, System.Drawing"> <data name="lblDefaultPrinterOverride.Size" type="System.Drawing.Size, System.Drawing">
<value>358, 17</value> <value>117, 13</value>
</data> </data>
<data name="lblDefaultPrinterOverride.TabIndex" type="System.Int32, mscorlib"> <data name="lblDefaultPrinterOverride.TabIndex" type="System.Int32, mscorlib">
<value>3</value> <value>3</value>
</data> </data>
<data name="lblDefaultPrinterOverride.Text" xml:space="preserve"> <data name="lblDefaultPrinterOverride.Text" xml:space="preserve">
<value>Default Printer Override (uses windows default if empty)</value> <value>Default printer override:</value>
</data> </data>
<data name="&gt;&gt;lblDefaultPrinterOverride.Name" xml:space="preserve"> <data name="&gt;&gt;lblDefaultPrinterOverride.Name" xml:space="preserve">
<value>lblDefaultPrinterOverride</value> <value>lblDefaultPrinterOverride</value>
@ -2993,13 +2989,13 @@
<value>0</value> <value>0</value>
</data> </data>
<data name="txtDefaultPrinterOverride.Location" type="System.Drawing.Point, System.Drawing"> <data name="txtDefaultPrinterOverride.Location" type="System.Drawing.Point, System.Drawing">
<value>21, 135</value> <value>16, 112</value>
</data> </data>
<data name="txtDefaultPrinterOverride.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> <data name="txtDefaultPrinterOverride.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value> <value>4, 4, 4, 4</value>
</data> </data>
<data name="txtDefaultPrinterOverride.Size" type="System.Drawing.Size, System.Drawing"> <data name="txtDefaultPrinterOverride.Size" type="System.Drawing.Size, System.Drawing">
<value>509, 22</value> <value>352, 20</value>
</data> </data>
<data name="txtDefaultPrinterOverride.TabIndex" type="System.Int32, mscorlib"> <data name="txtDefaultPrinterOverride.TabIndex" type="System.Int32, mscorlib">
<value>4</value> <value>4</value>
@ -3044,7 +3040,7 @@
<value>tpPrint</value> <value>tpPrint</value>
</data> </data>
<data name="&gt;&gt;cbPrintDontShowWindowsDialog.ZOrder" xml:space="preserve"> <data name="&gt;&gt;cbPrintDontShowWindowsDialog.ZOrder" xml:space="preserve">
<value>0</value> <value>2</value>
</data> </data>
<data name="cbDontShowPrintSettingDialog.AutoSize" type="System.Boolean, mscorlib"> <data name="cbDontShowPrintSettingDialog.AutoSize" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
@ -3074,7 +3070,7 @@
<value>tpPrint</value> <value>tpPrint</value>
</data> </data>
<data name="&gt;&gt;cbDontShowPrintSettingDialog.ZOrder" xml:space="preserve"> <data name="&gt;&gt;cbDontShowPrintSettingDialog.ZOrder" xml:space="preserve">
<value>1</value> <value>3</value>
</data> </data>
<data name="btnShowImagePrintSettings.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"> <data name="btnShowImagePrintSettings.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value> <value>NoControl</value>
@ -3101,7 +3097,7 @@
<value>tpPrint</value> <value>tpPrint</value>
</data> </data>
<data name="&gt;&gt;btnShowImagePrintSettings.ZOrder" xml:space="preserve"> <data name="&gt;&gt;btnShowImagePrintSettings.ZOrder" xml:space="preserve">
<value>2</value> <value>4</value>
</data> </data>
<data name="tpPrint.Location" type="System.Drawing.Point, System.Drawing"> <data name="tpPrint.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value> <value>4, 22</value>
@ -3509,7 +3505,7 @@
<value>tttvMain</value> <value>tttvMain</value>
</data> </data>
<data name="&gt;&gt;tttvMain.Type" xml:space="preserve"> <data name="&gt;&gt;tttvMain.Type" xml:space="preserve">
<value>ShareX.HelpersLib.TabToTreeView, ShareX.HelpersLib, Version=13.5.1.0, Culture=neutral, PublicKeyToken=null</value> <value>ShareX.HelpersLib.TabToTreeView, ShareX.HelpersLib, Version=13.6.2.0, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;tttvMain.Parent" xml:space="preserve"> <data name="&gt;&gt;tttvMain.Parent" xml:space="preserve">
<value>$this</value> <value>$this</value>