Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Save WindowState - Maximize, Minimize, Normal by user.

Browse Source 
Load all at once code to support print.
Open Command from the Start (PROMS2010) Menu.
Enter key on treeview executes Open.
The Treeview was retaining focus after opening procedures or accessory documents. This was fixed.
Tab Bar initialized to the full width.
Items were not always being displayed after the tree was clicked.
The RO and Transition Info tabs are made invisible for accessory documents.
The Tags, RO and Transition tabs are made invisible when no doucment is selected.
Enter the DSO Framer window when it is created.
Enter the Accessory page editor or step editor when a tab is selected.
Remember the last selection in a step editor page when you return.
Activate one of the remaining tabs when a tab is closed.
Embed the pushpin images.
This commit is contained in:
Rich
2008-05-21 21:00:07 +00:00
parent 41eb961ceb
commit e42c3cea5c
17 changed files with 869 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
PROMS/Volian.Controls.Library/DSOTabPanel.cs
View File

@@ -119,12 +119,40 @@ namespace Volian.Controls.Library
// this._MyDSOFramer.FrameHookPolicy = DSOFramer.dsoFrameHookPolicy.dsoResetNow;
this._MyDSOFramer.BeforeDocumentClosed += new AxDSOFramer._DFramerCtlEvents_BeforeDocumentClosedEventHandler(_MyDSOFramer_BeforeDocumentClosed);
this._MyDSOFramer.OnSaveCompleted += new AxDSOFramer._DFramerCtlEvents_OnSaveCompletedEventHandler(_MyDSOFramer_OnSaveCompleted);
//this._MyDSOFramer.LostFocus += new EventHandler(_MyDSOFramer_LostFocus);
//this._MyDSOFramer.GotFocus += new EventHandler(_MyDSOFramer_GotFocus);
//this._MyDSOFramer.Enter += new EventHandler(_MyDSOFramer_Enter);
//this._MyDSOFramer.Leave += new EventHandler(_MyDSOFramer_Leave);
//this._MyDSOFramer.OnActivationChange += new AxDSOFramer._DFramerCtlEvents_OnActivationChangeEventHandler(_MyDSOFramer_OnActivationChange);
this.Enter += new EventHandler(DSOTabPanel_Enter);
this.Leave += new EventHandler(DSOTabPanel_Leave);
//this.GotFocus += new EventHandler(DSOTabPanel_GotFocus);
//this.LostFocus += new EventHandler(DSOTabPanel_LostFocus);
}
//void _MyDSOFramer_Leave(object sender, EventArgs e)
//{
// vlnStackTrace.ShowStack("DSO Leave {0}", this.MyDocumentInfo.DocID);
//}
//void _MyDSOFramer_Enter(object sender, EventArgs e)
//{
// vlnStackTrace.ShowStack("DSO Enter {0}", this.MyDocumentInfo.DocID);
//}
//void _MyDSOFramer_GotFocus(object sender, EventArgs e)
//{
// vlnStackTrace.ShowStack("DSO Got Focus {0}",this.MyDocumentInfo.DocID);
//}
//void _MyDSOFramer_LostFocus(object sender, EventArgs e)
//{
// vlnStackTrace.ShowStack("DSO Lost Focus {0}", this.MyDocumentInfo.DocID);
//}
public void EnterPanel()
{
DSOTabPanel_Enter(this, new EventArgs());
}
//void DSOTabPanel_LostFocus(object sender, EventArgs e)
//{
// vlnStackTrace.ShowStack("DSOTabPanel_LostFocus {0} DocID {1} Index {2} {3}", _In_DSOTabPanel_Enter, this._MyDocumentInfo.DocID, _MyDisplayTabControl.MyBar.SelectedDockTab, sender.GetType().FullName);
@@ -189,7 +217,7 @@ namespace Volian.Controls.Library
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void DSOTabPanel_Enter(object sender, EventArgs e)
private void DSOTabPanel_Enter(object sender, EventArgs e)
{
if (IgnoreEnter) return;
_MyTransparentPanel.SendToBack();
@@ -203,7 +231,7 @@ namespace Volian.Controls.Library
if (_MyLog.IsErrorEnabled) _MyLog.ErrorFormat("DSOTabPage_Enter", ex);
}
if (_In_DSOTabPanel_Enter) return;
vlnStackTrace.ShowStack("DSOTabPanel_Enter {0} DocID {1} Index {2} {3}",_In_DSOTabPanel_Enter, this._MyDocumentInfo.DocID, _MyDisplayTabControl.MyBar.SelectedDockTab, sender.GetType().FullName);
//vlnStackTrace.ShowStack("DSOTabPanel_Enter {0} DocID {1} Index {2} {3}",_In_DSOTabPanel_Enter, this._MyDocumentInfo.DocID, _MyDisplayTabControl.MyBar.SelectedDockTab, sender.GetType().FullName);
_In_DSOTabPanel_Enter = true;
_MyDisplayTabControl.OnItemSelectedChanged(this,new ItemSelectedChangedEventArgs(MyDisplayTabItem.MyItemInfo));
_MyDSOFramer.Focus();

32
PROMS/Volian.Controls.Library/DisplayTabControl.cs
View File

@@ -207,11 +207,15 @@ namespace Volian.Controls.Library
Bar bar = sender as Bar;
if (bar != null)
{
if(dotNetBarManager1.Bars.Contains(bar.Name))
if (dotNetBarManager1.Bars.Contains(bar.Name))
dotNetBarManager1.Bars.Remove(bar);
ActivateRemainingTab();
}
}
else
{
ActivateRemainingTab((Bar)sender);
}
}
#endregion
#region Public Methods
@@ -243,15 +247,32 @@ namespace Volian.Controls.Library
{
if (myBar.DockSide == eDockSide.Document && myBar.Visible)
{
if (myBar.SelectedDockContainerItem != null)
{
myBar.SelectedDockContainerItem.Selected = true;
}
ActivateRemainingTab(myBar);
}
}
// No Document Tabs Remaining - need to raise OnItemSelectedChanged
OnItemSelectedChanged(this, null);
}
private DisplayTabItem FindRemainingTab(Bar myBar)
{
foreach (DisplayTabItem itm in myBar.Items)
{
if (!_RemovedDisplayTabItems.Contains(itm)) return itm;
}
return null;
}
private void ActivateRemainingTab(Bar myBar)
{
if (myBar.SelectedDockContainerItem != null)
{
if (_RemovedDisplayTabItems.Contains(myBar.SelectedDockContainerItem as DisplayTabItem))
myBar.SelectedDockContainerItem = FindRemainingTab(myBar);
myBar.SelectedDockContainerItem.Selected = true;
StepTabPanel pnl = myBar.SelectedDockContainerItem.Control as StepTabPanel;
if (pnl != null)
pnl.MyStepPanel.ItemShow();
}
}
#endregion
#region Public Properties
public DevComponents.DotNetBar.Bar MyBar
@@ -363,6 +384,7 @@ namespace Volian.Controls.Library
_MyDisplayTabItems.Add(key, pg);
}
SelectedDisplayTabItem = pg;
pg.MyDSOTabPanel.EnterPanel();
return pg;
}
/// <summary>

42
PROMS/Volian.Controls.Library/DisplayTabItem.cs
View File

@@ -69,12 +69,46 @@ namespace Volian.Controls.Library
container.Add(this);
InitializeComponent();
this.Click += new EventHandler(DisplayTabItem_Click);
//this.GotFocus += new EventHandler(DisplayTabItem_GotFocus);
//this.LostFocus += new EventHandler(DisplayTabItem_LostFocus);
//this.MouseDown += new System.Windows.Forms.MouseEventHandler(DisplayTabItem_MouseDown);
//this.MouseUp += new System.Windows.Forms.MouseEventHandler(DisplayTabItem_MouseUp);
if (myItemInfo.MyContent.MyEntry == null)
SetupStepTabPanel();
else
SetupDSOTabPanel();
Name = string.Format("DisplayTabItem {0}", myItemInfo.ItemID);
}
protected override void OnDisplayedChanged()
{
//Console.WriteLine("=>=>=>=> OnDisplayedChanged");
if(_MyStepTabPanel != null)
_MyStepTabPanel.MyStepPanel.DisplayItemChanging = true;
base.OnDisplayedChanged();
if(_MyStepTabPanel != null)
_MyStepTabPanel.MyStepPanel.DisplayItemChanging = false;
//Console.WriteLine("<=<=<=<= OnDisplayedChanged");
}
//void DisplayTabItem_MouseUp(object sender, System.Windows.Forms.MouseEventArgs e)
//{
// Console.WriteLine("DisplayTabItem_MouseUp");
//}
//void DisplayTabItem_MouseDown(object sender, System.Windows.Forms.MouseEventArgs e)
//{
// Console.WriteLine("DisplayTabItem_MouseDown");
//}
//void DisplayTabItem_LostFocus(object sender, EventArgs e)
//{
// Console.WriteLine("DisplayTabItem_LostFocus");
//}
//void DisplayTabItem_GotFocus(object sender, EventArgs e)
//{
// Console.WriteLine("DisplayTabItem_GotFocus");
//}
#endregion
#region Event Handlers
/// <summary>
@@ -89,6 +123,7 @@ namespace Volian.Controls.Library
if(myTabItem == null)return;
StepTabPanel myTabPanel = myTabItem.MyStepTabPanel as StepTabPanel;
if(myTabPanel == null) return;
if (MyStepTabPanel.SelectedStepItem == null) return;
_MyDisplayTabControl.OnItemSelectedChanged(this,new ItemSelectedChangedEventArgs(MyStepTabPanel.SelectedStepItem));
}
#endregion
@@ -111,6 +146,7 @@ namespace Volian.Controls.Library
//
_MyDisplayTabControl.Controls.Add(_MyStepTabPanel);
_MyDisplayTabControl.MyBar.Items.Add(this);
_MyDisplayTabControl.MyBar.Width = 300; // This triggers the bar to resize itself
//
// tabPanel
//
@@ -148,12 +184,12 @@ namespace Volian.Controls.Library
//
//Console.WriteLine("Enabled = true {0}", Name);
//_MyDisplayTabControl.MyBar.Enabled = true;
Console.WriteLine("SelectedDisplayTabItem {0}", Name);
//Console.WriteLine("SelectedDisplayTabItem {0}", Name);
_MyDisplayTabControl.SelectedDisplayTabItem = this;
Console.WriteLine("MyDisplayTabItem {0}", Name);
//Console.WriteLine("MyDisplayTabItem {0}", Name);
_MyDSOTabPanel.MyDisplayTabItem = this;
DSOTabPanel.IgnoreEnter = false;
_MyDisplayTabControl.OnItemSelectedChanged(this, new ItemSelectedChangedEventArgs(MyItemInfo));
//_MyDisplayTabControl.OnItemSelectedChanged(this, new ItemSelectedChangedEventArgs(MyItemInfo));
}
#endregion
}

2
PROMS/Volian.Controls.Library/StepItem.cs
View File

@@ -897,6 +897,8 @@ namespace Volian.Controls.Library
/// <param name="e"></param>
private void _StepRTB_Enter(object sender, EventArgs e)
{
if (_MyStepPanel.DisplayItemChanging) return;
//vlnStackTrace.ShowStack("_StepRTB_Enter {0}",this.MyID);
_MyStepPanel.SelectedStepRTB = _MyStepRTB;
}
/// <summary>

14
PROMS/Volian.Controls.Library/StepPanel.cs
View File

@@ -303,6 +303,7 @@ namespace Volian.Controls.Library
get { return _SelectedItemInfo; }
set
{
//vlnStackTrace.ShowStack("SelectedItemInfo {0} => {1}",_SelectedItemInfo, value);
_SelectedItemInfo = value;
int id = value.ItemID;
ExpandAsNeeded(value);
@@ -312,6 +313,12 @@ namespace Volian.Controls.Library
//vlnStackTrace.ShowStack("_ItemSelected = {0}", _ItemSelected.ItemID);// Show StackTrace
}
}
private bool _DisplayItemChanging = false;
public bool DisplayItemChanging
{
get { return _DisplayItemChanging; }
set { _DisplayItemChanging = value; }
}
/// <summary>
/// Returns the SelectedStepItem
/// </summary>
@@ -325,7 +332,14 @@ namespace Volian.Controls.Library
public void ItemShow()
{
if (_SelectedItemInfo != null)
{
SelectedStepItem.ItemShow();
OnItemSelectedChanged(this, new ItemSelectedChangedEventArgs(SelectedStepItem));
}
}
public void MouseWheel(MouseEventArgs e)
{
base.OnMouseWheel(e);
}
/// <summary>
/// Used to track movement other than scrolling

7
PROMS/Volian.Controls.Library/StepRTB.cs
View File

@@ -159,7 +159,7 @@ namespace Volian.Controls.Library
/// int tbindx - tab index
/// E_EditPrintMode ep_mode - edit or print.
/// E_ViewMode vw_mode - view or edit.
/// </summary>
/// </summary>
public StepRTB()
{
InitializeComponent();
@@ -172,6 +172,11 @@ namespace Volian.Controls.Library
_Container = container;
SetUp();
}
protected override void OnMouseWheel(MouseEventArgs e)
{
_MyStepItem.MyStepPanel.MouseWheel(e);
//base.OnMouseWheel(e);
}
private void SetUp()
{
BorderStyle = System.Windows.Forms.BorderStyle.None;

13
PROMS/Volian.Controls.Library/StepTabPanel.cs
View File

@@ -124,6 +124,12 @@ namespace Volian.Controls.Library
}
#endregion
#region Event Handlers
private bool _ShowingItem = false;
public bool ShowingItem
{
get { return _ShowingItem; }
set { _ShowingItem = value; }
}
/// <summary>
/// Occurs when the user clicks on a StepTabPanel
/// </summary>
@@ -131,9 +137,12 @@ namespace Volian.Controls.Library
/// <param name="e"></param>
private void StepTabPanel_Enter(object sender, EventArgs e)
{
if (_ShowingItem) return;
_ShowingItem = true;
//if (ItemSelected != null)
_MyStepPanel.ItemShow();
}
_MyStepPanel.ItemShow();
_ShowingItem = false;
}
/// <summary>
/// Occurs when the cursor moves onto or off of a link
/// </summary>