diff --git a/Site5/Controls/v5/Swarm/ComboPerson.ascx b/Site5/Controls/v5/Swarm/ComboPerson.ascx index 11ec639c..bfffeeff 100644 --- a/Site5/Controls/v5/Swarm/ComboPerson.ascx +++ b/Site5/Controls/v5/Swarm/ComboPerson.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeFile="ComboPerson.ascx.cs" Inherits="Swarmops.Controls.Pirates.ComboPerson" %> +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="ComboPerson.ascx.cs" Inherits="Swarmops.Controls.Swarm.ComboPerson" %> -<%@ Register Src="~/Controls/v5/Pirates/ComboPerson.ascx" TagName="ComboPerson" TagPrefix="act5" %> +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="PersonDetailPopup.ascx.cs" Inherits="Swarmops.Controls.Swarm.PersonDetailPopup" %> +<%@ Register Src="~/Controls/v5/Swarm/ComboPerson.ascx" TagName="ComboPerson" TagPrefix="act5" %> diff --git a/Site5/Controls/v5/Swarm/PersonDetailPopup.ascx.cs b/Site5/Controls/v5/Swarm/PersonDetailPopup.ascx.cs index cb6e38c8..99ddfbd8 100644 --- a/Site5/Controls/v5/Swarm/PersonDetailPopup.ascx.cs +++ b/Site5/Controls/v5/Swarm/PersonDetailPopup.ascx.cs @@ -8,155 +8,160 @@ using System.Web.UI; using System.Web.UI.HtmlControls; using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; +using Swarmops.Controls.Swarm; using Swarmops.Logic.Financial; using Swarmops.Logic.Swarm; using Swarmops.Logic.Security; using Telerik.Web.UI; -public delegate void PersonChangedEventHandler(object sender, PersonChangedEventArgs e); - -public partial class Controls_v5_PersonDetailPopup : ControlV5Base +namespace Swarmops.Controls.Swarm { - protected void Page_Load(object sender, EventArgs e) + public delegate void PersonChangedEventHandler(object sender, PersonChangedEventArgs e); + + public partial class PersonDetailPopup : ControlV5Base { - object personId = ViewState[this.ClientID + "_PersonId"]; - - if (personId != null) + protected void Page_Load(object sender, EventArgs e) { - _person = Person.FromIdentity((int) personId); - } + object personId = ViewState[this.ClientID + "_PersonId"]; - this.LabelPersonName.Style[HtmlTextWriterStyle.FontSize] = "20px"; - this.PersonNew.Width = 157; - - this.ButtonSetNew.Visible = this.Changeable; - - // Localize - - this.ButtonSetNew.Text = Resources.Controls.Pirates.PersonDetailPopup_ChangePerson; - this.LabelWriteLabel.Text = Resources.Controls.Pirates.PersonDetailPopup_ChangeTo; - this.ButtonConfirmPerson.Text = Resources.Global.Global_Confirm; - this.ButtonCancel.Text = Resources.Global.Global_Cancel; - } - - - private Person _person; - - public object Cookie { get; set; } - - public Person Person - { - get - { - if (_person == null) + if (personId != null) { - return this.PersonNew.SelectedPerson; + _person = Person.FromIdentity((int) personId); } - return _person; + this.LabelPersonName.Style[HtmlTextWriterStyle.FontSize] = "20px"; + this.PersonNew.Width = 157; + + this.ButtonSetNew.Visible = this.Changeable; + + // Localize + + this.ButtonSetNew.Text = Resources.Controls.Pirates.PersonDetailPopup_ChangePerson; + this.LabelWriteLabel.Text = Resources.Controls.Pirates.PersonDetailPopup_ChangeTo; + this.ButtonConfirmPerson.Text = Resources.Global.Global_Confirm; + this.ButtonCancel.Text = Resources.Global.Global_Cancel; } - set + + + private Person _person; + + public object Cookie { get; set; } + + public Person Person { - _person = value; - // this.PersonNewOwner.SelectedPerson = _person; - - if (value != null) + get { - ViewState[this.ClientID + "_PersonId"] = value.Identity; + if (_person == null) + { + return this.PersonNew.SelectedPerson; + } - this.ImageAvatar.ImageUrl = _person.GetSecureAvatarLink(96); - this.LabelPersonName.Text = _person.Name; - this.LabelPersonIdentity.Text = "#" + _person.Identity.ToString(); + return _person; + } + set + { + _person = value; + // this.PersonNewOwner.SelectedPerson = _person; + + if (value != null) + { + ViewState[this.ClientID + "_PersonId"] = value.Identity; + + this.ImageAvatar.ImageUrl = _person.GetSecureAvatarLink(96); + this.LabelPersonName.Text = _person.Name; + this.LabelPersonIdentity.Text = "#" + _person.Identity.ToString(); + } + else + { + ViewState[this.ClientID + "_PersonId"] = null; + this.ImageAvatar.ImageUrl = "https://pirateweb.net/Images/Public/Fugue/icons-shadowless/cross.png"; + this.LabelPersonIdentity.Text = "#"; + this.LabelPersonName.Text = "Nobody"; + } + + } + } + + + public bool Changeable { get; set; } + + + protected void ButtonSetNew_Click(object sender, EventArgs e) + { + this.PanelRead.Visible = false; + this.PanelWrite.Visible = true; + this.PersonNew.Focus(); + } + + public void Reset() + { + this.PanelWrite.Visible = false; + this.PanelRead.Visible = true; + this.ButtonConfirmPerson.Visible = false; + this.PersonNew.SelectedPerson = null; + + if (ViewState[this.ClientID + "_PersonId"] == null) + { + this.ImageAvatar.ImageUrl = "https://pirateweb.net/Images/Public/Fugue/icons-shadowless/cross.png"; } else { - ViewState[this.ClientID + "_PersonId"] = null; - this.ImageAvatar.ImageUrl = "https://pirateweb.net/Images/Public/Fugue/icons-shadowless/cross.png"; - this.LabelPersonIdentity.Text = "#"; - this.LabelPersonName.Text = "Nobody"; + this.ImageAvatar.ImageUrl = + Person.FromIdentity((int) ViewState[this.ClientID + "_PersonId"]).GetSecureAvatarLink(96); + } + } + + + protected void PersonNew_SelectedPersonChanged(object sender, EventArgs e) + { + this.ImageAvatar.ImageUrl = this.PersonNew.SelectedPerson.GetSecureAvatarLink(96); + this.ButtonConfirmPerson.Visible = true; + } + + protected void ButtonConfirmPerson_Click(object sender, EventArgs e) + { + this._person = this.PersonNew.SelectedPerson; + + IOwnerSettable settableInterface = this.Cookie as IOwnerSettable; + + if (settableInterface != null) + { + settableInterface.SetOwner(this._person); } + if (PersonChanged != null) + { + PersonChanged(this, new PersonChangedEventArgs(this.PersonNew.SelectedPerson, this.Cookie)); + } + + this.LabelPersonName.Text = _person.Name; + this.LabelPersonIdentity.Text = "#" + _person.Identity.ToString(); + Reset(); } - } - - public bool Changeable { get; set; } - - - protected void ButtonSetNew_Click(object sender, EventArgs e) - { - this.PanelRead.Visible = false; - this.PanelWrite.Visible = true; - this.PersonNew.Focus(); - } - - public void Reset() - { - this.PanelWrite.Visible = false; - this.PanelRead.Visible = true; - this.ButtonConfirmPerson.Visible = false; - this.PersonNew.SelectedPerson = null; - - if (ViewState[this.ClientID + "_PersonId"] == null) + protected void ButtonCancel_Click(object sender, EventArgs e) { - this.ImageAvatar.ImageUrl = "https://pirateweb.net/Images/Public/Fugue/icons-shadowless/cross.png"; + Reset(); } - else + + public event PersonChangedEventHandler PersonChanged; + + } + + + public class PersonChangedEventArgs : EventArgs + { + public PersonChangedEventArgs(Person newPerson, object cookie) { - this.ImageAvatar.ImageUrl = Person.FromIdentity((int) ViewState[this.ClientID + "_PersonId"]).GetSecureAvatarLink(96); - } - } - - - protected void PersonNew_SelectedPersonChanged(object sender, EventArgs e) - { - this.ImageAvatar.ImageUrl = this.PersonNew.SelectedPerson.GetSecureAvatarLink(96); - this.ButtonConfirmPerson.Visible = true; - } - - protected void ButtonConfirmPerson_Click(object sender, EventArgs e) - { - this._person = this.PersonNew.SelectedPerson; - - IOwnerSettable settableInterface = this.Cookie as IOwnerSettable; - - if (settableInterface != null) - { - settableInterface.SetOwner(this._person); + this.NewPerson = newPerson; + this.Cookie = cookie; } - if (PersonChanged != null) - { - PersonChanged(this, new PersonChangedEventArgs(this.PersonNew.SelectedPerson, this.Cookie)); - } - - this.LabelPersonName.Text = _person.Name; - this.LabelPersonIdentity.Text = "#" + _person.Identity.ToString(); - Reset(); + public readonly Person NewPerson; + public readonly object Cookie; } - protected void ButtonCancel_Click(object sender, EventArgs e) - { - Reset(); - } - - public event PersonChangedEventHandler PersonChanged; - -} - - -public class PersonChangedEventArgs: EventArgs -{ - public PersonChangedEventArgs(Person newPerson, object cookie) - { - this.NewPerson = newPerson; - this.Cookie = cookie; - } - - public readonly Person NewPerson; - public readonly object Cookie; -} - +} \ No newline at end of file