From 58486f199dcf5bb4a0a54013f5d098b7e72ea599 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 30 Nov 2009 18:35:18 +0000 Subject: [PATCH] Fixed display of button sub-items when in KeyTips mode --- .../Volian.Controls.Library/StepTabRibbon.cs | 31 ++++++--- .../StepTabRibbon.designer.cs | Bin 229356 -> 229366 bytes .../StepTabRibbon.resx | 60 +++++++----------- 3 files changed, 46 insertions(+), 45 deletions(-) diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index 46128e9c..38d89048 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -73,9 +73,9 @@ namespace Volian.Controls.Library break; } //_MyStepRTB.KeyDown += new KeyEventHandler(MyStepRTB_SelectionChanged); - _MyStepRTB.KeyUp += new KeyEventHandler(MyStepRTB_SelectionChanged); + _MyStepRTB.KeyUp += new KeyEventHandler(_MyStepRTB_KeyUp); //+= new KeyEventHandler(MyStepRTB_SelectionChanged); _MyStepRTB.ModeChange += new StepRTBModeChangeEvent(_MyStepRTB_ModeChange); - _MyStepRTB.MouseUp += new MouseEventHandler(MyStepRTB_SelectionChanged); + _MyStepRTB.MouseUp += new MouseEventHandler(_MyStepRTB_MouseUp); //+= new MouseEventHandler(MyStepRTB_SelectionChanged); _MyStepRTB.Leave += new EventHandler(MyStepRTB_Leave); _MyStepRTB.LinkChanged += new StepRTBLinkEvent(_MyStepRTB_LinkChanged); // Add symbols into the tab ribbon based on format selection. For now, only add symbols once @@ -98,12 +98,23 @@ namespace Volian.Controls.Library BuildSymbolGallery(sl, galleryContainerSymbolsCM3); } SetButtonAndMenuEnabling(true); + SetStepButtonAndMenuEnabling(true); _MyLastFormatID = MyItemInfo.ActiveFormat.FormatID; } } } + void _MyStepRTB_MouseUp(object sender, MouseEventArgs e) + { + SetButtonAndMenuEnabling(false); + } + + void _MyStepRTB_KeyUp(object sender, KeyEventArgs e) + { + SetButtonAndMenuEnabling(false); + } + private void BuildSymbolGallery(SymbolList sl, DevComponents.DotNetBar.GalleryContainer gc) { foreach (Symbol sym in sl) @@ -174,15 +185,16 @@ namespace Volian.Controls.Library } void MyStepRTB_Leave(object sender, EventArgs e) { - _MyStepRTB.MouseUp -= new MouseEventHandler(MyStepRTB_SelectionChanged); + _MyStepRTB.KeyUp -=new KeyEventHandler(_MyStepRTB_KeyUp); + _MyStepRTB.MouseUp -= new MouseEventHandler(_MyStepRTB_MouseUp); //-= new MouseEventHandler(MyStepRTB_SelectionChanged); _MyStepRTB.Leave -= new EventHandler(MyStepRTB_Leave); _MyStepRTB.LinkChanged -= new StepRTBLinkEvent(_MyStepRTB_LinkChanged); } - void MyStepRTB_SelectionChanged(object sender, EventArgs e) - { - //Console.WriteLine(string.Format("StepTabRibbon: In MyStepRTB_SelectionChanged, Selected Text = {0}", MyStepRTB.SelectedText)); - SetButtonAndMenuEnabling(false); - } + //void MyStepRTB_SelectionChanged(object sender, EventArgs e) + //{ + // //Console.WriteLine(string.Format("StepTabRibbon: In MyStepRTB_SelectionChanged, Selected Text = {0}", MyStepRTB.SelectedText)); + // SetButtonAndMenuEnabling(false); + //} void btnInsStep_Click(object sender, EventArgs e) { DevComponents.DotNetBar.ButtonItem b = (DevComponents.DotNetBar.ButtonItem)sender; @@ -318,7 +330,7 @@ namespace Volian.Controls.Library btnCMEditTran.Enabled = false; btnCMEditRO.Enabled = false; } - SetStepButtonAndMenuEnabling(docontextmenus); + //SetStepButtonAndMenuEnabling(docontextmenus); } private void SetStepButtonAndMenuEnabling(bool docontextmenus) { @@ -883,6 +895,7 @@ namespace Volian.Controls.Library MessageBox.Show("Functionality not available.", "Find/Replace"); } + } public enum E_FieldToEdit { StepText, Text, Number }; } diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs index aff098bab7640b2217063f551e674cdd6f86f744..cb4bf02907f10ab50cc5975692abbe244ad226e5 100644 GIT binary patch delta 435 zcmYL_UnoOy6vv(4omuPdy0moDY|F#)w?;xEtvtxyj3iHJmWQRq5|ZxIlBCry&YL`X zknmgmR$CcrR$lfbc_C?eSn?nbsJXjqyq(YY^gZ8mPN8V|ELu*@CX8KzNW}pk#zq7) z9kSU`y#bNQtqXNDye!eE=f6eYFHCI5^x;5vgh(vvnRMaPHOSOF*FwW#8_UlSKx3y6 zWr;Z-DbMx?dub@pfnGb9nK&;2+X}jjm}nC`>@~Cx^lMhcg9ve9E(HqDB_V5|6U)sd zx5Tq)NCEU?mjlL1SqguaGXkJ!+i0U5KSB!;mJh#2${g>TsTydB Z^M@sJlF%>5c&9MP)pnr=xc1S!{}=n$r2_x} delta 383 zcmXw#KS%;`9L4+I*?HJ$*Aa3ZQI}wef51YDYH=2VaBfh+rV!C28!D%43h4)amj=fO z3F#O7B*boL79j#@h-h#SacnBgQpeAGZ+P#0^{w5$wPF#m=?0Nnw1iG7357`8AsP{{ zXVA!S0tOE`kyx}4ZEi`+xa$Lnv|}#Rz5D{nMjwfu)=4MgM%l-o(`qcl(PUf&Qi*#> zDJc$@fY69&zov4#~)D(c6az&a`Jruz4 System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA + EnEB89x6jgAAASBJREFUOE+lU7ERwjAMFCOwQmbJCKFIQQtFGorccS5oUnApU9B4hayQFViBFVgh/Ecm + Z8cmcAd3wlEkvaV/ZTOOo/z1I8DbRIoBtvXfLeJ2GZuLtZMCf9c2BYDYgfEfACxATBYlSvEUOX0FaEUI + YPtF62ft7rY+go5hHgrS7NxYWy2uCRzxE3DgCnKRjskP56Orkv45yU2asKMbpcPJ2839ozKfJTMgbSKU + t0ekztKvaA7ibixOyvoLADqYiGMXHIUWy7uQa+cSuZGUDb7FswWYwclx9oES/hqzGAmV1UTdSPiQ8Uqw + DCdiNtgFHwAtVpjbIvESaA4ZqUrP2xELFPEBUMwlqmH7iDiNNQAph2DskIMaIF16YfCVIoZOmtyveQF9 + 2CVVWYKhQwAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA + EnEB89x6jgAAAIBJREFUOE/FU9ESgCAIy///aAMU0DDYSxecV6KOObB1squRs3VyNY1Z4OWHATYTFHI1 + gp0RXdm+vlGoLC5zPowCHDeiAGkmhMHnAEFpDwwRjcFKV++/6xyLVgEk2UfhnuVTNsVBa5Njk8xV6c1k + hNwGBmaHAP5n4G8q6gFdoZLjBpE7j5KJdaRlAAAAAElFTkSuQmCC + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -166,30 +190,6 @@ EnEB89x6jgAAAIBJREFUOE/FU9ESgCAIy///aAMU0DDYSxecV6KOObB1squRs3VyNY1Z4OWHATYTFHI1 gp0RXdm+vlGoLC5zPowCHDeiAGkmhMHnAEFpDwwRjcFKV++/6xyLVgEk2UfhnuVTNsVBa5Njk8xV6c1k hNwGBmaHAP5n4G8q6gFdoZLjBpE7j5KJdaRlAAAAAElFTkSuQmCC - - - - 17, 17 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAIBJREFUOE/FU9ESgCAIy///aAMU0DDYSxecV6KOObB1squRs3VyNY1Z4OWHATYTFHI1 - gp0RXdm+vlGoLC5zPowCHDeiAGkmhMHnAEFpDwwRjcFKV++/6xyLVgEk2UfhnuVTNsVBa5Njk8xV6c1k - hNwGBmaHAP5n4G8q6gFdoZLjBpE7j5KJdaRlAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAASBJREFUOE+lU7ERwjAMFCOwQmbJCKFIQQtFGorccS5oUnApU9B4hayQFViBFVgh/Ecm - Z8cmcAd3wlEkvaV/ZTOOo/z1I8DbRIoBtvXfLeJ2GZuLtZMCf9c2BYDYgfEfACxATBYlSvEUOX0FaEUI - YPtF62ft7rY+go5hHgrS7NxYWy2uCRzxE3DgCnKRjskP56Orkv45yU2asKMbpcPJ2839ozKfJTMgbSKU - t0ekztKvaA7ibixOyvoLADqYiGMXHIUWy7uQa+cSuZGUDb7FswWYwclx9oES/hqzGAmV1UTdSPiQ8Uqw - DCdiNtgFHwAtVpjbIvESaA4ZqUrP2xELFPEBUMwlqmH7iDiNNQAph2DskIMaIF16YfCVIoZOmtyveQF9 - 2CVVWYKhQwAAAABJRU5ErkJggg== @@ -220,18 +220,6 @@ EnEB89x6jgAAAIBJREFUOE/FU9ESgCAIy///aAMU0DDYSxecV6KOObB1squRs3VyNY1Z4OWHATYTFHI1 gp0RXdm+vlGoLC5zPowCHDeiAGkmhMHnAEFpDwwRjcFKV++/6xyLVgEk2UfhnuVTNsVBa5Njk8xV6c1k hNwGBmaHAP5n4G8q6gFdoZLjBpE7j5KJdaRlAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAASBJREFUOE+lU7ERwjAMFCOwQmbJCKFIQQtFGorccS5oUnApU9B4hayQFViBFVgh/Ecm - Z8cmcAd3wlEkvaV/ZTOOo/z1I8DbRIoBtvXfLeJ2GZuLtZMCf9c2BYDYgfEfACxATBYlSvEUOX0FaEUI - YPtF62ft7rY+go5hHgrS7NxYWy2uCRzxE3DgCnKRjskP56Orkv45yU2asKMbpcPJ2839ozKfJTMgbSKU - t0ekztKvaA7ibixOyvoLADqYiGMXHIUWy7uQa+cSuZGUDb7FswWYwclx9oES/hqzGAmV1UTdSPiQ8Uqw - DCdiNtgFHwAtVpjbIvESaA4ZqUrP2xELFPEBUMwlqmH7iDiNNQAph2DskIMaIF16YfCVIoZOmtyveQF9 - 2CVVWYKhQwAAAABJRU5ErkJggg==