diff --git a/OwnChar.App.Desktop/Features/MainWindow/QuickAction/HomeFeature.cs b/OwnChar.App.Desktop/Features/MainWindow/QuickAction/HomeFeature.cs
index 9136210..4f2008c 100644
--- a/OwnChar.App.Desktop/Features/MainWindow/QuickAction/HomeFeature.cs
+++ b/OwnChar.App.Desktop/Features/MainWindow/QuickAction/HomeFeature.cs
@@ -11,7 +11,7 @@ namespace OwnChar.App.Desktop.Features.MainWindow.QuickAction
protected override object? ExecuteFunction(PluginFunctionParameter? @params)
{
if (@params is MainWindowParams p)
- p.Api.OpenTab(new TabUserView(p.Api, p.Api.Manager?.CurrentUser));
+ p.Api.OpenTab(new TabUserView(p.Api, p.Api.Manager?.CurrentUser), "todo");
return null;
}
}
diff --git a/OwnChar.App.Desktop/Features/MainWindow/QuickAction/SettingsFeature.cs b/OwnChar.App.Desktop/Features/MainWindow/QuickAction/SettingsFeature.cs
index 4a676cb..206dcf1 100644
--- a/OwnChar.App.Desktop/Features/MainWindow/QuickAction/SettingsFeature.cs
+++ b/OwnChar.App.Desktop/Features/MainWindow/QuickAction/SettingsFeature.cs
@@ -11,7 +11,7 @@ namespace OwnChar.App.Desktop.Features.MainWindow.QuickAction
protected override object? ExecuteFunction(PluginFunctionParameter? @params)
{
if (@params is MainWindowParams p)
- p.Api.OpenTab(new TabSettingsView());
+ p.Api.OpenTab(new TabSettingsView(), "todo");
return null;
}
}
diff --git a/OwnChar.App.Desktop/LangRes/LangResCharListControl.Designer.cs b/OwnChar.App.Desktop/LangRes/LangResCharListControl.Designer.cs
new file mode 100644
index 0000000..56f3e61
--- /dev/null
+++ b/OwnChar.App.Desktop/LangRes/LangResCharListControl.Designer.cs
@@ -0,0 +1,90 @@
+//------------------------------------------------------------------------------
+//
+// 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 LangResCharListControl {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal LangResCharListControl() {
+ }
+
+ ///
+ /// 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.LangResCharListControl", typeof(LangResCharListControl).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 Group ähnelt.
+ ///
+ internal static string Column_CharGroup {
+ get {
+ return ResourceManager.GetString("Column_CharGroup", resourceCulture);
+ }
+ }
+
+ ///
+ /// 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.
+ ///
+ internal static string Column_CharOwner {
+ get {
+ return ResourceManager.GetString("Column_CharOwner", resourceCulture);
+ }
+ }
+ }
+}
diff --git a/OwnChar.App.Desktop/UI/MainTabs/Controls/GroupViewControl.resx b/OwnChar.App.Desktop/LangRes/LangResCharListControl.resx
similarity index 95%
rename from OwnChar.App.Desktop/UI/MainTabs/Controls/GroupViewControl.resx
rename to OwnChar.App.Desktop/LangRes/LangResCharListControl.resx
index 1af7de1..e58e747 100644
--- a/OwnChar.App.Desktop/UI/MainTabs/Controls/GroupViewControl.resx
+++ b/OwnChar.App.Desktop/LangRes/LangResCharListControl.resx
@@ -117,4 +117,13 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ Group
+
+
+ Name
+
+
+ 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 51ee656..fb4374c 100644
--- a/OwnChar.App.Desktop/OwnChar.App.Desktop.csproj
+++ b/OwnChar.App.Desktop/OwnChar.App.Desktop.csproj
@@ -30,6 +30,21 @@
+
+
+ True
+ True
+ LangResCharListControl.resx
+
+
+
+
+
+ ResXFileCodeGenerator
+ LangResCharListControl.Designer.cs
+
+
+
diff --git a/OwnChar.App.Desktop/UI/MainTabs/Controls/CharacterListControl.Designer.cs b/OwnChar.App.Desktop/UI/MainTabs/Controls/CharacterListControl.Designer.cs
new file mode 100644
index 0000000..9c8209e
--- /dev/null
+++ b/OwnChar.App.Desktop/UI/MainTabs/Controls/CharacterListControl.Designer.cs
@@ -0,0 +1,58 @@
+namespace OwnChar.App.Desktop.UI.MainTabs.Controls
+{
+ partial class CharacterListControl
+ {
+ ///
+ /// Erforderliche Designervariable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Verwendete Ressourcen bereinigen.
+ ///
+ /// True, wenn verwaltete Ressourcen gelöscht werden sollen; andernfalls False.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Vom Komponenten-Designer generierter Code
+
+ ///
+ /// Erforderliche Methode für die Designerunterstützung.
+ /// Der Inhalt der Methode darf nicht mit dem Code-Editor geändert werden.
+ ///
+ private void InitializeComponent()
+ {
+ radListView_CharList = new Telerik.WinControls.UI.RadListView();
+ ((System.ComponentModel.ISupportInitialize)radListView_CharList).BeginInit();
+ SuspendLayout();
+ //
+ // radListView_CharList
+ //
+ radListView_CharList.Dock = System.Windows.Forms.DockStyle.Fill;
+ radListView_CharList.Location = new System.Drawing.Point(0, 0);
+ radListView_CharList.Name = "radListView_CharList";
+ radListView_CharList.Size = new System.Drawing.Size(500, 500);
+ radListView_CharList.TabIndex = 0;
+ //
+ // CharacterListControl
+ //
+ AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+ AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ Controls.Add(radListView_CharList);
+ Name = "CharacterListControl";
+ Size = new System.Drawing.Size(500, 500);
+ ((System.ComponentModel.ISupportInitialize)radListView_CharList).EndInit();
+ ResumeLayout(false);
+ }
+
+ #endregion
+
+ private Telerik.WinControls.UI.RadListView radListView_CharList;
+ }
+}
diff --git a/OwnChar.App.Desktop/UI/MainTabs/Controls/CharacterListControl.cs b/OwnChar.App.Desktop/UI/MainTabs/Controls/CharacterListControl.cs
new file mode 100644
index 0000000..e10554c
--- /dev/null
+++ b/OwnChar.App.Desktop/UI/MainTabs/Controls/CharacterListControl.cs
@@ -0,0 +1,95 @@
+using OwnChar.App.Desktop.Api;
+using OwnChar.App.Desktop.UI.Windows;
+using OwnChar.Model;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using Telerik.WinControls.UI;
+
+namespace OwnChar.App.Desktop.UI.MainTabs.Controls
+{
+ public partial class CharacterListControl : UserControl
+ {
+
+ private IMainWindowApi? mainApi;
+ private UserProfile? profile;
+ private Group? group;
+
+ public CharacterListControl()
+ {
+ InitializeComponent();
+ }
+
+ public void LoadContent(IMainWindowApi mainApi, UserProfile? profile)
+ {
+ LoadContent(mainApi, profile, null);
+ }
+
+ public void LoadContent(IMainWindowApi mainApi, Group? group)
+ {
+ LoadContent(mainApi, null, group);
+ }
+
+ private void LoadContent(IMainWindowApi mainApi, UserProfile? profile, Group? group)
+ {
+ this.mainApi = mainApi;
+ this.profile = profile;
+ this.group = group;
+ PrepareList();
+ LoadList();
+ }
+
+ // Laden aller -eigenen- Charaktere
+ // Spalte zum Anzeigen der Gruppen-Zugehörigkeit
+ // Hinzufügen und Löschen von Charakteren
+ private void PrepareList()
+ {
+ radListView_CharList.BeginUpdate();
+ radListView_CharList.Columns.Clear();
+
+ radListView_CharList.Columns.Add(LangRes.LangResCharListControl.Column_CharName);
+
+ if (profile != null)
+ radListView_CharList.Columns.Add(LangRes.LangResCharListControl.Column_CharGroup);
+ else if (group != null)
+ radListView_CharList.Columns.Add(LangRes.LangResCharListControl.Column_CharOwner);
+
+ radListView_CharList.EndUpdate();
+ }
+
+ private void LoadList()
+ {
+ radListView_CharList.BeginUpdate();
+ radListView_CharList.Items.Clear();
+
+ if (profile != null && mainApi?.Manager?.Characters.GetCharacters(profile) is IEnumerable characters)
+ {
+ foreach (Character character in characters)
+ {
+ AddCharToList(character);
+ }
+ }
+
+ radListView_CharList.EndUpdate();
+ }
+
+ private void AddCharToList(Character character)
+ {
+ var newItem = new ListViewDataItem();
+ UpdateCharListViewItem(newItem, character);
+ newItem.Value = character;
+ }
+
+ private void UpdateCharListViewItem(ListViewDataItem listItem, Character character)
+ {
+ listItem[0] = character.Name;
+
+ }
+ }
+}
diff --git a/OwnChar.App.Desktop/UI/MainTabs/Controls/MemberViewControl.resx b/OwnChar.App.Desktop/UI/MainTabs/Controls/CharacterListControl.resx
similarity index 100%
rename from OwnChar.App.Desktop/UI/MainTabs/Controls/MemberViewControl.resx
rename to OwnChar.App.Desktop/UI/MainTabs/Controls/CharacterListControl.resx
diff --git a/OwnChar.App.Desktop/UI/MainTabs/Controls/CharacterViewControl.Designer.cs b/OwnChar.App.Desktop/UI/MainTabs/Controls/CharacterViewControl.Designer.cs
deleted file mode 100644
index bf99d8b..0000000
--- a/OwnChar.App.Desktop/UI/MainTabs/Controls/CharacterViewControl.Designer.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-namespace OwnChar.App.Desktop.UI.MainTabs.Controls
-{
- partial class CharacterViewControl
- {
- ///
- /// Erforderliche Designervariable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Verwendete Ressourcen bereinigen.
- ///
- /// True, wenn verwaltete Ressourcen gelöscht werden sollen; andernfalls False.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Vom Komponenten-Designer generierter Code
-
- ///
- /// Erforderliche Methode für die Designerunterstützung.
- /// Der Inhalt der Methode darf nicht mit dem Code-Editor geändert werden.
- ///
- private void InitializeComponent()
- {
- components = new System.ComponentModel.Container();
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- }
-
- #endregion
- }
-}
diff --git a/OwnChar.App.Desktop/UI/MainTabs/Controls/CharacterViewControl.cs b/OwnChar.App.Desktop/UI/MainTabs/Controls/CharacterViewControl.cs
deleted file mode 100644
index e7c629d..0000000
--- a/OwnChar.App.Desktop/UI/MainTabs/Controls/CharacterViewControl.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace OwnChar.App.Desktop.UI.MainTabs.Controls
-{
- public partial class CharacterViewControl : UserControl
- {
- public CharacterViewControl()
- {
- InitializeComponent();
- }
- }
-}
diff --git a/OwnChar.App.Desktop/UI/MainTabs/Controls/GroupListControl.Designer.cs b/OwnChar.App.Desktop/UI/MainTabs/Controls/GroupListControl.Designer.cs
new file mode 100644
index 0000000..1d7c467
--- /dev/null
+++ b/OwnChar.App.Desktop/UI/MainTabs/Controls/GroupListControl.Designer.cs
@@ -0,0 +1,60 @@
+namespace OwnChar.App.Desktop.UI.MainTabs.Controls
+{
+ partial class GroupListControl
+ {
+ ///
+ /// Erforderliche Designervariable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Verwendete Ressourcen bereinigen.
+ ///
+ /// True, wenn verwaltete Ressourcen gelöscht werden sollen; andernfalls False.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Vom Komponenten-Designer generierter Code
+
+ ///
+ /// Erforderliche Methode für die Designerunterstützung.
+ /// Der Inhalt der Methode darf nicht mit dem Code-Editor geändert werden.
+ ///
+ private void InitializeComponent()
+ {
+ radPageView_groupView = new Telerik.WinControls.UI.RadPageView();
+ ((System.ComponentModel.ISupportInitialize)radPageView_groupView).BeginInit();
+ SuspendLayout();
+ //
+ // radPageView_groupView
+ //
+ radPageView_groupView.Dock = System.Windows.Forms.DockStyle.Fill;
+ radPageView_groupView.Location = new System.Drawing.Point(0, 0);
+ radPageView_groupView.Name = "radPageView_groupView";
+ radPageView_groupView.Size = new System.Drawing.Size(500, 500);
+ radPageView_groupView.TabIndex = 0;
+ radPageView_groupView.ViewMode = Telerik.WinControls.UI.PageViewMode.NavigationView;
+ ((Telerik.WinControls.UI.RadPageViewNavigationViewElement)radPageView_groupView.GetChildAt(0)).ExpandedPaneWidth = 175;
+ //
+ // GroupViewControl
+ //
+ AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+ AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ Controls.Add(radPageView_groupView);
+ Name = "GroupViewControl";
+ Size = new System.Drawing.Size(500, 500);
+ ((System.ComponentModel.ISupportInitialize)radPageView_groupView).EndInit();
+ ResumeLayout(false);
+ }
+
+ #endregion
+
+ private Telerik.WinControls.UI.RadPageView radPageView_groupView;
+ }
+}
diff --git a/OwnChar.App.Desktop/UI/MainTabs/Controls/MemberViewControl.cs b/OwnChar.App.Desktop/UI/MainTabs/Controls/GroupListControl.cs
similarity index 55%
rename from OwnChar.App.Desktop/UI/MainTabs/Controls/MemberViewControl.cs
rename to OwnChar.App.Desktop/UI/MainTabs/Controls/GroupListControl.cs
index 8ca12c3..c2fa919 100644
--- a/OwnChar.App.Desktop/UI/MainTabs/Controls/MemberViewControl.cs
+++ b/OwnChar.App.Desktop/UI/MainTabs/Controls/GroupListControl.cs
@@ -7,14 +7,20 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
+using Telerik.WinControls.UI;
+using Telerik.WinControls.UI.Diagrams.Primitives;
namespace OwnChar.App.Desktop.UI.MainTabs.Controls
{
- public partial class MemberViewControl : UserControl
+ public partial class GroupListControl : UserControl
{
- public MemberViewControl()
+ public GroupListControl()
{
InitializeComponent();
}
+
+ // Auflistung der Gruppen
+ // Hinzufügen
+ // Löschen + Umbenennen (Wenn Admin/Mod)
}
}
diff --git a/OwnChar.App.Desktop/UI/MainTabs/Controls/CharacterViewControl.resx b/OwnChar.App.Desktop/UI/MainTabs/Controls/GroupListControl.resx
similarity index 93%
rename from OwnChar.App.Desktop/UI/MainTabs/Controls/CharacterViewControl.resx
rename to OwnChar.App.Desktop/UI/MainTabs/Controls/GroupListControl.resx
index 1af7de1..af32865 100644
--- a/OwnChar.App.Desktop/UI/MainTabs/Controls/CharacterViewControl.resx
+++ b/OwnChar.App.Desktop/UI/MainTabs/Controls/GroupListControl.resx
@@ -1,17 +1,17 @@
-
diff --git a/OwnChar.App.Desktop/UI/MainTabs/Controls/GroupViewControl.Designer.cs b/OwnChar.App.Desktop/UI/MainTabs/Controls/GroupViewControl.Designer.cs
deleted file mode 100644
index c9aa6d1..0000000
--- a/OwnChar.App.Desktop/UI/MainTabs/Controls/GroupViewControl.Designer.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-namespace OwnChar.App.Desktop.UI.MainTabs.Controls
-{
- partial class GroupViewControl
- {
- ///
- /// Erforderliche Designervariable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Verwendete Ressourcen bereinigen.
- ///
- /// True, wenn verwaltete Ressourcen gelöscht werden sollen; andernfalls False.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Vom Komponenten-Designer generierter Code
-
- ///
- /// Erforderliche Methode für die Designerunterstützung.
- /// Der Inhalt der Methode darf nicht mit dem Code-Editor geändert werden.
- ///
- private void InitializeComponent()
- {
- components = new System.ComponentModel.Container();
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- }
-
- #endregion
- }
-}
diff --git a/OwnChar.App.Desktop/UI/MainTabs/Controls/MemberViewControl.Designer.cs b/OwnChar.App.Desktop/UI/MainTabs/Controls/MemberListControl.Designer.cs
similarity index 97%
rename from OwnChar.App.Desktop/UI/MainTabs/Controls/MemberViewControl.Designer.cs
rename to OwnChar.App.Desktop/UI/MainTabs/Controls/MemberListControl.Designer.cs
index fbcd507..e0fee86 100644
--- a/OwnChar.App.Desktop/UI/MainTabs/Controls/MemberViewControl.Designer.cs
+++ b/OwnChar.App.Desktop/UI/MainTabs/Controls/MemberListControl.Designer.cs
@@ -1,6 +1,6 @@
namespace OwnChar.App.Desktop.UI.MainTabs.Controls
{
- partial class MemberViewControl
+ partial class MemberListControl
{
///
/// Erforderliche Designervariable.
diff --git a/OwnChar.App.Desktop/UI/MainTabs/Controls/GroupViewControl.cs b/OwnChar.App.Desktop/UI/MainTabs/Controls/MemberListControl.cs
similarity index 64%
rename from OwnChar.App.Desktop/UI/MainTabs/Controls/GroupViewControl.cs
rename to OwnChar.App.Desktop/UI/MainTabs/Controls/MemberListControl.cs
index 730848a..8375d28 100644
--- a/OwnChar.App.Desktop/UI/MainTabs/Controls/GroupViewControl.cs
+++ b/OwnChar.App.Desktop/UI/MainTabs/Controls/MemberListControl.cs
@@ -10,11 +10,14 @@ using System.Windows.Forms;
namespace OwnChar.App.Desktop.UI.MainTabs.Controls
{
- public partial class GroupViewControl : UserControl
+ public partial class MemberListControl : UserControl
{
- public GroupViewControl()
+ public MemberListControl()
{
InitializeComponent();
}
+
+ // Auflisten von Nutzern
+ // -> z.B. Freunden oder Mitgliedern einer Gruppe
}
}
diff --git a/OwnChar.App.Desktop/UI/MainTabs/Controls/MemberListControl.resx b/OwnChar.App.Desktop/UI/MainTabs/Controls/MemberListControl.resx
new file mode 100644
index 0000000..af32865
--- /dev/null
+++ b/OwnChar.App.Desktop/UI/MainTabs/Controls/MemberListControl.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
\ No newline at end of file
diff --git a/OwnChar.App.Desktop/UI/MainTabs/TabCharView.Designer.cs b/OwnChar.App.Desktop/UI/MainTabs/TabCharView.Designer.cs
index c13ea5d..3414faf 100644
--- a/OwnChar.App.Desktop/UI/MainTabs/TabCharView.Designer.cs
+++ b/OwnChar.App.Desktop/UI/MainTabs/TabCharView.Designer.cs
@@ -28,8 +28,15 @@
///
private void InitializeComponent()
{
- components = new System.ComponentModel.Container();
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ SuspendLayout();
+ //
+ // TabCharView
+ //
+ AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+ AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ Name = "TabCharView";
+ Size = new System.Drawing.Size(500, 500);
+ ResumeLayout(false);
}
#endregion
diff --git a/OwnChar.App.Desktop/UI/MainTabs/TabCharView.cs b/OwnChar.App.Desktop/UI/MainTabs/TabCharView.cs
index b0cf8dc..0492fb2 100644
--- a/OwnChar.App.Desktop/UI/MainTabs/TabCharView.cs
+++ b/OwnChar.App.Desktop/UI/MainTabs/TabCharView.cs
@@ -1,4 +1,5 @@
using OwnChar.App.Desktop.Api;
+using OwnChar.App.Desktop.UI.MainTabs.Controls;
using OwnChar.Model;
using Pilz.UI.Telerik.Dialogs;
using System.Windows.Forms;
@@ -19,7 +20,7 @@ namespace OwnChar.App.Desktop.UI.MainTabs
public void LoadContent()
{
- // ...
+
}
}
}
diff --git a/OwnChar.App.Desktop/UI/MainTabs/TabCharView.resx b/OwnChar.App.Desktop/UI/MainTabs/TabCharView.resx
index 1af7de1..af32865 100644
--- a/OwnChar.App.Desktop/UI/MainTabs/TabCharView.resx
+++ b/OwnChar.App.Desktop/UI/MainTabs/TabCharView.resx
@@ -1,17 +1,17 @@
-
diff --git a/OwnChar.App.Desktop/UI/MainTabs/TabUserView.Designer.cs b/OwnChar.App.Desktop/UI/MainTabs/TabUserView.Designer.cs
index 4cae101..aba08bf 100644
--- a/OwnChar.App.Desktop/UI/MainTabs/TabUserView.Designer.cs
+++ b/OwnChar.App.Desktop/UI/MainTabs/TabUserView.Designer.cs
@@ -30,10 +30,12 @@
{
radPageView1 = new Telerik.WinControls.UI.RadPageView();
radPageViewPage1 = new Telerik.WinControls.UI.RadPageViewPage();
+ characterListControl1 = new Controls.CharacterListControl();
radPageViewPage2 = new Telerik.WinControls.UI.RadPageViewPage();
radPageViewPage3 = new Telerik.WinControls.UI.RadPageViewPage();
((System.ComponentModel.ISupportInitialize)radPageView1).BeginInit();
radPageView1.SuspendLayout();
+ radPageViewPage1.SuspendLayout();
SuspendLayout();
//
// radPageView1
@@ -52,26 +54,35 @@
//
// radPageViewPage1
//
- radPageViewPage1.ItemSize = new System.Drawing.SizeF(107F, 30F);
- radPageViewPage1.Location = new System.Drawing.Point(151, 30);
+ radPageViewPage1.Controls.Add(characterListControl1);
+ radPageViewPage1.ItemSize = new System.Drawing.SizeF(113F, 29F);
+ radPageViewPage1.Location = new System.Drawing.Point(152, 38);
radPageViewPage1.Name = "radPageViewPage1";
- radPageViewPage1.Size = new System.Drawing.Size(348, 469);
+ radPageViewPage1.Size = new System.Drawing.Size(346, 460);
radPageViewPage1.Text = "Meine Charaktere";
//
+ // characterListControl1
+ //
+ characterListControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ characterListControl1.Location = new System.Drawing.Point(0, 0);
+ characterListControl1.Name = "characterListControl1";
+ characterListControl1.Size = new System.Drawing.Size(346, 460);
+ characterListControl1.TabIndex = 0;
+ //
// radPageViewPage2
//
- radPageViewPage2.ItemSize = new System.Drawing.SizeF(107F, 30F);
- radPageViewPage2.Location = new System.Drawing.Point(151, 30);
+ radPageViewPage2.ItemSize = new System.Drawing.SizeF(113F, 29F);
+ radPageViewPage2.Location = new System.Drawing.Point(152, 38);
radPageViewPage2.Name = "radPageViewPage2";
- radPageViewPage2.Size = new System.Drawing.Size(348, 469);
+ radPageViewPage2.Size = new System.Drawing.Size(346, 460);
radPageViewPage2.Text = "Meine Gruppen";
//
// radPageViewPage3
//
- radPageViewPage3.ItemSize = new System.Drawing.SizeF(107F, 30F);
- radPageViewPage3.Location = new System.Drawing.Point(151, 30);
+ radPageViewPage3.ItemSize = new System.Drawing.SizeF(113F, 29F);
+ radPageViewPage3.Location = new System.Drawing.Point(152, 38);
radPageViewPage3.Name = "radPageViewPage3";
- radPageViewPage3.Size = new System.Drawing.Size(348, 469);
+ radPageViewPage3.Size = new System.Drawing.Size(346, 460);
radPageViewPage3.Text = "Meine Freunde";
//
// TabUserView
@@ -83,6 +94,7 @@
Size = new System.Drawing.Size(500, 500);
((System.ComponentModel.ISupportInitialize)radPageView1).EndInit();
radPageView1.ResumeLayout(false);
+ radPageViewPage1.ResumeLayout(false);
ResumeLayout(false);
}
@@ -92,5 +104,6 @@
private Telerik.WinControls.UI.RadPageViewPage radPageViewPage1;
private Telerik.WinControls.UI.RadPageViewPage radPageViewPage2;
private Telerik.WinControls.UI.RadPageViewPage radPageViewPage3;
+ private Controls.CharacterListControl characterListControl1;
}
}
diff --git a/OwnChar.App.Desktop/UI/MainTabs/TabUserView.cs b/OwnChar.App.Desktop/UI/MainTabs/TabUserView.cs
index d45af55..bd45082 100644
--- a/OwnChar.App.Desktop/UI/MainTabs/TabUserView.cs
+++ b/OwnChar.App.Desktop/UI/MainTabs/TabUserView.cs
@@ -19,7 +19,7 @@ namespace OwnChar.App.Desktop.UI.MainTabs
InitializeComponent();
}
- public TabUserView(IMainWindowApi mainApi, UserAccount? account) : this(mainApi, account, mainApi.Manager.Users.GetUserProfile(account))
+ public TabUserView(IMainWindowApi mainApi, UserAccount? account) : this(mainApi, account, mainApi.Manager!.Users.GetOwnUserProfile())
{
}
@@ -29,7 +29,7 @@ namespace OwnChar.App.Desktop.UI.MainTabs
public void LoadContent()
{
- // ...
+ characterListControl1.LoadContent(mainApi, profile);
}
}
}