From 6e353f6781bd591d0358503e4814a74ce38e22e9 Mon Sep 17 00:00:00 2001 From: Kathy Date: Wed, 6 Apr 2011 14:24:49 +0000 Subject: [PATCH] --- PROMS/Volian.Controls.Library/StepRTB.cs | 5 +++-- .../Volian.Controls.Library/StepTabRibbon.cs | 21 ++++++++++++++---- .../StepTabRibbon.designer.cs | Bin 479034 -> 483042 bytes 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/PROMS/Volian.Controls.Library/StepRTB.cs b/PROMS/Volian.Controls.Library/StepRTB.cs index a3a90826..f4873dcb 100644 --- a/PROMS/Volian.Controls.Library/StepRTB.cs +++ b/PROMS/Volian.Controls.Library/StepRTB.cs @@ -632,8 +632,9 @@ namespace Volian.Controls.Library { _MouseDown = true; //Console.WriteLine("vvvvvvvvvv StepRTB Mouse Down id= {0}",MyItemInfo.ItemID); + bool inPsi = this.Parent.FindForm().Name.Contains("frmPSI"); if (!_ContextMenuStripChanged) - OnSetMenu(this, new StepRTBMenuEventArgs("OpenContextMenu")); + OnSetMenu(this, new StepRTBMenuEventArgs(inPsi?"PSI":"OpenContextMenu")); _ContextMenuStripChanged = false; CorrectSelectionAtEndOfLine(); } @@ -945,7 +946,7 @@ namespace Volian.Controls.Library else AddLink20(linkUrl, linkValue); } - private string FontTable + public string FontTable { get { diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index 96f2bdd2..fb1efd88 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -96,6 +96,10 @@ namespace Volian.Controls.Library //Console.WriteLine(string.Format("StepTabRibbon: In set of MyStepRTB, Selected Text = {0}", MyStepRTB.SelectedText)); switch (_MyStepRTB.FieldToEdit) { + case E_FieldToEdit.PSI: + _ContextMenuBar.SetContextMenuEx(_MyStepRTB, btnCMPSI); + _DefaultContextMenu = btnCMPSI; + break; case E_FieldToEdit.StepText: if (MyFlexGrid != null) { @@ -147,7 +151,7 @@ namespace Volian.Controls.Library MessageBox.Show("No symbols are available, check with administrator"); return; } - BuildSymbolGallery(sl, galleryContainerSymbolsCM, galleryContainerSymbolsCM3, galleryContainerSymbolsGrid); + BuildSymbolGallery(sl, galleryContainerSymbolsCM, galleryContainerSymbolsCM3, galleryContainerSymbolsGrid, galleryContainerSymbolsCM4); //BuildSymbolGallery(sl, galleryContainerSymbolsCM); //BuildSymbolGallery(sl, galleryContainerSymbolsCM3); //BuildSymbolGallery(sl, galleryContainerSymbolsGrid); @@ -247,7 +251,7 @@ namespace Volian.Controls.Library // //SetButtonAndMenuEnabling(false); //} - private void BuildSymbolGallery(SymbolList sl, DevComponents.DotNetBar.GalleryContainer gc1, DevComponents.DotNetBar.GalleryContainer gc2, DevComponents.DotNetBar.GalleryContainer gc3) + private void BuildSymbolGallery(SymbolList sl, DevComponents.DotNetBar.GalleryContainer gc1, DevComponents.DotNetBar.GalleryContainer gc2, DevComponents.DotNetBar.GalleryContainer gc3, DevComponents.DotNetBar.GalleryContainer gc4) { foreach (Symbol sym in sl) { @@ -269,6 +273,9 @@ namespace Volian.Controls.Library DevComponents.DotNetBar.ButtonItem btnCM3 = GetCMButton(sym); btnCM3.Click += new System.EventHandler(btnSym_Click); gc3.SubItems.Add(btnCM3); + DevComponents.DotNetBar.ButtonItem btnCM4 = GetCMButton(sym); + btnCM4.Click += new System.EventHandler(btnSym_Click); + gc4.SubItems.Add(btnCM4); } } @@ -1302,7 +1309,9 @@ namespace Volian.Controls.Library { bool displayMenu = false; E_AccStep? actable = 0; - StepData sd = MyItemInfo.FormatStepData; + if (menuName.Contains("PSI")) Console.WriteLine("menu = {0}", menuName); + + StepData sd = MyItemInfo==null?null:MyItemInfo.FormatStepData; if (sd != null) // will be null if section { actable = sd.StepEditData.AcTable; @@ -1311,6 +1320,10 @@ namespace Volian.Controls.Library //btnInsCaut.Enabled = (actable & E_AccStep.AddingCaution) > 0; switch (menuName) { + case "PSI": + displayMenu = true; + _ContextMenuBar.SetContextMenuEx(_MyStepRTB, btnCMPSI); + break; case "InsHLS": displayMenu = true; _ContextMenuBar.SetContextMenuEx(_MyStepRTB, btnCMInsHLS); @@ -1980,7 +1993,7 @@ namespace Volian.Controls.Library //_RibbonControl.Height = rbnBorderlistBox.Height + _RibbonControl.Height - _RibbonControl.ClientSize.Height; } } - public enum E_FieldToEdit { StepText, Text, Number }; + public enum E_FieldToEdit { StepText, Text, Number, PSI }; public class StepTabRibbonEventArgs : EventArgs { public StepTabRibbonEventArgs() { ; } diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs index 50d6b78b9caa984407dd503061f95c7bcbaab4de..6be7c358276e53f62019dd5b7498585bb4608b0b 100644 GIT binary patch delta 1206 zcmZ8hT}&KR6rOwU+{<>mY=`Z#!70$8MvSz;LQxz1+Ym!7rPyW@sfIMbLt|>i(QaaB zA}q#OBbaQs+Z@s;t~9CXPt58hUIVc~YMZoyh=lf~e=JQ*<$;0^jn){Qxii^fpXQ$P z&3C?Y&OPUjkCrX|SeEVcfjNUBJW#d_#s~|6Imm+6{P`^Au@`hJT>f$?Pu}ubL%u^{ z=qx50oH~Mnmf84mk{kVgx>t!SyZCDF`|IRMc}0mkmglcdp5h zm4)Kq6_ivRT$g-N^$Ti3q(ONa>eA>5Fl&*{C+`L%2nXhnU)-2QorMmg6c*-D82WCZ z3^Wy!axkx=2wdAhKZVQ!(#8GTsGPvcON0qykR>*Pwwvgp<_@}1>e4g+qVVxn?6FrK zpolOKPVDl6@5CYavsu-6=AL@I6Ej$D!5_LxlPx$5>5DiGsWu#hH_xb1h_>3k@ttZA z#(SAxWLk0e<8Gv=iO;#bq=_R!dl&b`T_k%RYcTyY9&usg5)KJF?C>6|>1LKX|LEMj zsaZ95w%IMPOXicSJ}Y&v^COp^I)ePLbQH-P#q$aD{c{o!Miw>e!q`aeSIQ{E7s3#1 zp&CSsRNt|lMk0C|)k|~Gy`I*)mkUL;coQrHsR2EObkSjzNb}f$-ly4KU}MebtB ze~1(;@Wvcg)1(+y7HJKbo2fq^tl|OrLME``k))xnSFK)Cwmxh`K9Tt=+g zNkEqJcRPK`>q!3+-2_?%jYweMetI1>JlcX+U#9~wwVS;LMhC5j`c~GKKUG3(hKxb1 zgNAJ4z7E=Ne{!6FbisRzY8X;!Vz}ni9MxUwA9K`RddmZB&cJu}iaA@swF#e?Kgyal zksf7jSl+$}e8u)7ck`}{u@U>>@IzvZz34m~A<=V^MbAR)E{lQo7uzCh$yw~Jd`o}5 a&h|Wn27h4f&cm@6X5XNyEza8tzWxuT1CfIO delta 659 zcmYk4O=uHA6vsO=yVDpqVTsEULW*mfwks&~5ENRKG>4$YrVE0INZEt*P>Mt?rCuZl zX+88%yV@5^2q8B=sH+1R5wtl(Q4eZ*C?cYzR2rexLIfcfO}2;Z?eYG<|NG)?yzF?9 z>#%Qnz&wHd?72R!SjM_)-Szwe*^k2PiWCn+OefxZQ^?O^Cuh>Io2MF6OF06m-^63( zcY>_2&&Jk#MY9sG`yn02QX_~q3I#2#e7k9vSiPL{ibvYCwkSLp#NEvPID{eog!Z%O zYLAb14&b8L(vL&c-^cl-wtYCp}S8#E_ zt*6?F3dLuF4C|K#%BwyS4zY{h(}D|XPRyjuID%1wB%S$VTVD3+hv{=urJt&mtmPqi ziD=e*O@*}^WRBT?q6A_Og%F?KkG_Uo2FM>mDlEPi0+w0xKu$+9ju-kgr0@%e(c~F7 zU7A1&)UToJ9%Nia0si(nG9zv%b*BNH&!8m-;_`j8aL%o3TPOe@wowMYtY8g3RgugW zchJHx_v&P~r-dE`V~F@?^%27L5#ie^ME{8)SdNGqOm~VKEwFnpd2F1@vxP2^7rLlt z!dbYOrAZmggGgZ2zf%Wz@-a