diff --git a/ShareX.HistoryLib/UserControls/ObjectListView.cs b/ShareX.HelpersLib/Controls/ObjectListView.cs similarity index 97% rename from ShareX.HistoryLib/UserControls/ObjectListView.cs rename to ShareX.HelpersLib/Controls/ObjectListView.cs index b65789925..4ddc2a606 100644 --- a/ShareX.HistoryLib/UserControls/ObjectListView.cs +++ b/ShareX.HelpersLib/Controls/ObjectListView.cs @@ -23,14 +23,13 @@ #endregion License Information (GPL v3) -using ShareX.HelpersLib; -using ShareX.HistoryLib.Properties; +using ShareX.HelpersLib.Properties; using System; using System.ComponentModel; using System.Reflection; using System.Windows.Forms; -namespace ShareX.HistoryLib +namespace ShareX.HelpersLib { public class ObjectListView : MyListView { diff --git a/ShareX.HelpersLib/Properties/Resources.Designer.cs b/ShareX.HelpersLib/Properties/Resources.Designer.cs index 2b86f4d41..b9706d8e9 100644 --- a/ShareX.HelpersLib/Properties/Resources.Designer.cs +++ b/ShareX.HelpersLib/Properties/Resources.Designer.cs @@ -2222,6 +2222,42 @@ internal class Resources { } } + /// + /// Looks up a localized string similar to Copy name. + /// + internal static string ObjectListView_ObjectListView_Copy_name { + get { + return ResourceManager.GetString("ObjectListView_ObjectListView_Copy_name", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Copy value. + /// + internal static string ObjectListView_ObjectListView_Copy_value { + get { + return ResourceManager.GetString("ObjectListView_ObjectListView_Copy_value", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Name. + /// + internal static string ObjectListView_ObjectListView_Name { + get { + return ResourceManager.GetString("ObjectListView_ObjectListView_Name", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Value. + /// + internal static string ObjectListView_ObjectListView_Value { + get { + return ResourceManager.GetString("ObjectListView_ObjectListView_Value", resourceCulture); + } + } + /// /// Looks up a localized string similar to 1 Day. /// diff --git a/ShareX.HelpersLib/Properties/Resources.resx b/ShareX.HelpersLib/Properties/Resources.resx index 26f752f33..128019d6f 100644 --- a/ShareX.HelpersLib/Properties/Resources.resx +++ b/ShareX.HelpersLib/Properties/Resources.resx @@ -1205,4 +1205,16 @@ Would you like to download and install it? Week of year + + Copy name + + + Copy value + + + Name + + + Value + \ No newline at end of file diff --git a/ShareX.HelpersLib/ShareX.HelpersLib.csproj b/ShareX.HelpersLib/ShareX.HelpersLib.csproj index 9a141d711..b549c7365 100644 --- a/ShareX.HelpersLib/ShareX.HelpersLib.csproj +++ b/ShareX.HelpersLib/ShareX.HelpersLib.csproj @@ -103,6 +103,9 @@ Properties\SharedAssemblyInfo.cs + + Component + diff --git a/ShareX.HistoryLib/Forms/HistoryItemInfoForm.Designer.cs b/ShareX.HistoryLib/Forms/HistoryItemInfoForm.Designer.cs index 62970d5bf..69ba33fc8 100644 --- a/ShareX.HistoryLib/Forms/HistoryItemInfoForm.Designer.cs +++ b/ShareX.HistoryLib/Forms/HistoryItemInfoForm.Designer.cs @@ -30,7 +30,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HistoryItemInfoForm)); - this.olvMain = new ShareX.HistoryLib.ObjectListView(); + this.olvMain = new ShareX.HelpersLib.ObjectListView(); this.SuspendLayout(); // // olvMain @@ -59,6 +59,6 @@ private void InitializeComponent() #endregion Windows Form Designer generated code - private ShareX.HistoryLib.ObjectListView olvMain; + private ShareX.HelpersLib.ObjectListView olvMain; } } \ No newline at end of file diff --git a/ShareX.HistoryLib/Forms/HistoryItemInfoForm.cs b/ShareX.HistoryLib/Forms/HistoryItemInfoForm.cs index 52c7465e7..3bfac5634 100644 --- a/ShareX.HistoryLib/Forms/HistoryItemInfoForm.cs +++ b/ShareX.HistoryLib/Forms/HistoryItemInfoForm.cs @@ -30,7 +30,7 @@ namespace ShareX.HistoryLib { public partial class HistoryItemInfoForm : Form { - public HistoryItemInfoForm(object hi) + public HistoryItemInfoForm(HistoryItem hi) { InitializeComponent(); ShareXResources.ApplyTheme(this); diff --git a/ShareX.HistoryLib/Properties/Resources.Designer.cs b/ShareX.HistoryLib/Properties/Resources.Designer.cs index 46d5387c5..2a7b3be22 100644 --- a/ShareX.HistoryLib/Properties/Resources.Designer.cs +++ b/ShareX.HistoryLib/Properties/Resources.Designer.cs @@ -460,41 +460,5 @@ internal class Resources { return ((System.Drawing.Bitmap)(obj)); } } - - /// - /// Looks up a localized string similar to Copy name. - /// - internal static string ObjectListView_ObjectListView_Copy_name { - get { - return ResourceManager.GetString("ObjectListView_ObjectListView_Copy_name", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Copy value. - /// - internal static string ObjectListView_ObjectListView_Copy_value { - get { - return ResourceManager.GetString("ObjectListView_ObjectListView_Copy_value", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Name. - /// - internal static string ObjectListView_ObjectListView_Name { - get { - return ResourceManager.GetString("ObjectListView_ObjectListView_Name", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Value. - /// - internal static string ObjectListView_ObjectListView_Value { - get { - return ResourceManager.GetString("ObjectListView_ObjectListView_Value", resourceCulture); - } - } } } diff --git a/ShareX.HistoryLib/Properties/Resources.resx b/ShareX.HistoryLib/Properties/Resources.resx index 2b3bd546f..c31f9ddbe 100644 --- a/ShareX.HistoryLib/Properties/Resources.resx +++ b/ShareX.HistoryLib/Properties/Resources.resx @@ -117,9 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Name - Error @@ -135,9 +132,6 @@ Image - - Copy name - Markdown link @@ -151,9 +145,6 @@ ..\Resources\globe.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Copy value - File name with extension @@ -196,9 +187,6 @@ HTML linked image - - Value - Forum (BBCode) linked image diff --git a/ShareX.HistoryLib/ShareX.HistoryLib.csproj b/ShareX.HistoryLib/ShareX.HistoryLib.csproj index ea8d7d459..9c16c6966 100644 --- a/ShareX.HistoryLib/ShareX.HistoryLib.csproj +++ b/ShareX.HistoryLib/ShareX.HistoryLib.csproj @@ -108,9 +108,6 @@ True Resources.resx - - Component - Form