diff --git a/OwnChar.App.Desktop/LangRes/CharListControlLangRes.Designer.cs b/OwnChar.App.Desktop/LangRes/CharListControlLangRes.Designer.cs index acf7615..19c6055 100644 --- a/OwnChar.App.Desktop/LangRes/CharListControlLangRes.Designer.cs +++ b/OwnChar.App.Desktop/LangRes/CharListControlLangRes.Designer.cs @@ -60,15 +60,6 @@ namespace OwnChar.App.Desktop.LangRes { } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Fandom ähnelt. - /// - internal static string Column_CharFandom { - get { - return ResourceManager.GetString("Column_CharFandom", resourceCulture); - } - } - /// /// Sucht eine lokalisierte Zeichenfolge, die Group ähnelt. /// @@ -78,15 +69,6 @@ namespace OwnChar.App.Desktop.LangRes { } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Name ähnelt. - /// - internal static string Column_CharName { - get { - return ResourceManager.GetString("Column_CharName", resourceCulture); - } - } - /// /// Sucht eine lokalisierte Zeichenfolge, die Owner ähnelt. /// diff --git a/OwnChar.App.Desktop/LangRes/CharListControlLangRes.resx b/OwnChar.App.Desktop/LangRes/CharListControlLangRes.resx index b62b404..6f149d4 100644 --- a/OwnChar.App.Desktop/LangRes/CharListControlLangRes.resx +++ b/OwnChar.App.Desktop/LangRes/CharListControlLangRes.resx @@ -117,15 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Fandom - Group - - Name - Owner diff --git a/OwnChar.App.Desktop/LangRes/GeneralLangRes.Designer.cs b/OwnChar.App.Desktop/LangRes/GeneralLangRes.Designer.cs index dd031c4..15929ec 100644 --- a/OwnChar.App.Desktop/LangRes/GeneralLangRes.Designer.cs +++ b/OwnChar.App.Desktop/LangRes/GeneralLangRes.Designer.cs @@ -60,6 +60,24 @@ namespace OwnChar.App.Desktop.LangRes { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Fandom ähnelt. + /// + internal static string Column_Fandom { + get { + return ResourceManager.GetString("Column_Fandom", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Name ähnelt. + /// + internal static string Column_Name { + get { + return ResourceManager.GetString("Column_Name", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Do you really want to delete {0}? ähnelt. /// diff --git a/OwnChar.App.Desktop/LangRes/GeneralLangRes.resx b/OwnChar.App.Desktop/LangRes/GeneralLangRes.resx index ab4178b..a8a60ef 100644 --- a/OwnChar.App.Desktop/LangRes/GeneralLangRes.resx +++ b/OwnChar.App.Desktop/LangRes/GeneralLangRes.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Fandom + + + Name + Do you really want to delete {0}? diff --git a/OwnChar.App.Desktop/LangRes/GroupListControlLangRes.Designer.cs b/OwnChar.App.Desktop/LangRes/GroupListControlLangRes.Designer.cs new file mode 100644 index 0000000..3ea1fd4 --- /dev/null +++ b/OwnChar.App.Desktop/LangRes/GroupListControlLangRes.Designer.cs @@ -0,0 +1,72 @@ +//------------------------------------------------------------------------------ +// +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion:4.0.30319.42000 +// +// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +// der Code erneut generiert wird. +// +//------------------------------------------------------------------------------ + +namespace OwnChar.App.Desktop.LangRes { + using System; + + + /// + /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. + /// + // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. + // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class GroupListControlLangRes { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal GroupListControlLangRes() { + } + + /// + /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OwnChar.App.Desktop.LangRes.GroupListControlLangRes", typeof(GroupListControlLangRes).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Owner ähnelt. + /// + internal static string Column_Owner { + get { + return ResourceManager.GetString("Column_Owner", resourceCulture); + } + } + } +} diff --git a/OwnChar.App.Desktop/LangRes/GroupListControlLangRes.resx b/OwnChar.App.Desktop/LangRes/GroupListControlLangRes.resx new file mode 100644 index 0000000..b3939b4 --- /dev/null +++ b/OwnChar.App.Desktop/LangRes/GroupListControlLangRes.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Owner + + \ No newline at end of file diff --git a/OwnChar.App.Desktop/OwnChar.App.Desktop.csproj b/OwnChar.App.Desktop/OwnChar.App.Desktop.csproj index 3bc291d..2122d38 100644 --- a/OwnChar.App.Desktop/OwnChar.App.Desktop.csproj +++ b/OwnChar.App.Desktop/OwnChar.App.Desktop.csproj @@ -31,6 +31,11 @@ + + True + True + GroupListControlLangRes.resx + True True @@ -54,6 +59,10 @@ + + ResXFileCodeGenerator + GroupListControlLangRes.Designer.cs + ResXFileCodeGenerator JsonFileLoginProviderLangRes.Designer.cs diff --git a/OwnChar.App.Desktop/UI/MainTabs/Controls/CharacterListControl.cs b/OwnChar.App.Desktop/UI/MainTabs/Controls/CharacterListControl.cs index 4f49cc4..6111568 100644 --- a/OwnChar.App.Desktop/UI/MainTabs/Controls/CharacterListControl.cs +++ b/OwnChar.App.Desktop/UI/MainTabs/Controls/CharacterListControl.cs @@ -17,6 +17,11 @@ public partial class CharacterListControl : UserControl private UserProfile? profile; private Group? group; + public CharacterListControl() + { + InitializeComponent(); + } + public void LoadContent(IMainWindowApi mainApi, UserProfile? profile) { LoadContent(mainApi, profile, null); @@ -32,7 +37,6 @@ public partial class CharacterListControl : UserControl this.mainApi = mainApi; this.profile = profile; this.group = group; - InitializeComponent(); PrepareList(); LoadList(group); } @@ -42,8 +46,8 @@ public partial class CharacterListControl : UserControl radListView_CharList.BeginUpdate(); radListView_CharList.Columns.Clear(); - radListView_CharList.Columns.Add(CharListControlLangRes.Column_CharName); - radListView_CharList.Columns.Add(CharListControlLangRes.Column_CharFandom); + radListView_CharList.Columns.Add(GeneralLangRes.Column_Name); + radListView_CharList.Columns.Add(GeneralLangRes.Column_Fandom); if (profile != null) radListView_CharList.Columns.Add(CharListControlLangRes.Column_CharOwner); @@ -157,16 +161,16 @@ public partial class CharacterListControl : UserControl if (!string.IsNullOrWhiteSpace(filterText)) { - var allValues = new string[] + var allValues = new string?[] { - character.Name!, - character.Fandom ?? "", - character.Owner!.Name!, + character.Name, + character.Fandom, + character.Owner?.Name, }; foreach (var value in allValues) { - if (!isValidResult && value.Contains(filterText)) + if (!isValidResult && value is not null && value.Contains(filterText)) isValidResult = true; } } diff --git a/OwnChar.App.Desktop/UI/MainTabs/Controls/GroupListControl.Designer.cs b/OwnChar.App.Desktop/UI/MainTabs/Controls/GroupListControl.Designer.cs index ae4d933..afe6a48 100644 --- a/OwnChar.App.Desktop/UI/MainTabs/Controls/GroupListControl.Designer.cs +++ b/OwnChar.App.Desktop/UI/MainTabs/Controls/GroupListControl.Designer.cs @@ -28,44 +28,44 @@ /// private void InitializeComponent() { - radListView1 = new Telerik.WinControls.UI.RadListView(); + radListView_GroupList = new Telerik.WinControls.UI.RadListView(); radMenuItem_CreateGroup = new Telerik.WinControls.UI.RadMenuItem(); radMenuItem_DeleteGroup = new Telerik.WinControls.UI.RadMenuItem(); radMenuItem_OpenGroup = new Telerik.WinControls.UI.RadMenuItem(); radMenu1 = new Telerik.WinControls.UI.RadMenu(); tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); radTextBoxControl_SearchBox = new Telerik.WinControls.UI.RadTextBoxControl(); - ((System.ComponentModel.ISupportInitialize)radListView1).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radListView_GroupList).BeginInit(); ((System.ComponentModel.ISupportInitialize)radMenu1).BeginInit(); tableLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)radTextBoxControl_SearchBox).BeginInit(); SuspendLayout(); // - // radListView1 + // radListView_GroupList // - radListView1.Dock = System.Windows.Forms.DockStyle.Fill; - radListView1.Location = new System.Drawing.Point(3, 31); - radListView1.Name = "radListView1"; - radListView1.Size = new System.Drawing.Size(494, 446); - radListView1.TabIndex = 0; + radListView_GroupList.Dock = System.Windows.Forms.DockStyle.Fill; + radListView_GroupList.Location = new System.Drawing.Point(3, 31); + radListView_GroupList.Name = "radListView_GroupList"; + radListView_GroupList.Size = new System.Drawing.Size(494, 446); + radListView_GroupList.TabIndex = 0; // // radMenuItem_CreateGroup // radMenuItem_CreateGroup.Name = "radMenuItem_CreateGroup"; radMenuItem_CreateGroup.Text = "New"; - radMenuItem_CreateGroup.Click += radMenuItem_CreateGroup_Click; + radMenuItem_CreateGroup.Click += RadMenuItem_CreateGroup_Click; // // radMenuItem_DeleteGroup // radMenuItem_DeleteGroup.Name = "radMenuItem_DeleteGroup"; radMenuItem_DeleteGroup.Text = "Delete"; - radMenuItem_DeleteGroup.Click += radMenuItem_DeleteGroup_Click; + radMenuItem_DeleteGroup.Click += RadMenuItem_DeleteGroup_Click; // // radMenuItem_OpenGroup // radMenuItem_OpenGroup.Name = "radMenuItem_OpenGroup"; radMenuItem_OpenGroup.Text = "Open"; - radMenuItem_OpenGroup.Click += radMenuItem_OpenGroup_Click; + radMenuItem_OpenGroup.Click += RadMenuItem_OpenGroup_Click; // // radMenu1 // @@ -79,7 +79,7 @@ // tableLayoutPanel1.ColumnCount = 1; tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - tableLayoutPanel1.Controls.Add(radListView1, 0, 1); + tableLayoutPanel1.Controls.Add(radListView_GroupList, 0, 1); tableLayoutPanel1.Controls.Add(radTextBoxControl_SearchBox, 0, 0); tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; tableLayoutPanel1.Location = new System.Drawing.Point(0, 20); @@ -108,7 +108,7 @@ Controls.Add(radMenu1); Name = "GroupListControl"; Size = new System.Drawing.Size(500, 500); - ((System.ComponentModel.ISupportInitialize)radListView1).EndInit(); + ((System.ComponentModel.ISupportInitialize)radListView_GroupList).EndInit(); ((System.ComponentModel.ISupportInitialize)radMenu1).EndInit(); tableLayoutPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)radTextBoxControl_SearchBox).EndInit(); @@ -118,7 +118,7 @@ #endregion - private Telerik.WinControls.UI.RadListView radListView1; + private Telerik.WinControls.UI.RadListView radListView_GroupList; private Telerik.WinControls.UI.RadMenu radMenu1; private Telerik.WinControls.UI.RadMenuItem radMenuItem_CreateGroup; private Telerik.WinControls.UI.RadMenuItem radMenuItem_DeleteGroup; diff --git a/OwnChar.App.Desktop/UI/MainTabs/Controls/GroupListControl.cs b/OwnChar.App.Desktop/UI/MainTabs/Controls/GroupListControl.cs index 9737b45..9ddac32 100644 --- a/OwnChar.App.Desktop/UI/MainTabs/Controls/GroupListControl.cs +++ b/OwnChar.App.Desktop/UI/MainTabs/Controls/GroupListControl.cs @@ -1,27 +1,51 @@ -using System.Windows.Forms; +using OwnChar.App.Desktop.Api; +using OwnChar.App.Desktop.LangRes; +using Pilz.UI; +using System.Windows.Forms; +using static System.Runtime.InteropServices.JavaScript.JSType; namespace OwnChar.App.Desktop.UI.MainTabs.Controls; public partial class GroupListControl : UserControl { + private IMainWindowApi mainApi = null!; + public GroupListControl() { InitializeComponent(); } + public void LoadContent(IMainWindowApi mainApi) + { + this.mainApi = mainApi; + PrepareList(); + } + + private void PrepareList() + { + radListView_GroupList.BeginUpdate(); + radListView_GroupList.Columns.Clear(); + + radListView_GroupList.Columns.Add(GeneralLangRes.Column_Name); + radListView_GroupList.Columns.Add(GeneralLangRes.Column_Fandom); + radListView_GroupList.Columns.Add(GroupListControlLangRes.Column_Owner); + + radListView_GroupList.EndUpdate(); + } + // E V E N T S - private void radMenuItem_CreateGroup_Click(object sender, System.EventArgs e) + private void RadMenuItem_CreateGroup_Click(object sender, System.EventArgs e) { } - private void radMenuItem_DeleteGroup_Click(object sender, System.EventArgs e) + private void RadMenuItem_DeleteGroup_Click(object sender, System.EventArgs e) { } - private void radMenuItem_OpenGroup_Click(object sender, System.EventArgs e) + private void RadMenuItem_OpenGroup_Click(object sender, System.EventArgs e) { }