2011-03-18 19:15:36 +00:00 · 2011-03-18 19:15:36 +00:00 · f36d16d84c
commit f36d16d84c
parent 6cd97c36ce
4 changed files with 4311 additions and 4219 deletions
--- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs
+++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs
@ -36,6 +36,7 @@ namespace Volian.Controls.Library
 					if (value is GridItem)
 					{
 						ToggleTableDesignButtons(true);
+						MyFlexGrid_SelChange(this,new EventArgs());
 					}
 				}
 			}
@ -125,7 +126,11 @@ namespace Volian.Controls.Library
 					if (_MyEditItem != null) _MyEditItem.Leave += new EventHandler(_MyEditItem_Leave);
 					//_MyStepRTB.Leave += new EventHandler(_MyStepRTB_Leave);
 					_MyStepRTB.LinkChanged += new StepRTBLinkEvent(_MyStepRTB_LinkChanged);
-					if (MyFlexGrid != null) MyFlexGrid.CopyOptionChanged += new VlnFlexGridEvent(MyFlexGrid_CopyOptionChanged);
+					if (MyFlexGrid != null) 
+					{
+						MyFlexGrid.CopyOptionChanged += new VlnFlexGridEvent(MyFlexGrid_CopyOptionChanged);
+						MyFlexGrid.SelChange+=new EventHandler(MyFlexGrid_SelChange);
+					}
 					// Add symbols into the tab ribbon based on format selection. For now, only add symbols once
 					// because all symbols are same!!!  If we start defining different symbols in different formats
 					// this will have to change, i.e. remove the second part of 'if' statement.
@ -154,6 +159,14 @@ namespace Volian.Controls.Library
 			}
 		}

+		void MyFlexGrid_SelChange(object sender, EventArgs e)
+		{
+			if (MyFlexGrid.Selection.c1 < 0 || MyFlexGrid.Selection.r1 < 0) 
+				return;
+			C1.Win.C1FlexGrid.CellRange cr = MyFlexGrid.GetEvenSelection();
+			rbnBorderSelectionPanel.InitializeBorder(MyFlexGrid.MyBorders, cr.r1, cr.c1, cr.r2, cr.c2);
+		}
+
 		void _MyEditItem_Leave(object sender, EventArgs e)
 		{
 			// The following two lines were replaced by the third line so that the Ribbon KeyTips will work properly.
@ -161,10 +174,34 @@ namespace Volian.Controls.Library
 			//_MyStepRTB.KeyUp -=new KeyEventHandler(_MyStepRTB_KeyUp);
 			//_MyStepRTB.MouseUp -= new MouseEventHandler(_MyStepRTB_MouseUp);
 			_MyStepRTB.SelectionChanged -= new EventHandler(_MyStepRTB_SelectionChanged);
-			_MyEditItem.Leave += new EventHandler(_MyEditItem_Leave);
+			_MyEditItem.Leave -= new EventHandler(_MyEditItem_Leave);
+			_MyEditItem.Enter += new EventHandler(_MyEditItem_Enter);
 			//_MyStepRTB.Leave -= new EventHandler(_MyStepRTB_Leave);
 			_MyStepRTB.LinkChanged -= new StepRTBLinkEvent(_MyStepRTB_LinkChanged);
-			if (MyFlexGrid != null) MyFlexGrid.CopyOptionChanged -= new VlnFlexGridEvent(MyFlexGrid_CopyOptionChanged);
+			if (MyFlexGrid != null)
+			{
+				MyFlexGrid.CopyOptionChanged -= new VlnFlexGridEvent(MyFlexGrid_CopyOptionChanged);
+				MyFlexGrid.SelChange -= new EventHandler(MyFlexGrid_SelChange);
+			}
+		}
+
+		void _MyEditItem_Enter(object sender, EventArgs e)
+		{
+			// The following two lines were replaced by the third line so that the Ribbon KeyTips will work properly.
+			// ex. Positon on a substep, press <shift><F6> <N> <S> <S>, to list the substep types
+			//_MyStepRTB.KeyUp -=new KeyEventHandler(_MyStepRTB_KeyUp);
+			//_MyStepRTB.MouseUp -= new MouseEventHandler(_MyStepRTB_MouseUp);
+			_MyStepRTB.SelectionChanged += new EventHandler(_MyStepRTB_SelectionChanged);
+			_MyEditItem.Leave += new EventHandler(_MyEditItem_Leave);
+			_MyEditItem.Enter -= new EventHandler(_MyEditItem_Enter);
+			//_MyStepRTB.Leave -= new EventHandler(_MyStepRTB_Leave);
+			_MyStepRTB.LinkChanged += new StepRTBLinkEvent(_MyStepRTB_LinkChanged);
+			if (MyFlexGrid != null)
+			{
+				MyFlexGrid.CopyOptionChanged += new VlnFlexGridEvent(MyFlexGrid_CopyOptionChanged);
+				MyFlexGrid.SelChange += new EventHandler(MyFlexGrid_SelChange);
+				Console.WriteLine("Turn on SelChange");
+			}
 		}

 		void MyFlexGrid_CopyOptionChanged(object sender, EventArgs args)
@ -1716,7 +1753,13 @@ namespace Volian.Controls.Library
 			btnTblDgnAlignText.Enabled = enable;
 			btnTblDgnCopy.Enabled = enable;
 			btnTblDgnRemove.Enabled = enable;
-			btnTblDgnGridStyle.Enabled = enable;
+			//btnTblDgnGridStyle.Enabled = enable;
+			//rbTblBorder.Enabled = enable;
+			rbnBorderlistBox.Enabled = enable;
+			rbnBorderSelectionPanel.Enabled = enable;
+			btnTblNoBorder.Enabled = enable;
+			btnTblOutline.Enabled = enable;
+			btnTblInside.Enabled = enable;
 			btnTblDgnInsertColumn.Enabled = enable;
 			btnTblDgnInsertRow.Enabled = enable;
 			btnTblDgnMergeCells.Enabled = enable;
@ -1832,6 +1875,38 @@ namespace Volian.Controls.Library
 		}
 		#endregion

+		private void rbnBorderlistBox_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			rbnBorderSelectionPanel.SelectedBorder = rbnBorderlistBox.SelectedLinePattern;
+		}
+
+		private void rbnBorderSelectionPanel_BordersChanged(object sender, EventArgs args)
+		{
+			C1.Win.C1FlexGrid.CellRange cr = MyFlexGrid.GetEvenSelection();
+			//foreach (C1.Win.C1FlexGrid.CellRange cr in MyFlexGrid.MySelection)
+			//{
+				MyFlexGrid.MyBorders.SetRange(cr.r1, cr.c1, cr.r2, cr.c2, rbnBorderSelectionPanel.TopBorder, rbnBorderSelectionPanel.InsideHorizontalBorder,
+				rbnBorderSelectionPanel.BottomBorder, rbnBorderSelectionPanel.LeftBorder, rbnBorderSelectionPanel.InsideVerticalBorder, rbnBorderSelectionPanel.RightBorder);
+			//}
+				MyEditItem.Invalidate();
+			MyFlexGrid.Invalidate();
+		}
+
+		private void btnTblNoBorder_Click(object sender, EventArgs e)
+		{
+			rbnBorderSelectionPanel.AllBorders = GridLinePattern.None;
+		}
+
+		private void btnTblOutline_Click(object sender, EventArgs e)
+		{
+			rbnBorderSelectionPanel.OutlineBorder = rbnBorderlistBox.SelectedLinePattern;
+		}
+
+		private void btnTblInside_Click(object sender, EventArgs e)
+		{
+			rbnBorderSelectionPanel.InsideBorders = rbnBorderlistBox.SelectedLinePattern;
+		}
+
 	}


--- a/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs
+++ b/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs
--- a/PROMS/Volian.Controls.Library/StepTabRibbon.resx
+++ b/PROMS/Volian.Controls.Library/StepTabRibbon.resx
@ -214,19 +214,6 @@ When selected, the entire table will turn gray. You can then click and drag the
        6/XCarWiyAkKgOrBuzUeb1ZLSL8uQqvVIjC7/BNw8BA8Hg/MZjMGaAdMJhOOSOvhkXG8yAhIrnCIL23C
        N7O7BeKAVKFQkMXzAnK5dUw+mEYwFEEskUIosoC5eBrPllncjbyCP7QCb7DFwX/lgDhoF2WSxNbeb6NM
        AO2iTJLY7LWNMgGQ6/hXtTzh5lP+u+8PbUr3KB0oMhcAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="btnTblDgnGridStyle.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK+wAA
-        CvsBy58dkAAAAWtJREFUOE9j/P//PwNFAGQADOfNvg9kQvhZ02/D2fF9l+DskMaTcDbYclwGpE2+CVcY
-        03kezg6oPYppAMhmEM6ece9/BtDm9Ck3/qdMvPo/EWhzbNe5/xGtp/+DbAZp9qk8+N+jdO9/l8LtYINQ
-        XJA1FeFskGaY60Kaj8PZHqW7cXsBZDNME7KzA2uPwMVdCndiGgBydgaSs0GaI9pBzj4OdPZhsLPdQM4u
-        2P7fLnfrf5vMjf8t09ZhegHF2UDNMNcgOxukGTngUcIAFGAwSZDNMLYTkrMt0tdiGhDfc+U/2Nng0EY4
-        G2QzyM8O2Vv/W2du+m+euu6/adKq/4bxK/4bRC/F9AJyaIP8DHMBsrNBmnF6IQjJ2cihDQswkEa9GIjN
-        MAxmIJy9H5xIQH52gIa2OTC0TZJWg52tF73sv07U4v9aEQvBGCMhoYR2NiK0jeKXw22FaURxAYyD7GyL
-        VERoIzsbrwHIfiOWDQC8F6MA2SYGaAAAAABJRU5ErkJggg==
 </value>
  </data>
  <data name="btnTblDgnCopy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -572,6 +559,39 @@ When selected, the entire table will turn gray. You can then click and drag the
        crkcMpkMUqkUuOMgzKM+JUCSJFQqFZTLZZRKJdjZCAqFAlYOoljaf8Pi7isYNgTG/QyP71oJ6B9h0De8
        AOuQHdbBefQOzFFd0lUQBCSTSSQSCfA8T6MA6H1pM1uPVJlhX+DYeVKkLcD05gM+f9Lg/De0ozryDvQM
        bBv3dNPmMT+dVyv0LRj9LEbPOwb8Af/j3yagcYeqAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="btnUpdROVal.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASdAAA
+        EnQB3mYfeAAAAKFJREFUOE/tk1kOwCAIRPH+h6a40I4UU1w+i+lmzCswQyIiZuIkz/3gTJPVoOV9a0lq
+        NwChyz9AIGZ6DKjQI8DSTriWemlL7iAsgRLlbxtWwhDQA+FesV2xntxA5VeJsYzqKYVOAT2HIixDw0At
+        ybW9lhwB1jl6ejSco3bmM8Mf6E/PsijNvJ0wAAsZuxPFqm1gcaAWigAHNg9ETw68KT68AJtdTt51xSfJ
+        AAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="btnROEdit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASdAAA
+        EnQB3mYfeAAAA8xJREFUSEuVlktIVGEYho93Jy8p4XhbpWao6EALC/GalwRdlF0WQkYFWrgV3KhJixRC
+        UZTIES8lyZhXCGEgU2PEhNpkWta6RdBCaCGI4tv7HT02njlnZhr4mHPO///n+d/ve/9vJkBRFDDUT1hY
+        mGKxWBQAyt7enrKzs6MNKUFBQUp0dLSyv79//Ey7CA4OVra3tz2e6x8ICBEREWhpacH09DTGxsZQW1uL
+        kJAQdSwzMxNNTU1YXFzE7Ows5ubmTsTCwgIyMjJQUlKC8PBwdY1BKEhISEBfXx/sdjsmJiaQnZ2Nzs5O
+        ZGVloby8HEtLS5ifn8fMzIwKknA4HBgeHsbo6Kgak5OTcDqd6OrqMgcJPTQ0VJ2QkpKCjo4OtLa2orS0
+        FEwnmBqPxRUVFXC5XGoGBDQyMqKCZTNDQ0OesMTERJbk30dg/f39xxN3d3dPjGs3olxLj6gZHx8/hIm6
+        168xyAydSJ/VavUANTc3G77c7GFOTg66u7sxOTWFl1TV19uLleJiLEsmIiMPgXpQe3v7f0G0yTU1NXjc
+        1gb7q1dw0hR8O34w9fmpqcYgI4rNZlPrJVFUVIS6ujqPabQ9bjx4gGc0kEDWLl7Ep8pKXIqK8g2qrq5G
+        YGCgmYtUl7p//jBlaYT03r+vpm6loACOhgZYJH361GkL6+vrTQHuRX4+MHC4hE4VJRIyvsFjsUzYVlkZ
+        YqVWetDBwQEE0kJ75+bm+gUb7Ok5hmigD3fv4n1hIb7wGMTIwTdSJDuapX3Pa4U0PuknNqGpkW8HI//C
+        BXy6fNkcZI2PRxvV2F+8QGJ6ul+KZGN1R2nTgAFsRetUY6pIFr2hRb8R8tAPJVq9inWgUBrgM+u0wRoZ
+        pk4WOtlQ3zK/SEtDpJ+wMiMQU/fx1i3EWCyeNRLQJieIY9arqqB4sbe7+/SgMP4afON7GvLyoBi5ThZv
+        HYEWeMK3/FRk0ylS2EN/8hze0dYb9bqhxkZ8YAdYZqwR5rp2DTevXEGQCTRQB1nj/TnGI/f5RqBCto3O
+        27exypYjMBdjVfrX2bO4evo0bDExyOSO83ktGajWq+F9o35TelDw0aICdnWBrbNfvRV1rNk7OkgUfmVq
+        vzMGCbuqg4i9TxkpN1Ikk38zbDxTZ2Jj8ZsvFGN8YfqkwL1snhaOX2f80oE6zGpqBhIY/4bApS0U90kE
+        BMDKliLjezrIU2/G8QZybyu+rp/4cqcRSFT4erH7uGm63OHJyckeP+XhnCD+r/AC3ORYFeOeLyX/xhUk
+        JSUhLi4OAtX/H7NyokScWySYOcsL9C9S2i5ryMsXiQAAAABJRU5ErkJggg==
 </value>
  </data>
  <data name="btnInsTrans.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -1006,39 +1026,6 @@ When selected, the entire table will turn gray. You can then click and drag the
        I3edsEzsOmX5nc4RsInOX1rsWnVP5GZtz9s63rkAO0/AZjp5aLFr7nGXey42jl2N/I7ZwgXoFEADraNL
        t5manxb3NsfPT654FtB6uN052FQByZ0h4AvnjYqLjrfhzvh5392TtdVU7TwBW5w3qv+zlGQa6R1dg8Lr
        zUpiM5TEFihJVg02etppjxmOVpBq7E4Auh3AX3OVQCefHviOAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="btnUpdROVal.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASdAAA
-        EnQB3mYfeAAAAKFJREFUOE/tk1kOwCAIRPH+h6a40I4UU1w+i+lmzCswQyIiZuIkz/3gTJPVoOV9a0lq
-        NwChyz9AIGZ6DKjQI8DSTriWemlL7iAsgRLlbxtWwhDQA+FesV2xntxA5VeJsYzqKYVOAT2HIixDw0At
-        ybW9lhwB1jl6ejSco3bmM8Mf6E/PsijNvJ0wAAsZuxPFqm1gcaAWigAHNg9ETw68KT68AJtdTt51xSfJ
-        AAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="btnROEdit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASdAAA
-        EnQB3mYfeAAAA8xJREFUSEuVlktIVGEYho93Jy8p4XhbpWao6EALC/GalwRdlF0WQkYFWrgV3KhJixRC
-        UZTIES8lyZhXCGEgU2PEhNpkWta6RdBCaCGI4tv7HT02njlnZhr4mHPO///n+d/ve/9vJkBRFDDUT1hY
-        mGKxWBQAyt7enrKzs6MNKUFBQUp0dLSyv79//Ey7CA4OVra3tz2e6x8ICBEREWhpacH09DTGxsZQW1uL
-        kJAQdSwzMxNNTU1YXFzE7Ows5ubmTsTCwgIyMjJQUlKC8PBwdY1BKEhISEBfXx/sdjsmJiaQnZ2Nzs5O
-        ZGVloby8HEtLS5ifn8fMzIwKknA4HBgeHsbo6Kgak5OTcDqd6OrqMgcJPTQ0VJ2QkpKCjo4OtLa2orS0
-        FEwnmBqPxRUVFXC5XGoGBDQyMqKCZTNDQ0OesMTERJbk30dg/f39xxN3d3dPjGs3olxLj6gZHx8/hIm6
-        168xyAydSJ/VavUANTc3G77c7GFOTg66u7sxOTWFl1TV19uLleJiLEsmIiMPgXpQe3v7f0G0yTU1NXjc
-        1gb7q1dw0hR8O34w9fmpqcYgI4rNZlPrJVFUVIS6ujqPabQ9bjx4gGc0kEDWLl7Ep8pKXIqK8g2qrq5G
-        YGCgmYtUl7p//jBlaYT03r+vpm6loACOhgZYJH361GkL6+vrTQHuRX4+MHC4hE4VJRIyvsFjsUzYVlkZ
-        YqVWetDBwQEE0kJ75+bm+gUb7Ok5hmigD3fv4n1hIb7wGMTIwTdSJDuapX3Pa4U0PuknNqGpkW8HI//C
-        BXy6fNkcZI2PRxvV2F+8QGJ6ul+KZGN1R2nTgAFsRetUY6pIFr2hRb8R8tAPJVq9inWgUBrgM+u0wRoZ
-        pk4WOtlQ3zK/SEtDpJ+wMiMQU/fx1i3EWCyeNRLQJieIY9arqqB4sbe7+/SgMP4afON7GvLyoBi5ThZv
-        HYEWeMK3/FRk0ylS2EN/8hze0dYb9bqhxkZ8YAdYZqwR5rp2DTevXEGQCTRQB1nj/TnGI/f5RqBCto3O
-        27exypYjMBdjVfrX2bO4evo0bDExyOSO83ktGajWq+F9o35TelDw0aICdnWBrbNfvRV1rNk7OkgUfmVq
-        vzMGCbuqg4i9TxkpN1Ikk38zbDxTZ2Jj8ZsvFGN8YfqkwL1snhaOX2f80oE6zGpqBhIY/4bApS0U90kE
-        BMDKliLjezrIU2/G8QZybyu+rp/4cqcRSFT4erH7uGm63OHJyckeP+XhnCD+r/AC3ORYFeOeLyX/xhUk
-        JSUhLi4OAtX/H7NyokScWySYOcsL9C9S2i5ryMsXiQAAAABJRU5ErkJggg==
 </value>
  </data>
  <data name="btnCMCut.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
--- a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs
+++ b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs