diff --git a/PROMS/Volian.Controls.Library/Properties/Resources.Designer.cs b/PROMS/Volian.Controls.Library/Properties/Resources.Designer.cs
index 2f1c6130..7246785b 100644
--- a/PROMS/Volian.Controls.Library/Properties/Resources.Designer.cs
+++ b/PROMS/Volian.Controls.Library/Properties/Resources.Designer.cs
@@ -179,6 +179,13 @@ namespace Volian.Controls.Library.Properties {
}
}
+ internal static System.Drawing.Bitmap Erase {
+ get {
+ object obj = ResourceManager.GetObject("Erase", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
internal static System.Drawing.Bitmap Exit_Image {
get {
object obj = ResourceManager.GetObject("Exit_Image", resourceCulture);
diff --git a/PROMS/Volian.Controls.Library/Properties/Resources.resx b/PROMS/Volian.Controls.Library/Properties/Resources.resx
index ad7e6161..86c17a45 100644
--- a/PROMS/Volian.Controls.Library/Properties/Resources.resx
+++ b/PROMS/Volian.Controls.Library/Properties/Resources.resx
@@ -1747,6 +1747,20 @@
G2QzyM8O2Vv/W2du+m+euu6/adKq/4bxK/4bRC/F9AJyaIP8DHMBsrNBmnF6IQjJ2cihDQswkEa9GIjN
MAxmIJy9H5xIQH52gIa2OTC0TZJWg52tF73sv07U4v9aEQvBGCMhoYR2NiK0jeKXw22FaURxAYyD7GyL
VERoIzsbrwHIfiOWDQC8F6MA2SYGaAAAAABJRU5ErkJggg==
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASdAAA
+ EnQB3mYfeAAAAYdJREFUOE9j/P//PwNVAchAamKqGgb2LTVdRxsD79446NrRmPp/WmfW/zm9uf/PHd70
+ //HDx0Eg2+49fez9+tVrnw8fPggT6xOGf9/fMW5cOaNuz9qO//fP9vyf3Ozyd9vixnxiDUBXBw/D1pLQ
+ ulfn+/9vnmr7vypa6v/22Y3/f719pUKqwSiRMrvKu+7WmpD/+yYa/O+J5f8/r7vi/YE9e4j2LtZIWdPu
+ vv7u9sT/x2aZ/+/MkP0/tzVl97a10xiJdSlGsskOVmfrLXdtPbQ45v+1te7/tzRo/O8s911X3eAvSoyh
+ ONNhX2Vs9fZ58f/vrwv6v77F4H9Vicnn9GhnR0KG4k3YBYk6EusmeL27tjLj/7mlef8XxDj/jzJSiMNn
+ KMGckhevr3l8w5L/37Ys+n8/2On/BAPJFxQZCNJcX9Nfd3H+kv//u5r/Hwi0+USxgSAD5k3urT5VW/54
+ eqjHPKoYSCgyYPIEwxCXQcBCGSgFKUtBbBifKAORNaAbQJaBxHoXpA4AG4E67su8bvIAAAAASUVORK5C
+ YII=
\ No newline at end of file
diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs
index f3634693..e42a8de4 100644
--- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs
+++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs
@@ -243,7 +243,7 @@ namespace Volian.Controls.Library
}
else
{
- // Maybe someday for Grid Tables
+ //// Maybe someday for Grid Tables
//bool addchild = true;
//if (InsertingTable(contenttype))
//{
@@ -256,20 +256,20 @@ namespace Volian.Controls.Library
}
}
// Future Table Grid?
- //private bool InsertingTable(int contenttype)
- //{
- // bool rtnval = false;
- // switch (contenttype)
- // {
- // case 20008: // Centered table
- // case 20010: // AER table
- // case 20033: // AER table without boarder
- // case 20034: // Centered table without boarder
- // rtnval = true;
- // break;
- // }
- // return rtnval;
- //}
+ private bool InsertingTable(int contenttype)
+ {
+ bool rtnval = false;
+ switch (contenttype)
+ {
+ case 20008: // Centered table
+ case 20010: // AER table
+ case 20033: // AER table without boarder
+ case 20034: // Centered table without boarder
+ rtnval = true;
+ break;
+ }
+ return rtnval;
+ }
private void btnInsBefore_Click(object sender, EventArgs e)
{
_MyRTBItem.AddSiblingBefore();
@@ -504,7 +504,7 @@ namespace Volian.Controls.Library
btnInsTrans.Enabled = btnCMTransition.Enabled = btnInsRO.Enabled = btnCMRO.Enabled = true;
- //_RibbonControl.Refresh(); // jsj- added this because Table Design ribbon tab grouping was not going away when not on a table step type
+ _RibbonControl.Refresh(); // jsj- added this because Table Design ribbon tab grouping was not going away when not on a table step type
}
///
/// set up a gallery of step types whose parent are defined by input StepData. Can be below
@@ -1389,6 +1389,12 @@ namespace Volian.Controls.Library
VlnFlexGrid grd = new VlnFlexGrid(); // = rbtDefaultTable.Checked ? vlnFlexGrid2 : vlnFlexGrid3;
grd.ClipBoardPasteIntoSelection();
}
+ private void btnTblDgnClear_Click(object sender, EventArgs e)
+ {
+ VlnFlexGrid grd = new VlnFlexGrid(); // = rbtDefaultTable.Checked ? vlnFlexGrid2 : vlnFlexGrid3;
+ grd.ClearSelectedCellText();
+ }
+
#endregion
#region Table Grid Delete
private void btnTblDgnDeleteRow_Click(object sender, EventArgs e)
@@ -1580,6 +1586,7 @@ namespace Volian.Controls.Library
}
#endregion
+
}
public enum E_FieldToEdit { StepText, Text, Number };
public class StepTabRibbonEventArgs : EventArgs
diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs
index c754b574..f2505a4d 100644
Binary files a/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs and b/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs differ