diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs index 7d0b0e842..840bc2118 100644 --- a/ShareX/Forms/MainForm.Designer.cs +++ b/ShareX/Forms/MainForm.Designer.cs @@ -194,6 +194,8 @@ private void InitializeComponent() this.tsmiTrayWebpageCapture = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayTextCapture = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayAutoCapture = new System.Windows.Forms.ToolStripMenuItem(); + this.tssTrayCapture1 = new System.Windows.Forms.ToolStripSeparator(); + this.tsmiTrayShowCursor = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayUpload = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayUploadFile = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayUploadFolder = new System.Windows.Forms.ToolStripMenuItem(); @@ -261,8 +263,6 @@ private void InitializeComponent() this.btnCloseNews = new System.Windows.Forms.Button(); this.flpCommunity = new System.Windows.Forms.FlowLayoutPanel(); this.flpDiscord = new System.Windows.Forms.FlowLayoutPanel(); - this.tssTrayCapture1 = new System.Windows.Forms.ToolStripSeparator(); - this.tsmiTrayShowCursor = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit(); this.scMain.Panel1.SuspendLayout(); this.scMain.Panel2.SuspendLayout(); @@ -325,6 +325,7 @@ private void InitializeComponent() this.lvUploads.ShowItemToolTips = true; this.lvUploads.UseCompatibleStateImageBehavior = false; this.lvUploads.View = System.Windows.Forms.View.Details; + this.lvUploads.ColumnWidthChanged += new System.Windows.Forms.ColumnWidthChangedEventHandler(this.lvUploads_ColumnWidthChanged); this.lvUploads.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.lvUploads_ItemDrag); this.lvUploads.SelectedIndexChanged += new System.EventHandler(this.lvUploads_SelectedIndexChanged); this.lvUploads.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.lvUploads_QueryContinueDrag); @@ -1569,6 +1570,19 @@ private void InitializeComponent() resources.ApplyResources(this.tsmiTrayAutoCapture, "tsmiTrayAutoCapture"); this.tsmiTrayAutoCapture.Click += new System.EventHandler(this.tsmiAutoCapture_Click); // + // tssTrayCapture1 + // + this.tssTrayCapture1.Name = "tssTrayCapture1"; + resources.ApplyResources(this.tssTrayCapture1, "tssTrayCapture1"); + // + // tsmiTrayShowCursor + // + this.tsmiTrayShowCursor.CheckOnClick = true; + this.tsmiTrayShowCursor.Image = global::ShareX.Properties.Resources.cursor; + this.tsmiTrayShowCursor.Name = "tsmiTrayShowCursor"; + resources.ApplyResources(this.tsmiTrayShowCursor, "tsmiTrayShowCursor"); + this.tsmiTrayShowCursor.Click += new System.EventHandler(this.tsmiShowCursor_Click); + // // tsmiTrayUpload // this.tsmiTrayUpload.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -2059,19 +2073,6 @@ private void InitializeComponent() this.flpDiscord.Controls.Add(this.pbDiscordHide); this.flpDiscord.Name = "flpDiscord"; // - // tssTrayCapture1 - // - this.tssTrayCapture1.Name = "tssTrayCapture1"; - resources.ApplyResources(this.tssTrayCapture1, "tssTrayCapture1"); - // - // tsmiTrayShowCursor - // - this.tsmiTrayShowCursor.CheckOnClick = true; - this.tsmiTrayShowCursor.Image = global::ShareX.Properties.Resources.cursor; - this.tsmiTrayShowCursor.Name = "tsmiTrayShowCursor"; - resources.ApplyResources(this.tsmiTrayShowCursor, "tsmiTrayShowCursor"); - this.tsmiTrayShowCursor.Click += new System.EventHandler(this.tsmiShowCursor_Click); - // // MainForm // this.AllowDrop = true; diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 4ab56fee7..aacba2630 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -972,11 +972,14 @@ private void UpdateMainWindowLayout() private void SaveTaskListViewColumnWidths() { - Program.Settings.TaskListViewColumnWidths = new List(); - - for (int i = 0; i < lvUploads.Columns.Count - 1; i++) + if (IsReady) { - Program.Settings.TaskListViewColumnWidths.Add(lvUploads.Columns[i].Width); + Program.Settings.TaskListViewColumnWidths = new List(); + + for (int i = 0; i < lvUploads.Columns.Count - 1; i++) + { + Program.Settings.TaskListViewColumnWidths.Add(lvUploads.Columns[i].Width); + } } } @@ -1152,8 +1155,6 @@ private void MainForm_SizeChanged(object sender, EventArgs e) private void MainForm_FormClosing(object sender, FormClosingEventArgs e) { - SaveTaskListViewColumnWidths(); - if (e.CloseReason == CloseReason.UserClosing && Program.Settings.ShowTray && !forceClose) { e.Cancel = true; @@ -1308,6 +1309,11 @@ private void cmsTaskInfo_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e } } + private void lvUploads_ColumnWidthChanged(object sender, ColumnWidthChangedEventArgs e) + { + SaveTaskListViewColumnWidths(); + } + private void lvUploads_ItemDrag(object sender, ItemDragEventArgs e) { TaskInfo[] taskInfos = GetCurrentTasks().Select(x => x.Info).Where(x => x != null).ToArray(); diff --git a/ShareX/Forms/MainForm.resx b/ShareX/Forms/MainForm.resx index 2fae22eb1..a0f10bb8c 100644 --- a/ShareX/Forms/MainForm.resx +++ b/ShareX/Forms/MainForm.resx @@ -214,7 +214,7 @@ lvUploads - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.1.0.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.3.0.0, Culture=neutral, PublicKeyToken=null scMain.Panel1 @@ -250,7 +250,7 @@ pbPreview - ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=12.1.0.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=12.3.0.0, Culture=neutral, PublicKeyToken=null scMain.Panel2 @@ -286,7 +286,7 @@ scMain - ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=12.1.0.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=12.3.0.0, Culture=neutral, PublicKeyToken=null $this @@ -916,7 +916,7 @@ tsMain - ShareX.HelpersLib.ToolStripBorderRight, ShareX.HelpersLib, Version=12.1.0.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.ToolStripBorderRight, ShareX.HelpersLib, Version=12.3.0.0, Culture=neutral, PublicKeyToken=null $this @@ -941,7 +941,6 @@ Enter - @Invariant 173, 22 @@ -972,7 +971,6 @@ Ctrl+Enter - @Invariant 173, 22 @@ -982,7 +980,6 @@ Shift+Enter - @Invariant 173, 22 @@ -1004,7 +1001,6 @@ Ctrl+C - @Invariant 233, 22 @@ -1035,7 +1031,6 @@ Shift+C - @Invariant 233, 22 @@ -1045,7 +1040,6 @@ Alt+C - @Invariant 233, 22 @@ -1139,7 +1133,6 @@ Ctrl+Shift+C - @Invariant 233, 22 @@ -1179,7 +1172,6 @@ Ctrl+U - @Invariant 228, 22 @@ -1189,7 +1181,6 @@ Ctrl+D - @Invariant 228, 22 @@ -1199,7 +1190,6 @@ Ctrl+E - @Invariant 228, 22 @@ -1209,7 +1199,6 @@ Del - @Invariant 228, 22 @@ -1219,7 +1208,6 @@ Shift+Del - @Invariant 228, 22 @@ -1777,7 +1765,7 @@ Exit - 193, 506 + 193, 484 cmsTray @@ -1787,7 +1775,6 @@ ShareX - @Invariant 405, 17 @@ -1877,7 +1864,7 @@ ucNews - ShareX.NewsListControl, ShareX, Version=12.1.0.0, Culture=neutral, PublicKeyToken=null + ShareX.NewsListControl, ShareX, Version=12.3.0.0, Culture=neutral, PublicKeyToken=null pNews @@ -2420,7 +2407,7 @@ tsbNews - ShareX.HelpersLib.ToolStripButtonCounter, ShareX.HelpersLib, Version=12.1.0.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.ToolStripButtonCounter, ShareX.HelpersLib, Version=12.3.0.0, Culture=neutral, PublicKeyToken=null tsddbDebug @@ -2468,7 +2455,7 @@ tsbDonate - ShareX.HelpersLib.ToolStripButtonColorAnimation, ShareX.HelpersLib, Version=12.1.0.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.ToolStripButtonColorAnimation, ShareX.HelpersLib, Version=12.3.0.0, Culture=neutral, PublicKeyToken=null tsbAbout @@ -2944,6 +2931,18 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tssTrayCapture1 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tsmiTrayShowCursor + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + tsmiTrayUpload @@ -3304,22 +3303,10 @@ System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tssTrayCapture1 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tsmiTrayShowCursor - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - MainForm - ShareX.HelpersLib.HotkeyForm, ShareX.HelpersLib, Version=12.1.0.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.HotkeyForm, ShareX.HelpersLib, Version=12.3.0.0, Culture=neutral, PublicKeyToken=null \ No newline at end of file