From a67e35f3baafff333cb38d93b95dc95c7f44e8f5 Mon Sep 17 00:00:00 2001 From: Jaex Date: Sat, 1 Jan 2022 02:32:21 +0300 Subject: [PATCH] Disable column sort because not works with virtual mode --- .../Forms/HistoryForm.Designer.cs | 2 +- ShareX.HistoryLib/Forms/HistoryForm.cs | 3 - ShareX.HistoryLib/Forms/HistoryForm.resx | 160 +++++++++--------- 3 files changed, 81 insertions(+), 84 deletions(-) diff --git a/ShareX.HistoryLib/Forms/HistoryForm.Designer.cs b/ShareX.HistoryLib/Forms/HistoryForm.Designer.cs index 5a3170e79..2f5b5d328 100644 --- a/ShareX.HistoryLib/Forms/HistoryForm.Designer.cs +++ b/ShareX.HistoryLib/Forms/HistoryForm.Designer.cs @@ -206,7 +206,6 @@ private void InitializeComponent() // // lvHistory // - this.lvHistory.AllowColumnSort = true; this.lvHistory.AutoFillColumn = true; this.lvHistory.BorderStyle = System.Windows.Forms.BorderStyle.None; this.lvHistory.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { @@ -216,6 +215,7 @@ private void InitializeComponent() this.chURL}); resources.ApplyResources(this.lvHistory, "lvHistory"); this.lvHistory.FullRowSelect = true; + this.lvHistory.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; this.lvHistory.HideSelection = false; this.lvHistory.Name = "lvHistory"; this.lvHistory.UseCompatibleStateImageBehavior = false; diff --git a/ShareX.HistoryLib/Forms/HistoryForm.cs b/ShareX.HistoryLib/Forms/HistoryForm.cs index f3ae23bd9..cb230b64d 100644 --- a/ShareX.HistoryLib/Forms/HistoryForm.cs +++ b/ShareX.HistoryLib/Forms/HistoryForm.cs @@ -65,9 +65,6 @@ public HistoryForm(string historyPath, HistorySettings settings, Action UpdateTitle(); - // Mark the Date column as having a date; used for sorting - chDateTime.Tag = new DateTime(); - ImageList il = new ImageList(); il.ColorDepth = ColorDepth.Depth32Bit; il.Images.Add(Resources.image); diff --git a/ShareX.HistoryLib/Forms/HistoryForm.resx b/ShareX.HistoryLib/Forms/HistoryForm.resx index 25078956a..06aa0e5e5 100644 --- a/ShareX.HistoryLib/Forms/HistoryForm.resx +++ b/ShareX.HistoryLib/Forms/HistoryForm.resx @@ -338,6 +338,30 @@ 0 + + + + + 24 + + + Date + + + 115 + + + Filename + + + 170 + + + URL + + + 230 + Fill @@ -420,74 +444,11 @@ None - - 45, 22 - - - Search: - - - Segoe UI, 9pt - - - 300, 25 - - - Magenta - - - 23, 22 - - - Search - - - Magenta - - - 23, 22 - - - Advanced search... - - - 6, 25 - - - Magenta - - - 23, 22 - - - Toggle more info - - - Magenta - - - 23, 22 - - - Show stats... - - - 6, 25 - - - Magenta - - - 23, 22 - - - Settings... - 3, 0 - 508, 25 + 477, 25 0 @@ -915,29 +876,68 @@ 14 - - + + 45, 22 - - 24 + + Search: - - Date + + Segoe UI, 9pt - - 115 + + 300, 25 - - Filename + + Magenta - - 170 + + 23, 22 - - URL + + Search - - 230 + + Magenta + + + 23, 22 + + + Advanced search... + + + 6, 25 + + + Magenta + + + 23, 22 + + + Toggle more info + + + Magenta + + + 23, 22 + + + Show stats... + + + 6, 25 + + + Magenta + + + 23, 22 + + + Settings... Fill