working on grouplistcontrol & charlistcontrol

This commit is contained in:
Zoe Fenris
2024-06-24 20:20:10 +02:00
parent 45eb3b7dd8
commit ba1c445183
10 changed files with 282 additions and 50 deletions

View File

@@ -60,15 +60,6 @@ namespace OwnChar.App.Desktop.LangRes {
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Fandom ähnelt.
/// </summary>
internal static string Column_CharFandom {
get {
return ResourceManager.GetString("Column_CharFandom", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Group ähnelt.
/// </summary>
@@ -78,15 +69,6 @@ namespace OwnChar.App.Desktop.LangRes {
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Name ähnelt.
/// </summary>
internal static string Column_CharName {
get {
return ResourceManager.GetString("Column_CharName", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Owner ähnelt.
/// </summary>

View File

@@ -117,15 +117,9 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Column_CharFandom" xml:space="preserve">
<value>Fandom</value>
</data>
<data name="Column_CharGroup" xml:space="preserve">
<value>Group</value>
</data>
<data name="Column_CharName" xml:space="preserve">
<value>Name</value>
</data>
<data name="Column_CharOwner" xml:space="preserve">
<value>Owner</value>
</data>

View File

@@ -60,6 +60,24 @@ namespace OwnChar.App.Desktop.LangRes {
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Fandom ähnelt.
/// </summary>
internal static string Column_Fandom {
get {
return ResourceManager.GetString("Column_Fandom", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Name ähnelt.
/// </summary>
internal static string Column_Name {
get {
return ResourceManager.GetString("Column_Name", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Do you really want to delete {0}? ähnelt.
/// </summary>

View File

@@ -117,6 +117,12 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Column_Fandom" xml:space="preserve">
<value>Fandom</value>
</data>
<data name="Column_Name" xml:space="preserve">
<value>Name</value>
</data>
<data name="MsgBox_ConfirmDelete_TextGeneral" xml:space="preserve">
<value>Do you really want to delete {0}?</value>
</data>

View File

@@ -0,0 +1,72 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 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.
// </auto-generated>
//------------------------------------------------------------------------------
namespace OwnChar.App.Desktop.LangRes {
using System;
/// <summary>
/// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
/// </summary>
// 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() {
}
/// <summary>
/// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
/// </summary>
[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;
}
}
/// <summary>
/// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
/// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
set {
resourceCulture = value;
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Owner ähnelt.
/// </summary>
internal static string Column_Owner {
get {
return ResourceManager.GetString("Column_Owner", resourceCulture);
}
}
}
}

View File

@@ -0,0 +1,123 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Column_Owner" xml:space="preserve">
<value>Owner</value>
</data>
</root>

View File

@@ -31,6 +31,11 @@
</ItemGroup>
<ItemGroup>
<Compile Update="LangRes\GroupListControlLangRes.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>GroupListControlLangRes.resx</DependentUpon>
</Compile>
<Compile Update="LangRes\JsonFileLoginProviderLangRes.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
@@ -54,6 +59,10 @@
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="LangRes\GroupListControlLangRes.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>GroupListControlLangRes.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="LangRes\JsonFileLoginProviderLangRes.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>JsonFileLoginProviderLangRes.Designer.cs</LastGenOutput>

View File

@@ -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;
}
}

View File

@@ -28,44 +28,44 @@
/// </summary>
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;

View File

@@ -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)
{
}