From 9f96d885fe976ae72d7ca84897ce9d4478d7baf7 Mon Sep 17 00:00:00 2001 From: Kathy Date: Thu, 31 Jan 2008 14:30:30 +0000 Subject: [PATCH] --- PROMS/Volian.Controls.Library/DisplayItem.cs | 5 +++++ .../Volian.Controls.Library/DisplayItem.designer.cs | 4 +++- PROMS/Volian.Controls.Library/DisplayItem.resx | 12 ++++++++++++ PROMS/Volian.Controls.Library/DisplayPanel.cs | 6 ++++++ PROMS/Volian.Controls.Library/DisplayRTB.cs | 5 ++++- PROMS/Volian.Controls.Library/DisplayTabControl.cs | 6 ++++++ PROMS/Volian.Controls.Library/DisplayTabPanel.cs | 6 +++++- 7 files changed, 41 insertions(+), 3 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DisplayItem.cs b/PROMS/Volian.Controls.Library/DisplayItem.cs index 6af9c490..834233fe 100644 --- a/PROMS/Volian.Controls.Library/DisplayItem.cs +++ b/PROMS/Volian.Controls.Library/DisplayItem.cs @@ -934,5 +934,10 @@ namespace Volian.Controls.Library { _DisplayRTB.BackColor = _Panel.InactiveColor; } + + private void _DisplayRTB_LinkModifyTran(object sender, LinkClickedEventArgs e) + { + _Panel.OnLinkModifyTran(sender, new DisplayLinkEventArgs(this, e)); + } } } diff --git a/PROMS/Volian.Controls.Library/DisplayItem.designer.cs b/PROMS/Volian.Controls.Library/DisplayItem.designer.cs index 480a765b..e235cda7 100644 --- a/PROMS/Volian.Controls.Library/DisplayItem.designer.cs +++ b/PROMS/Volian.Controls.Library/DisplayItem.designer.cs @@ -65,9 +65,11 @@ namespace Volian.Controls.Library this._DisplayRTB.LinkGoTo += new Volian.Controls.Library.DisplayRTBLinkEvent(this._DisplayRTB_LinkGoTo); this._DisplayRTB.Leave += new System.EventHandler(this.veRichTextBoxText_Leave); this._DisplayRTB.HeightChanged += new Volian.Controls.Library.DisplayRTBEvent(this.veRichTextBoxText_HeightChanged); + this._DisplayRTB.LinkModifyTran += new Volian.Controls.Library.DisplayRTBLinkEvent(this._DisplayRTB_LinkModifyTran); // // vlnExp // + this.vlnExp.Attachment = false; this.vlnExp.BackColor = System.Drawing.Color.Transparent; this.vlnExp.BorderColor = System.Drawing.Color.Silver; this.vlnExp.Color1 = System.Drawing.Color.Aquamarine; @@ -85,8 +87,8 @@ namespace Volian.Controls.Library this.vlnExp.Trans2 = 128; this.vlnExp.WidthFactor = 7; this.vlnExp.BeforeExpand += new Volian.Controls.Library.vlnExpanderEvent(this.vlnExp_BeforeExpand); + this.vlnExp.AttachmentClick += new Volian.Controls.Library.vlnExpanderEvent(this.vlnExp_AttachmentClick); this.vlnExp.BeforeColapse += new Volian.Controls.Library.vlnExpanderEvent(this.vlnExp_BeforeColapse); - this.vlnExp.AttachmentClick += new vlnExpanderEvent(vlnExp_AttachmentClick); // // DisplayItem // diff --git a/PROMS/Volian.Controls.Library/DisplayItem.resx b/PROMS/Volian.Controls.Library/DisplayItem.resx index 19dc0dd8..f26fdb9e 100644 --- a/PROMS/Volian.Controls.Library/DisplayItem.resx +++ b/PROMS/Volian.Controls.Library/DisplayItem.resx @@ -117,4 +117,16 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + + + True + \ No newline at end of file diff --git a/PROMS/Volian.Controls.Library/DisplayPanel.cs b/PROMS/Volian.Controls.Library/DisplayPanel.cs index bf1389fc..c0bd476f 100644 --- a/PROMS/Volian.Controls.Library/DisplayPanel.cs +++ b/PROMS/Volian.Controls.Library/DisplayPanel.cs @@ -30,6 +30,12 @@ namespace Volian.Controls.Library if (LinkClicked != null) LinkClicked(sender, args); else MessageBox.Show(args.LinkInfo.LinkText, "Unhandled Link Click", MessageBoxButtons.OK, MessageBoxIcon.Information); } + public event DisplayPanelLinkEvent LinkModifyTran; + internal void OnLinkModifyTran(object sender, DisplayLinkEventArgs args) + { + if (LinkModifyTran != null) LinkModifyTran(sender, args); + else MessageBox.Show(args.LinkInfo.LinkText, "Unhandled Link Modify Tran", MessageBoxButtons.OK, MessageBoxIcon.Information); + } public event DisplayPanelAttachmentEvent AttachmentClicked; internal void OnAttachmentClicked(object sender, DisplayPanelAttachmentEventArgs args) { diff --git a/PROMS/Volian.Controls.Library/DisplayRTB.cs b/PROMS/Volian.Controls.Library/DisplayRTB.cs index 4759fd57..fe395900 100644 --- a/PROMS/Volian.Controls.Library/DisplayRTB.cs +++ b/PROMS/Volian.Controls.Library/DisplayRTB.cs @@ -635,7 +635,10 @@ namespace Volian.Controls.Library private void contextMenuStripTrans_ItemClicked(object sender, ToolStripItemClickedEventArgs e) { if (e.ClickedItem.ToString() == "Delete Transition") DeleteTransition(); - else if (e.ClickedItem.ToString() == "Modify Transition") ModifyTransition(); + else if (e.ClickedItem.ToString() == "Modify Transition") + { + OnLinkModifyTran(sender, _LinkClickedEventArgs); + } else if (e.ClickedItem.ToString() == "Go To") { Console.WriteLine("DisplayRTB:contextMenu:Go TO"); diff --git a/PROMS/Volian.Controls.Library/DisplayTabControl.cs b/PROMS/Volian.Controls.Library/DisplayTabControl.cs index 14d2d7bf..8b4e5a0e 100644 --- a/PROMS/Volian.Controls.Library/DisplayTabControl.cs +++ b/PROMS/Volian.Controls.Library/DisplayTabControl.cs @@ -20,6 +20,12 @@ namespace Volian.Controls.Library { if (ItemClick != null) ItemClick(sender, args); } + public event DisplayPanelLinkEvent LinkModifyTran; + internal void OnLinkModifyTran(object sender, DisplayLinkEventArgs args) + { + if (LinkModifyTran != null) LinkModifyTran(sender, args); + else MessageBox.Show(args.LinkInfo.LinkText, "Unhandled Link Modify Tran", MessageBoxButtons.OK, MessageBoxIcon.Information); + } public event DisplayPanelEvent ItemSelectedChanged; internal void OnItemSelectedChanged(object sender, DisplayPanelEventArgs args) { diff --git a/PROMS/Volian.Controls.Library/DisplayTabPanel.cs b/PROMS/Volian.Controls.Library/DisplayTabPanel.cs index 7efd6721..01802f36 100644 --- a/PROMS/Volian.Controls.Library/DisplayTabPanel.cs +++ b/PROMS/Volian.Controls.Library/DisplayTabPanel.cs @@ -76,11 +76,15 @@ namespace Volian.Controls.Library _MyPanel.AutoScroll = true; _MyPanel.Dock = System.Windows.Forms.DockStyle.Fill; _MyPanel.LinkClicked +=new Volian.Controls.Library.DisplayPanelLinkEvent(_MyPanel_LinkClicked); + _MyPanel.LinkModifyTran += new DisplayPanelLinkEvent(_MyPanel_LinkModifyTran); _MyPanel.ItemClick +=new Volian.Controls.Library.DisplayPanelEvent(_MyPanel_ItemClick); _MyPanel.AttachmentClicked += new Volian.Controls.Library.DisplayPanelAttachmentEvent(_MyPanel_AttachmentClicked); _MyPanel.ItemSelectedChanged += new DisplayPanelEvent(_MyPanel_ItemSelectedChanged); } - + void _MyPanel_LinkModifyTran(object sender, DisplayLinkEventArgs args) + { + _MyTabControl.OnLinkModifyTran(sender, args); + } void _MyPanel_ItemSelectedChanged(object sender, DisplayPanelEventArgs args) { _MyTabControl.OnItemSelectedChanged(sender, args);