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

Browse Source
This commit is contained in:
Kathy Ruffing 2010-11-10 18:21:19 +00:00
parent 4ceb9db53a
commit 171f668aaf
4 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PROMS/Volian.Controls.Library/StepTabRibbon.cs
View File

@ -436,7 +436,11 @@ namespace Volian.Controls.Library
btnInsTrans.Enabled = btnCMTransition.Enabled = btnInsRO.Enabled = btnCMRO.Enabled = false; btnInsTrans.Enabled = btnCMTransition.Enabled = btnInsRO.Enabled = btnCMRO.Enabled = false;
btnInsAftH.Enabled = btnInsBefH.Enabled = false; btnInsAftH.Enabled = btnInsBefH.Enabled = false;
btnInsHLS.Enabled = (!MyItemInfo.IsStepSection) ? false : true; // allow hls from step section btnInsHLS.Enabled = (!MyItemInfo.IsStepSection) ? false : true; // allow hls from step section
if (btnInsHLS.Enabled) GalleryForSubTypes(MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList.HLS, MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList.HLS, btnInsHLS, (int)E_FromType.Step, btnCMInsHLS, docontextmenus); if (btnInsHLS.Enabled)
{
btnInsHLS.SubItems.Clear();
GalleryForSubTypes(MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList.HLS, MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList.HLS, btnInsHLS, (int)E_FromType.Step, btnCMInsHLS, docontextmenus);
}
this.Refresh(); this.Refresh();
return; return;
} }

BIN
PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs generated
View File

Binary file not shown.

24
PROMS/Volian.Controls.Library/StepTabRibbon.resx
View File

@ -117,7 +117,19 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="superTooltipRibbon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnInsRO.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
EnEB89x6jgAAAIBJREFUOE/FU9ESgCAIy///aAMU0DDYSxecV6KOObB1squRs3VyNY1Z4OWHATYTFHI1
gp0RXdm+vlGoLC5zPowCHDeiAGkmhMHnAEFpDwwRjcFKV++/6xyLVgEk2UfhnuVTNsVBa5Njk8xV6c1k
hNwGBmaHAP5n4G8q6gFdoZLjBpE7j5KJdaRlAAAAAElFTkSuQmCC
</value>
</data>
<data name="btnListUsers.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="btnListUsers.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@ -168,9 +180,6 @@
hNwGBmaHAP5n4G8q6gFdoZLjBpE7j5KJdaRlAAAAAElFTkSuQmCC hNwGBmaHAP5n4G8q6gFdoZLjBpE7j5KJdaRlAAAAAElFTkSuQmCC
</value> </value>
</data> </data>
<metadata name="superTooltipRibbon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="btnDelelete.SuperTooltip" xml:space="preserve"> <data name="btnDelelete.SuperTooltip" xml:space="preserve">
<value>Will delete the current step and any of its substseps, RNOs, etc. Checks whether any transitions are pointing to this step from outside the step and if found, does not allow delete, but prompts user with list of transitions.</value> <value>Will delete the current step and any of its substseps, RNOs, etc. Checks whether any transitions are pointing to this step from outside the step and if found, does not allow delete, but prompts user with list of transitions.</value>
</data> </data>
@ -184,15 +193,6 @@
t0ekztKvaA7ibixOyvoLADqYiGMXHIUWy7uQa+cSuZGUDb7FswWYwclx9oES/hqzGAmV1UTdSPiQ8Uqw t0ekztKvaA7ibixOyvoLADqYiGMXHIUWy7uQa+cSuZGUDb7FswWYwclx9oES/hqzGAmV1UTdSPiQ8Uqw
DCdiNtgFHwAtVpjbIvESaA4ZqUrP2xELFPEBUMwlqmH7iDiNNQAph2DskIMaIF16YfCVIoZOmtyveQF9 DCdiNtgFHwAtVpjbIvESaA4ZqUrP2xELFPEBUMwlqmH7iDiNNQAph2DskIMaIF16YfCVIoZOmtyveQF9
2CVVWYKhQwAAAABJRU5ErkJggg== 2CVVWYKhQwAAAABJRU5ErkJggg==
</value>
</data>
<data name="btnInsRO.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
EnEB89x6jgAAAIBJREFUOE/FU9ESgCAIy///aAMU0DDYSxecV6KOObB1squRs3VyNY1Z4OWHATYTFHI1
gp0RXdm+vlGoLC5zPowCHDeiAGkmhMHnAEFpDwwRjcFKV++/6xyLVgEk2UfhnuVTNsVBa5Njk8xV6c1k
hNwGBmaHAP5n4G8q6gFdoZLjBpE7j5KJdaRlAAAAAElFTkSuQmCC
</value> </value>
</data> </data>
<data name="btnCMCut.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="btnCMCut.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

64
PROMS/Volian.Controls.Library/vlnTreeView.cs
View File

@ -1158,10 +1158,10 @@ namespace Volian.Controls.Library
{ {
TreeNode dragNode = (TreeNode)e.Item; TreeNode dragNode = (TreeNode)e.Item;
Type t = dragNode.GetType(); Type t = dragNode.GetType();
if(_MyLog.IsInfoEnabled)_MyLog.InfoFormat("Item Drag {0} - {1}", t.FullName, t.BaseType.FullName); //if(_MyLog.IsInfoEnabled)_MyLog.InfoFormat("Item Drag {0} - {1}", t.FullName, t.BaseType.FullName);
Type t2 = Type.GetType(t.FullName); Type t2 = Type.GetType(t.FullName);
if(t2 != null) //if(t2 != null)
if(_MyLog.IsInfoEnabled)_MyLog.InfoFormat("Item Drag {0} - {1}", t2.FullName, t2.BaseType.FullName); // if(_MyLog.IsInfoEnabled)_MyLog.InfoFormat("Item Drag {0} - {1}", t2.FullName, t2.BaseType.FullName);
this.SelectedNode = dragNode; this.SelectedNode = dragNode;
ItemInfo iidrag = ((VETreeNode)dragNode).VEObject as ItemInfo; ItemInfo iidrag = ((VETreeNode)dragNode).VEObject as ItemInfo;
FolderInfo fdrag = ((VETreeNode)dragNode).VEObject as FolderInfo; FolderInfo fdrag = ((VETreeNode)dragNode).VEObject as FolderInfo;
@ -1236,10 +1236,10 @@ namespace Volian.Controls.Library
_location = string.Format("Child {0} y={1}", _dropNode.Text, OffsetY); _location = string.Format("Child {0} y={1}", _dropNode.Text, OffsetY);
_position = DropPosition.Child; _position = DropPosition.Child;
_index = 0; _index = 0;
if (_dropNode.Parent == null) //if (_dropNode.Parent == null)
{ //{
if(_MyLog.IsInfoEnabled)_MyLog.Info("Root Node"); // if(_MyLog.IsInfoEnabled)_MyLog.Info("Root Node");
} //}
} }
else // Last Third - After Now I need to check the X value else // Last Third - After Now I need to check the X value
{ {
@ -1332,7 +1332,7 @@ namespace Volian.Controls.Library
{ {
return; return;
} }
if(_MyLog.IsInfoEnabled)_MyLog.InfoFormat("Line at {0} Node {1}[{2}] {3}", _location, _dropNode.Text, _index, _position.ToString()); //if(_MyLog.IsInfoEnabled)_MyLog.InfoFormat("Line at {0} Node {1}[{2}] {3}", _location, _dropNode.Text, _index, _position.ToString());
Color lc = (_position == DropPosition.After ? Color.Red : Color.Blue); Color lc = (_position == DropPosition.After ? Color.Red : Color.Blue);
Brush lb = (_position == DropPosition.After ? Brushes.Red : Brushes.Blue); Brush lb = (_position == DropPosition.After ? Brushes.Red : Brushes.Blue);
Point[] RightTriangle; Point[] RightTriangle;
@ -1366,7 +1366,7 @@ namespace Volian.Controls.Library
// { // {
if (ScrollTreeView(tmp) || !ScrollOnly) if (ScrollTreeView(tmp) || !ScrollOnly)
{ {
if(_MyLog.IsInfoEnabled)_MyLog.InfoFormat("ShowLocation2 {0} {1}", e.Effect.ToString(), DateTime.Now.Millisecond); //if(_MyLog.IsInfoEnabled)_MyLog.InfoFormat("ShowLocation2 {0} {1}", e.Effect.ToString(), DateTime.Now.Millisecond);
tv.Refresh(); tv.Refresh();
if (e.Effect != DragDropEffects.None) if (e.Effect != DragDropEffects.None)
{ {
@ -1384,7 +1384,7 @@ namespace Volian.Controls.Library
#endregion #endregion
public void ShowLocation() public void ShowLocation()
{ {
if(_MyLog.IsInfoEnabled)_MyLog.InfoFormat("{0}[{1}] {2}", _dropNode.Text, _index, _position.ToString()); //if(_MyLog.IsInfoEnabled)_MyLog.InfoFormat("{0}[{1}] {2}", _dropNode.Text, _index, _position.ToString());
} }
#region AutoScroll #region AutoScroll
private bool ScrollTreeView(TreeNode tn) private bool ScrollTreeView(TreeNode tn)
@ -1607,28 +1607,28 @@ namespace Volian.Controls.Library
if(_MyLog.IsErrorEnabled)_MyLog.Error("tv_DragDrop", ex); if(_MyLog.IsErrorEnabled)_MyLog.Error("tv_DragDrop", ex);
} }
} }
private void DumpMembers(object o) // private void DumpMembers(object o)
{ // {
Type t = o.GetType(); // Type t = o.GetType();
if(_MyLog.IsInfoEnabled)_MyLog.InfoFormat("\r\n\r\nMembers for type {0}", t.ToString()); // //if(_MyLog.IsInfoEnabled)_MyLog.InfoFormat("\r\n\r\nMembers for type {0}", t.ToString());
MemberInfo[] mis = t.GetMembers(); // MemberInfo[] mis = t.GetMembers();
int i = 0; // int i = 0;
foreach (MemberInfo mi in mis) // foreach (MemberInfo mi in mis)
{ // {
i++; // i++;
try // try
{ // {
if(mi.MemberType != MemberTypes.Method) // //if(mi.MemberType != MemberTypes.Method)
if(_MyLog.IsInfoEnabled)_MyLog.InfoFormat("{0} {1} {2}", i, mi.Name, mi.MemberType); // //if(_MyLog.IsInfoEnabled)_MyLog.InfoFormat("{0} {1} {2}", i, mi.Name, mi.MemberType);
// if (fi.Name == "TreeView") //// if (fi.Name == "TreeView")
// fi.SetValue(o, null); //// fi.SetValue(o, null);
} // }
catch (Exception ex) // catch (Exception ex)
{ // {
if(_MyLog.IsErrorEnabled)_MyLog.Error("DumpMembers", ex); // if(_MyLog.IsErrorEnabled)_MyLog.Error("DumpMembers", ex);
} // }
} // }
} // }
private TreeNode Clone(TreeNode tn) private TreeNode Clone(TreeNode tn)
{ {