PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -87,6 +87,7 @@ namespace VEPROMS
 			SaveMRU();
 			//Settings.Default.Save();
 		}
+
 		private void ShutDownRibbons()
 		{
 			rtabEdit.Visible = false;
@@ -95,6 +96,7 @@ namespace VEPROMS
 			rtabTools.Visible = false;
 			ribbonControl1.Height = 50;
 		}
+
 		private void frmVEPROMS_Load(object sender, EventArgs e)
 		{
 			// get the saved location and size of the VE-PROMS appication for this user
@@ -106,18 +108,8 @@ namespace VEPROMS
 			_MyBookMarks = MostRecentItemList.GetMRILst((System.Collections.Specialized.StringCollection)(Properties.Settings.Default["BookMarks"]));
 			SetupMRU();
 			SetupBookMarks();
-			SetupAnnotations();
-		}
-
-		private void SetupAnnotations()
-		{
-			cbAnnoType.DisplayMember = "Name";
-			cbAnnoType.DataSource = AnnotationTypeInfoList.Get();
-			lbResults.MouseMove += new MouseEventHandler(lbResults_MouseMove);
-
-			cbGridAnnoType.DisplayMember = "Name";
-			cbGridAnnoType.ValueMember = "TypeId";
-			cbGridAnnoType.DataSource = AnnotationTypeInfoList.Get().Clone();
+			CtrlAnnotationSearch.SetupAnnotationSearch(ctrlAnnotationDetails, tc);
+			ctrlAnnotationDetails.SetupAnnotations(CtrlAnnotationSearch);
 		}
 
 		#region MRU
@@ -193,79 +185,65 @@ namespace VEPROMS
 		/// <param name="node">VETreeNode</param>
 		void SetupNodes(VETreeNode node)
 		{
-			//if (!node.Equals(_LastTreeNode))
-			//{
-				_LastTreeNode = node;
-				_LastFolderInfo = null;
-				_LastFolder = null;
-				_LastDocVersion = null;
-				_LastProcedure = null;
-				_LastSection = null;
-				_LastStep = null;
-				epAnnotations.Expanded = false;
-				rtxbComment.Text = "";
-				epAnnotations.TitleStyle.BackColor1.Color = _CommentTitleBckColor;
-				if (_MyMRIList.Add(node.VEObject) != null)
-					SetupMRU();
-				if (node.VEObject.GetType() == typeof(FolderInfo))
-				{
-					_LastFolderInfo = (FolderInfo)(_LastTreeNode.VEObject);
-					_LastFolder = _LastFolderInfo.Get();
-				}
-				else if (node.VEObject.GetType() == typeof(DocVersionInfo))
-				{
-					_LastDocVersionInfo = (DocVersionInfo)(node.VEObject);
-					_LastDocVersion = _LastDocVersionInfo.Get();
-				}
-				else if (node.VEObject.GetType() == typeof(ProcedureInfo))
-				{
-					_LastProcedureInfo = (ProcedureInfo)(_LastTreeNode.VEObject);
-					_LastProcedure = _LastProcedureInfo.Get();
+			_LastTreeNode = node;
+			_LastFolderInfo = null;
+			_LastFolder = null;
+			_LastDocVersion = null;
+			_LastProcedure = null;
+			_LastSection = null;
+			_LastStep = null;
+			epAnnotations.Expanded = false;
+			epAnnotations.TitleStyle.BackColor1.Color = _CommentTitleBckColor;
+			if (_MyMRIList.Add(node.VEObject) != null)
+				SetupMRU();
+			if (node.VEObject.GetType() == typeof(FolderInfo))
+			{
+				_LastFolderInfo = (FolderInfo)(_LastTreeNode.VEObject);
+				_LastFolder = _LastFolderInfo.Get();
+			}
+			else if (node.VEObject.GetType() == typeof(DocVersionInfo))
+			{
+				_LastDocVersionInfo = (DocVersionInfo)(node.VEObject);
+				_LastDocVersion = _LastDocVersionInfo.Get();
+			}
+			else if (node.VEObject.GetType() == typeof(ProcedureInfo))
+			{
+				_LastProcedureInfo = (ProcedureInfo)(_LastTreeNode.VEObject);
+				_LastProcedure = _LastProcedureInfo.Get();
 
-					tc.OpenItem((ItemInfo)_LastProcedureInfo);
-					// Display any annotations
-					//itemAnnotationsBindingSource.DataSource = _LastProcedureInfo.ItemAnnotations;
-				}
-				else if (node.VEObject.GetType() == typeof(SectionInfo))
-				{
-					_LastSectionInfo = (SectionInfo)(_LastTreeNode.VEObject);
-					_LastSection = _LastSectionInfo.Get();
-					tc.OpenItem((ItemInfo)_LastSectionInfo);
-					// Display any annotations
-					//itemAnnotationsBindingSource.DataSource = _LastSectionInfo.ItemAnnotations;
-				}
-				else if (node.VEObject.GetType() == typeof(StepInfo))
-				{
-					_LastStepInfo = (StepInfo)(_LastTreeNode.VEObject);
-					_LastStep = _LastStepInfo.Get();
-					tc.OpenItem((ItemInfo)_LastStepInfo);
-					// Display any annotations
-					//itemAnnotationsBindingSource.DataSource = _LastStepInfo.ItemAnnotations;
-					#region Sample Display Table Code
-					// display an exiting table in that rtf grid thing
-					//if ((_LastStepInfo.MyContent.Type == 20007) || (_LastStepInfo.MyContent.Type == 20009))
-					//{
-					//   //MessageBox.Show("Source Grid");
-					//   //frmTable newtable1 = new frmTable(_LastStepInfo.MyContent.Text);
-					//   //newtable1.ShowDialog();
-					//   //MessageBox.Show("IGrid");
-					//   //frmIGrid newtable2 = new frmIGrid(_LastStepInfo.MyContent.Text);
-					//   //newtable2.ShowDialog();
-					//   //MessageBox.Show("GridView"); //standard Visual Studio Control
-					//   //frmGridView newtable3 = new frmGridView(_LastStepInfo.MyContent.Text);
-					//   //newtable3.ShowDialog();
-					//   MessageBox.Show("FlexCell");
-					//   frmFlexCell newtable4 = new frmFlexCell(_LastStepInfo.MyContent.Text);
-					//   newtable4.ShowDialog();
-					//}
-					#endregion
-				}
-				//break;
-				//default:
-				//break;
+				tc.OpenItem((ItemInfo)_LastProcedureInfo);
+			}
+			else if (node.VEObject.GetType() == typeof(SectionInfo))
+			{
+				_LastSectionInfo = (SectionInfo)(_LastTreeNode.VEObject);
+				_LastSection = _LastSectionInfo.Get();
+				tc.OpenItem((ItemInfo)_LastSectionInfo);
+			}
+			else if (node.VEObject.GetType() == typeof(StepInfo))
+			{
+				_LastStepInfo = (StepInfo)(_LastTreeNode.VEObject);
+				_LastStep = _LastStepInfo.Get();
+				tc.OpenItem((ItemInfo)_LastStepInfo);
+				#region Sample Display Table Code
+				// display an exiting table in that rtf grid thing
+				//if ((_LastStepInfo.MyContent.Type == 20007) || (_LastStepInfo.MyContent.Type == 20009))
+				//{
+				//   //MessageBox.Show("Source Grid");
+				//   //frmTable newtable1 = new frmTable(_LastStepInfo.MyContent.Text);
+				//   //newtable1.ShowDialog();
+				//   //MessageBox.Show("IGrid");
+				//   //frmIGrid newtable2 = new frmIGrid(_LastStepInfo.MyContent.Text);
+				//   //newtable2.ShowDialog();
+				//   //MessageBox.Show("GridView"); //standard Visual Studio Control
+				//   //frmGridView newtable3 = new frmGridView(_LastStepInfo.MyContent.Text);
+				//   //newtable3.ShowDialog();
+				//   MessageBox.Show("FlexCell");
+				//   frmFlexCell newtable4 = new frmFlexCell(_LastStepInfo.MyContent.Text);
+				//   newtable4.ShowDialog();
 				//}
-				SetCaption((VETreeNode)node);
-			//}
+				#endregion
+			}
+			SetCaption((VETreeNode)node);
 		}
 
 		private void SetCaption(VETreeNode tn)
@@ -375,10 +353,12 @@ namespace VEPROMS
 				}
 			}
 		}
+
 		private void SaveIfChanged2(Item tmp)
 		{
 			SaveIfChanged<Item>(tmp);
 		}
+
 		/// <summary>
 		/// When the treeview is clicked - a timer is set
 		/// This is done because the focus is returned to the treeview after the click event
@@ -389,6 +369,7 @@ namespace VEPROMS
 		{
 			tmrTreeView.Enabled = true;
 		}
+
 		/// <summary>
 		/// This event is fired from the timer after the treeview click event completes
 		/// </summary>
@@ -401,6 +382,7 @@ namespace VEPROMS
 			VETreeNode tn = tv.SelectedNode as VETreeNode;
 			if (tn != null) SetupNodes(tn);
 		}
+
 		private void tv_KeyPress(object sender, KeyPressEventArgs e)
 		{
 			if (e.KeyChar == '\r')
@@ -410,6 +392,7 @@ namespace VEPROMS
 				e.Handled = true;
 			}
 		}
+
 		private void tv_BeforeExpand(object sender, TreeViewCancelEventArgs e)
 		{
 			VETreeNode tn = ((VETreeNode)e.Node);
@@ -418,12 +401,13 @@ namespace VEPROMS
 			tn.LoadingChildernValue += new VETreeNodeEvent(tn_LoadingChildernValue);
 			tn.LoadingChildrenSQL += new VETreeNodeEvent(tn_LoadingChildrenSQL);
 			tn.LoadChildren(true);
-
 		}
+
 		void tv_NodeProperties(object sender, Volian.Controls.Library.vlnTreeEventArgs args)
 		{
 			DisplayProperties();
 		}
+
 		#endregion
 		#region Property Page and Grid
 
@@ -1156,181 +1140,67 @@ namespace VEPROMS
 			displayTransition.CurTrans = null;
 		}
 		#endregion
-		private AnnotationInfoList _Annotations;
 		private ItemInfo _CurrentItem = null;
 
 		private void tc_ItemSelectedChanged(object sender, ItemSelectedChangedEventArgs args)
 		{
-			//CurrentAnnotation = null;
 			if (args == null)
 			{
 				_CurrentItem = null;
-				CurrentAnnotation = null;
-				_Annotations = null;
-				itemAnnotationsBindingSource.DataSource = _Annotations;
-				AnnotationPanelView();
+				ctrlAnnotationDetails.CurrentAnnotation = null;
+				ctrlAnnotationDetails.Annotations = null;
 				infotabRO.Visible = infotabTransition.Visible = infotabTags.Visible = false;
-				return;
-			}
-			if (_CurrentItem != args.MyItemInfo)
-				_CurrentItem = args.MyItemInfo; //tc.SelectedDisplayTabItem.MyItemInfo;
-			//vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem);
-			if (args.MyStepItem == null)
-			{
-				infotabRO.Visible = infotabTransition.Visible = false;
-				infotabTags.Visible = true;
-				//vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem);
 			}
 			else
 			{
+				if (_CurrentItem != args.MyItemInfo)
+					_CurrentItem = args.MyItemInfo;
 				//vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem);
-				infotabRO.Visible = infotabTransition.Visible = infotabTags.Visible = true;
-				displayTransition.MyRTB = args.MyStepItem.MyStepRTB;
-				displayRO.MyRTB = args.MyStepItem.MyStepRTB;
-			}
-			UpdateAnnotationGrid();
-		}
-		private void UpdateAnnotationGrid()
-		{
-			//ShowItemAnnotations("UpdateAnnotationGrid before RefreshItemAnnotations");
-			//_CurrentItem.RefreshItemAnnotations();
-			//ShowItemAnnotations("UpdateAnnotationGrid");
-			_LoadingGrid = true;
-			_Annotations = _CurrentItem.ItemAnnotations;
-			itemAnnotationsBindingSource.DataSource = _Annotations;
-			AnnotationPanelView();
-			if ((CurrentAnnotation == null || (_CurrentItem.ItemID != CurrentAnnotation.ItemID)))
-			{
-				if (_Annotations != null && _Annotations.Count > 0)
-					CurrentAnnotation = _Annotations[0];
-				else
-					CurrentAnnotation = null;
-				//InitializeAnnotation();
-			}
-			FindCurrentAnnotation();
-			_LoadingGrid = false;
-		}
-		private void FindCurrentAnnotation()
-		{
-			int row = 0;
-			if (CurrentAnnotation != null)
-			{
-				if (_Annotations != null)
+				if (args.MyStepItem == null)
 				{
-					foreach (AnnotationInfo ai in _Annotations)
-					{
-						if (ai.AnnotationID == CurrentAnnotation.AnnotationID)
-						{
-							row = _Annotations.IndexOf(ai) + 1;
-							break;
-						}
-					}
+					infotabRO.Visible = infotabTransition.Visible = false;
+					infotabTags.Visible = true;
+					//vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem);
+				}
+				else
+				{
+					//vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem);
+					infotabRO.Visible = infotabTransition.Visible = infotabTags.Visible = true;
+					displayTransition.MyRTB = args.MyStepItem.MyStepRTB;
+					displayRO.MyRTB = args.MyStepItem.MyStepRTB;
 				}
 			}
-			//Console.WriteLine("Row = {0}", row);
-			c1AnnotationGrid.Select(row, 0, true);
+			ctrlAnnotationDetails.UpdateAnnotationGrid(_CurrentItem);
+			AnnotationPanelView();
 		}
-		//private void ShowItemAnnotations(string title)
-		//{
-		//  Console.WriteLine("{0} CurrentItem {1} {2} ItemAnnotationsCount {3}", title, _CurrentItem.ItemID, _CurrentItem.MyItemInfoUnique, _CurrentItem.ItemAnnotationCount);
-		//}
-		//private void itemAnnotationsBindingSource_DataSourceChanged(object sender, EventArgs e)
-		//{
-		//_LoadingGrid = true;
-		//Console.WriteLine("itemAnnotationsBindingSource_DataSourceChanged 1");
-		//AnnotationInfoList myAnnotations = itemAnnotationsBindingSource.DataSource as AnnotationInfoList;
-		//Console.WriteLine("itemAnnotationsBindingSource_DataSourceChanged 2");
-		//AnnotationPannelView(_Annotations);
-		//Console.WriteLine("itemAnnotationsBindingSource_DataSourceChanged 3");
-		//_LoadingGrid = false;
-		//}
+
+		#region Annotations
+		/// <summary>
+		/// Display or hide the Annotation Details panel
+		/// </summary>
 		private void AnnotationPanelView()
 		{
-			if (_Annotations != null && _Annotations.Count != 0)
+			if (ctrlAnnotationDetails.Annotations != null && ctrlAnnotationDetails.Annotations.Count != 0)
 			{
 				if (Settings.Default.AutoPopUpAnnotations) //cbAnnotationPopup.Checked
 					epAnnotations.Expanded = true;
 				else
 					epAnnotations.TitleStyle.BackColor1.Color = Color.Yellow;
-				rtxbComment.SelectionStart = rtxbComment.TextLength;
 			}
 			else
 			{
 				if (!btnAnnoDetailsPushPin.Checked)
 					epAnnotations.Expanded = false;
 				epAnnotations.TitleStyle.BackColor1.Color = _CommentTitleBckColor;
-				rtxbComment.Text = null;
+				ctrlAnnotationDetails.AnnotationText = null;
 			}
 		}
-
-		private AnnotationInfo _CurrentAnnotation = null;
-		private AnnotationInfo CurrentAnnotation
-		{
-			get { return _CurrentAnnotation; }
-			set
-			{
-				if (_CurrentAnnotation == null && value == null) return; // No Change
-				if (_CurrentAnnotation != null && value != null)
-					if (_CurrentAnnotation.AnnotationID == value.AnnotationID) return; // No Change
-				//vlnStackTrace.ShowStack("CurrentAnnotation = '{0}' Old = '{1}'", value, _CurrentAnnotation);
-				if (_CurrentAnnotation != null || _AddingAnnotation)
-				{
-					//if (_CurrentAnnotation.TypeID != (int)cbGridAnnoType.SelectedValue) SaveAnnotation();
-					//else if (_CurrentAnnotation.RtfText != string.Empty && _CurrentAnnotation.RtfText != rtxbComment.Rtf)
-					//   SaveAnnotation();
-					//else if (_CurrentAnnotation.RtfText == string.Empty && _CurrentAnnotation.SearchText != rtxbComment.Text)
-					if (AnnotationDirty)
-						SaveAnnotation();
-				}
-				_CurrentAnnotation = value;
-				InitializeAnnotation();
-			}
-		}
-
-		private void SaveAnnotation()
-		{
-			if (cbGridAnnoType.SelectedIndex == -1) return;
-			if (rtxbComment.Text == string.Empty) return;
-			using (AnnotationType annotationType = AnnotationType.Get((int)cbGridAnnoType.SelectedValue))
-			{
-				if (_AddingAnnotation)
-				{
-					_AddingAnnotation = false;
-					using (Item myItem = _CurrentItem.Get())
-					{
-						using (Annotation annotation = Annotation.MakeAnnotation(myItem, annotationType, rtxbComment.Rtf, rtxbComment.Text, ""))
-						{
-							CurrentAnnotation = AnnotationInfo.Get(annotation.AnnotationID);
-							annotation.DTS = DateTime.Now;
-							annotation.Save();
-						}
-					}
-				}
-				else
-				{
-					using (Annotation annotation = CurrentAnnotation.Get())
-					{
-						annotation.RtfText = rtxbComment.Rtf;
-						annotation.SearchText = rtxbComment.Text;
-						annotation.MyAnnotationType = annotationType;
-						annotation.DTS = DateTime.Now;
-						//Console.WriteLine("Before Annotation Type = {0} ({1})", CurrentAnnotation.MyAnnotationType, CurrentAnnotation.MyAnnotationType.AnnotationTypeAnnotations.Count);
-						//Console.WriteLine("Before Annotation Type = {0}", CurrentAnnotation.MyAnnotationType);
-						annotation.Save();
-						//Console.WriteLine("After Annotation Type = {0} ({1})", CurrentAnnotation.MyAnnotationType, CurrentAnnotation.MyAnnotationType.AnnotationTypeAnnotations.Count);
-					}
-				}
-			}
-			AnnotationDirty = false;
-			UpdateAnnotationGrid();
-			//UpdateAnnotationSearchResults();
-		}
-
+		#endregion
 
 		private void btnSave_Click(object sender, EventArgs e)
 		{
-
 		}
+
 		private void tc_LinkActiveChanged(object sender, StepPanelLinkEventArgs args)
 		{
 			// determine if any infotabs are visisble, and if it is the Transition,
@@ -1340,12 +1210,14 @@ namespace VEPROMS
 				displayTransition.CurTrans = null;
 			}
 		}
+
 		private void tc_LinkInsertTran(object sender, StepPanelLinkEventArgs args)
 		{
 			infoPanel.Expanded = true;
 			infoTabs.SelectedTab = infotabTransition;
 			displayTransition.CurTrans = null;
 		}
+
 		private void tc_LinkInsertRO(object sender, StepPanelLinkEventArgs args)
 		{
 			infoPanel.Expanded = true;
@@ -1357,6 +1229,7 @@ namespace VEPROMS
 			displayRO.MyRTB = dtp.MyStepPanel.SelectedStepItem.MyStepRTB;
 			displayRO.CurROLink = null;
 		}
+
 		private void tc_LinkModifyTran(object sender, StepPanelLinkEventArgs args)
 		{
 			infoPanel.Expanded = true;
@@ -1379,211 +1252,10 @@ namespace VEPROMS
 			displayRO.CurROLink = args.MyLinkText.RoUsageid;		// this is wrong - use for now.
 		}
 
-		private bool _LoadingList = false;
-		private void cbAnnoType_SelectedValueChanged(object sender, EventArgs e)
-		{
-			UpdateAnnotationSearchResults();
-		}
-
-		private void UpdateAnnotationSearchResults()
-		{
-			AnnotationTypeInfo ati = cbAnnoType.SelectedValue as AnnotationTypeInfo;
-			_LoadingList = true;
-			lbResults.DisplayMember = "SearchText";
-			lbResults.DataSource = ati.AnnotationTypeAnnotations;
-			lbResults.SelectedIndex = -1;
-			LastResultsMouseOverIndex = -1;
-			_LoadingList = false;
-		}
-
-		private int LastResultsMouseOverIndex = -1;
-		void lbResults_MouseMove(object sender, MouseEventArgs e)
-		{
-			int ResultsMouseOverIndex = lbResults.IndexFromPoint(e.Location);
-			if (ResultsMouseOverIndex != -1 && ResultsMouseOverIndex != LastResultsMouseOverIndex)
-			{
-				AnnotationInfo ai = lbResults.Items[ResultsMouseOverIndex] as AnnotationInfo;
-
-				toolTip1.SetToolTip(lbResults, ai.MyItem.Path);
-				LastResultsMouseOverIndex = ResultsMouseOverIndex;
-			}
-		}
-		private void lbResults_SelectedValueChanged(object sender, EventArgs e)
-		{
-			if (!_LoadingList)
-			{
-				//AnnotationInfo ai = lbResults.SelectedValue as AnnotationInfo;
-				//if(ai != null)
-				//  tc.OpenItem(ai.MyItem);
-				CurrentAnnotation = lbResults.SelectedValue as AnnotationInfo;
-				if (CurrentAnnotation != null)
-				{
-					tc.OpenItem(CurrentAnnotation.MyItem);
-				}
-				FindCurrentAnnotation();
-			}
-		}
 		private void lbxBookMarks_Click(object sender, EventArgs e)
 		{
 			MostRecentItem itm = lbxBookMarks.SelectedValue as MostRecentItem;
 			tc.OpenItem(itm.MyItemInfo);
 		}
-		private void cbGridAnnoType_Validating(object sender, CancelEventArgs e)
-		{
-			//try
-			//{
-			//   //bool test1 = c1AnnotationGrid.IsCellSelected(c1AnnotationGrid.RowSel, c1AnnotationGrid.ColSel);
-			//   //bool test2 = c1AnnotationGrid.IsCellValid(c1AnnotationGrid.RowSel, c1AnnotationGrid.ColSel);
-			//   //AnnotationTypeInfo celldat = (AnnotationTypeInfo)c1AnnotationGrid.GetData(c1AnnotationGrid.RowSel, c1AnnotationGrid.ColSel);
-			//   AnnotationTypeInfo newcelldat = (AnnotationTypeInfo)cbGridAnnoType.SelectedItem;
-
-			//   AnnotationInfo ani = ((AnnotationInfoList)itemAnnotationsBindingSource.DataSource)[c1AnnotationGrid.RowSel - 1] as AnnotationInfo;
-			//   Annotation ano = ani.Get();
-			//   if (ano.TypeID != newcelldat.TypeID)
-			//   {
-			//      ano.Update(newcelldat.TypeID);
-			//      //btnCancelAnnoation.Enabled = true;
-			//      c1AnnotationGrid.Refresh();
-			//   }
-			//}
-			//catch (Exception ex)
-			//{
-			//   log.ErrorFormat("Error saving Annotation Type Change: {0}", ex.Message);
-			//}
-		}
-		private void epAnnotations_Layout(object sender, LayoutEventArgs e)
-		{
-			//cbGridAnnoType.Visible = false;
-		}
-		//private void btnSaveAnnoation_Click(object sender, EventArgs e)
-		//{
-		//   AnnotationInfoList ail = (AnnotationInfoList)itemAnnotationsBindingSource.DataSource;
-		//   foreach (AnnotationInfo ai in ail)
-		//   {
-		//      Annotation ano = ai.Get();
-		//      ano.CommitChanges();
-		//   }
-		//   btnCancelAnnoation.Enabled = false;
-		//}
-		private bool _AddingAnnotation = false;
-		private void btnAddAnnotation_Click(object sender, EventArgs e)
-		{
-			c1AnnotationGrid.Row = -1;
-			CurrentAnnotation = null;
-			_AddingAnnotation = true;
-			//InitializeAnnotation();
-		}
-		private bool _LoadingAnnotation = false;
-		private bool _LoadingGrid = false;
-		private void c1AnnotationGrid_EnterCell(object sender, EventArgs e)
-		{
-			if (!_LoadingGrid) // Only set the Current Annotation when not loading the grid
-			{
-				if ((_Annotations != null) && (c1AnnotationGrid.Row > 0))
-					CurrentAnnotation = _Annotations[c1AnnotationGrid.Row - 1];
-				else
-					CurrentAnnotation = null;
-			}
-			//InitializeAnnotation();
-		}
-		private void InitializeAnnotation()
-		{
-			//vlnCSLAStackTrace.ShowStack("InitializeAnnotation - CurrentAnnotation = {0}", CurrentAnnotation);
-			_LoadingAnnotation = true;
-			if (CurrentAnnotation == null)
-			{
-				cbGridAnnoType.SelectedIndex = -1;
-				rtxbComment.Text = "";
-			}
-			else
-			{
-				cbGridAnnoType.SelectedValue = CurrentAnnotation.TypeID;
-				if (CurrentAnnotation.RtfText != "")
-					rtxbComment.Rtf = CurrentAnnotation.RtfText;
-				else
-					rtxbComment.Text = CurrentAnnotation.SearchText;
-			}
-			_LoadingAnnotation = false;
-			AnnotationDirty = false;
-			if (!_LoadingGrid)
-			{
-				rtxbComment.SelectionStart = rtxbComment.TextLength; // Position the cursor at the end of the current text
-				rtxbComment.Focus(); // Set the focus to the comment text
-			}
-		}
-		private bool _AnnotationDirty = false;
-		private bool AnnotationDirty
-		{
-			get { return _AnnotationDirty; }
-			set
-			{
-				btnRemoveAnnotation.Enabled = btnAddAnnotation.Enabled = !value;
-				btnSaveAnnotation.Enabled = btnCancelAnnoation.Enabled = value;
-				_AddingAnnotation = value && (CurrentAnnotation == null);
-				_AnnotationDirty = value;
-			}
-		}
-
-		private void rtxbComment_TextChanged(object sender, EventArgs e)
-		{
-			if (!_LoadingAnnotation)
-			{
-				AnnotationDirty = true;
-			}
-		}
-
-		private void btnCancelAnnoation_Click(object sender, EventArgs e)
-		{
-			InitializeAnnotation();
-		}
-
-		private void cbGridAnnoType_SelectedValueChanged(object sender, EventArgs e)
-		{
-			if (!_LoadingAnnotation)
-			{
-				AnnotationDirty = true;
-			}
-
-		}
-
-		private void btnSaveAnnotation_Click(object sender, EventArgs e)
-		{
-			if (cbGridAnnoType.SelectedIndex == -1)
-			{
-				MessageBox.Show("You Must Select an Annotation Type", "Annotation Type Not Selected", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
-				cbGridAnnoType.Focus();
-				return;
-			}
-			if (rtxbComment.Text == string.Empty)
-			{
-				MessageBox.Show("You Must Enter Annotation Text", "Annotation Text Is Blank", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
-				rtxbComment.Focus();
-				return;
-			}
-			SaveAnnotation();
-		}
-
-		private void btnRemoveAnnotation_Click(object sender, EventArgs e)
-		{
-			using (Annotation annotation = CurrentAnnotation.Get())
-			{
-				//ShowItemAnnotations("btnRemoveAnnotation_Click Start");
-				//annotation.DTS = DateTime.Now;
-				//annotation.Save();
-				//ShowItemAnnotations("btnRemoveAnnotation_Click After Change Save");
-				annotation.Delete();
-				_LoadingList = true;
-				annotation.Save();
-				_LoadingList = false;
-				CurrentAnnotation = null;
-				//ShowItemAnnotations("btnRemoveAnnotation_Click After Delete Save");
-				//c1AnnotationGrid.Row = -1;
-				//ShowItemAnnotations("btnRemoveAnnotation_Click Before Update Grid");
-				UpdateAnnotationGrid();
-				//ShowItemAnnotations("After UpdateAnnotationGrid After Update Grid");
-				UpdateAnnotationSearchResults();
-			}
-		}
-
 	}
 }

PROMS/VEPROMS User Interface/frmVEPROMS.resx

@@ -168,8 +168,8 @@
   <data name="btnFindRplDlg.SuperTooltip" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAALQAAABfCAYAAABBTu1zAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAQPxJREFUeF7tfWd0XMeVpnbO7v7dM//mnDm7O95Z7+6ZHY+tLFkjyZIlihKVbMuSSOVo
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAQPxJREFUeF7tfWd0XMeVpnbO7v7dM//mnDm7O95Z7+6ZHY+tLFkjyZIlihKVbMuSSOVo
         WyIlihHMIEgQAEHkDBAgkTORiJwz0Mg5dCPnHAhmSd9+t1432ARBSk0CS1MGzrl4r9+reOur+25V3br1
         HxJT0vpsrA//l//4n/7zfX/3d39339rfGgfuNQ4AuO+77769b++uP8/dt/GdDxYef3Idnn3+NTxDenbd
         6/jNc6/i6d++QnoZTz2zAU89u0Hda8+M9Kz8XvJs6XsVhuEZX0vDLP516SzzfLmwa8+W5+HfOF9+w/r/
@@ -488,8 +488,8 @@
   <data name="buttonItem83.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAIdJREFUOE/tlOsKgDAIhRf0/q9sKiqmC4skCtpwTH98O17YAgCjdRGw01phnG2nuoeA
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAIdJREFUOE/tlOsKgDAIhRf0/q9sKiqmC4skCtpwTH98O17YAgCjdRGw01phnG2nuoeA
         A2uKGxcdpcUMc8oCgxWxaATlO23vayw0NQEZICoNoL5/TGMV0GBeUSiDKab4D5x2WeuoY5N87fCVGvoZ
         PALyRJxtiqmTefRzuVNeAm/+Pl/8HN6W8gYgJNCzhmmGgQAAAABJRU5ErkJggg==
 </value>
@@ -497,8 +497,8 @@
   <data name="buttonItem86.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAKdJREFUOE/NlIsOgCAIRW32/79M4oRAiUFzrZxblh4vzwMAytYHgTxLe0+MJgRqrWre
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAKdJREFUOE/NlIsOgCAIRW32/79M4oRAiUFzrZxblh4vzwMAytYHgTxLe0+MJgRqrWre
         MAQnBsL6fikIrX2rMA882+1yopqxRlgeKADKFQ3KsLTJpFD6djewq8OLaHhBId+wjwyFKSDd+gRU3yMK
         pfOtw6wuavJ3QIqsFfVMpcgEVrkn0ygMHKqWAM3VEwYOFarMrObxC6Db1lyF08+510XWS4OMHPL2XD36
         anow/cNbAAAAAElFTkSuQmCC
@@ -507,8 +507,8 @@
   <data name="buttonItem82.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAH9JREFUOE/NlIEKwCAIRDfY//+y81xuDa1RSauQiuhxXtZORFtoAzAyQmGSraeOLYAP
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAH9JREFUOE/NlIEKwCAIRDfY//+y81xuDa1RSauQiuhxXtZORFtoAzAyQmGSraeOLYAP
         1ShlNQfIruKeRCEdvEKg6xxjwXt/4zr+QNP6Be0BQtGtVKGqshdooBFA19NlFIZ6aGB56bSmbOowr0GA
         W4Bfz04K/lfgyHc25/taSuEJla3I41YVDssAAAAASUVORK5CYII=
 </value>
@@ -516,8 +516,8 @@
   <data name="buttonItem67.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAHpJREFUOE/llOEKgDAIhBf0/q9snVjouj+m9aM2hLHBx506FxEZrQvAzmiFqVumbk8B
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAHpJREFUOE/llOEKgDAIhBf0/q9snVjouj+m9aM2hLHBx506FxEZrQvAzmiFqVumbk8B
         8gDtQ1YLnG2f78QdV6g8g07AcP8tIPIV7LE0ZCw/AvRQWvmsQgr0Vb8DDNZdL2pPpoGm5tKTh8o0cP4Z
         ZYU/AhZm5DvzsDLBN+52u9zoVlmTAAAAAElFTkSuQmCC
 </value>
@@ -525,8 +525,8 @@
   <data name="buttonItem78.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAHNJREFUOE9j/P//PwNVAchAamKqGgb2LTVdh9NAYJiCAgIMQWxsGJdDsLoQlyHI4lQx
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAHNJREFUOE9j/P//PwNVAchAamKqGgb2LTVdh9NAYJiCAgIMQWxsGJdDsLoQlyHI4lQx
         8D8LwsUkGQj2LFAzsgHgYICKgeVxpA7sEqMGwmJ3kIUhNGJQ0h4olmGQ5FjGklOQjCMx2VBQAtGncKCk
         BBr8LgQAn2/gt5b9HCMAAAAASUVORK5CYII=
 </value>
@@ -534,8 +534,8 @@
   <data name="buttonItem75.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAH9JREFUOE9j/P//PwNVAchAdAy0AGQLSAYrhMtj0ztqIDg84WHEAgxDEAZBGBtIkx+G
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAH9JREFUOE9j/P//PwNVAchAdAy0AGQLSAYrhMtj0ztqIDg84WHEAgxDEAZBGBtIkx+G
         MMNgUQM1dNRAlHSMkagxIgU5aVMahhi5BSmGwXKk5hRYbOKiSTYQlPbQDQOlSfKTDY7CAV5kkOpl5NyB
         wQZZRrKBVHfhoDUQW9gQKwYA3Mt2Kr495a0AAAAASUVORK5CYII=
 </value>
@@ -543,8 +543,8 @@
   <data name="buttonItem81.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAIdJREFUOE/tlNEKgDAIRRf0/79szsjUaTEnPbVhEMLl6HVuANBKTxesjFIxqtala0iN
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAIdJREFUOE/tlNEKgDAIRRf0/79szsjUaTEnPbVhEMLl6HVuANBKTxesjFIxqtala0iN
         F0//qDgzcVW+4O6LXeKA+ahNbkJSMZEhTgkSibyC/BdkLx5NsT1kl2fHxpu/wfnghb2OTclgq9L04Nx/
         GULqYRQpwYgua4p5J1p+hnBlP360Dxe2+AE5U7i7XUfchAAAAABJRU5ErkJggg==
 </value>
@@ -552,8 +552,8 @@
   <data name="buttonItem85.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAH9JREFUOE/dVAEKgDAIXND/v2y6crjQQXpEtGFRsuPcnW5E1KBLAJEBBevVuuwas+bN
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAH9JREFUOE/dVAEKgDAIXND/v2y6crjQQXpEtGFRsuPcnW5E1KBLAJEBBevVuuwas+bN
         Sx5TnJm4qhDQA9N/JUDa+biEYdy/g7t3E4OJAdNSR+6fgEthMiXDAa3CHxVF3KfWud4p20wm1lazxoa3
         3tNOuQtg1c4Nh8KMfGkeFhgeIIeryKLL0A0AAAAASUVORK5CYII=
 </value>
@@ -561,8 +561,8 @@
   <data name="buttonItem69.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAH5JREFUOE/dlIEKwCAIRBvs/3/ZeW6JgZErGdsKC4RedyZtRFRSB4CZkQoTt5nqHgQW
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAH5JREFUOE/dlIEKwCAIRBvs/3/ZeW6JgZErGdsKC4RedyZtRFRSB4CZkQoTt5nqHgQW
         ritPHli64bnzLQdguCgMtKpoP9VaxZpzOsRVWIFy0AAbKK74IRC2qu1r13LMWJaX1Cdp20jy0RqOelBV
         3wH2oFZxXOHCD/TVz+FNlg+KLdeMaYotpAAAAABJRU5ErkJggg==
 </value>
@@ -570,8 +570,8 @@
   <data name="buttonItem72.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAItJREFUOE/dlEEOgDAIBGvi/7+MLgaFBg4U0oM2aC9OBko5iGi0PgB2RiuMs3XtBpcB
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAItJREFUOE/dlEEOgDAIBGvi/7+MLgaFBg4U0oM2aC9OBko5iGi0PgB2RiuMs3XtBpcB
         LzfunEKRfUA6P0vseeErEdQ+NBSATttAO4CAlwzFDmbGFGlnDV+Y1E9B2TIDNDAF1KZ/Bc69p3tzpYbc
         Jk9L8zInnQHOP893On3KnpHuyfxwKMzITfOwYHgBIcyz3GpBxx0AAAAASUVORK5CYII=
 </value>
@@ -579,8 +579,8 @@
   <data name="buttonItem66.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAG5JREFUOE/VVFsKACAIK+j+VzYnFEQvsBVkGNTH2qYZRSRQA4DMpIKZWia7x4BJvdXU
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAG5JREFUOE/VVFsKACAIK+j+VzYnFEQvsBVkGNTH2qYZRSRQA4DMpIKZWia7x4BJvdXU
         wNbkStVU8gio3B0BgmWzcF50xpYhDRCsOu/A1cuQDlgLcNtDPHRUFFofjjw0diiMp228f/zn4eAcvHTJ
         GQ50BGLnnh0kAAAAAElFTkSuQmCC
 </value>
@@ -588,32 +588,32 @@
   <data name="buttonItem65.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAFlJREFUOE9j/P//PwNVAchAamKqGgb2LTVdR7SBwDAGBQxRlhOnCGQgCxUNBBkGdiUR
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAFlJREFUOE9j/P//PwNVAchAamKqGgb2LTVdR7SBwDAGBQxRlhOnCGQgCxUNBBkGdiUR
         EUiUC8Guo6aXaeJCqnt51ECcqYO4ZANMMoM8DInIIbBcRJyXh5WBABRZUBLQnVBRAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="buttonItem62.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAFFJREFUOE9j/P//PwNVAchAamKqGgb2LTVdh9dAaLiCAhgd43UETkl8EYXPV/gMxOY6
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAFFJREFUOE9j/P//PwNVAchAamKqGgb2LTVdh9dAaLiCAhgd43UETkl8EYXPV/gMxOY6
         sBglBmJ16PA2EGs4Dm8vD/5Ypl6kkFto0K+0GTQuBACUuJiTTPFroQAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="buttonItem64.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAADxJREFUOE9j/P//PwNVAchAamKqGgb2LTVdN8QNBMY8KPpxYlxBhTMMRw3ECMvRMISn
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAADxJREFUOE9j/P//PwNVAchAamKqGgb2LTVdN8QNBMY8KPpxYlxBhTMMRw3ECMvRMISn
         ltGsR3nZOPjDEAD6FPM4KprXiAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="buttonItem73.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAINJREFUOE/NlOEKgDAIhAt6/1e2bkyx0sDtqDZk7Mc+zjvZKiILdQHILCqsdctUlwIP
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAINJREFUOE/NlOEKgDAIhAt6/1e2bkyx0sDtqDZk7Mc+zjvZKiILdQHILCqsdctUlwIP
         T2HE806sChUC6Eu2DsepVQHi+RWq92Fg09TVRPDM+zgUdU/bc26a0mrLdIVUD28p+wEaSdnmMPBwLmWX
         tIF0JiuhZP6dhv1T4MyH8c5v8yuFO1DV07yWmDh+AAAAAElFTkSuQmCC
 </value>
@@ -621,8 +621,8 @@
   <data name="buttonItem71.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAIlJREFUOE+9lN0KgDAIhRf0/q9sKihabuAPFV6s8NvxKF4AsEYfAk7GKIyrnVS3By60
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAIlJREFUOE+9lN0KgDAIhRf0/q9sKihabuAPFV6s8NvxKF4AsEYfAk7GKIyrnVS3By60
         4fCi55gbWxUrJNjtgyA28kDO9xA582UZhRFILRDlFaCWbf3sAJ1nAq0ApbwxDz9+BQ1KNSUC2m+1OXx7
         ZueS/lW6vPMwrfAE0uHOKOwsjJ+2TWPpjit8AH+V07iuhEoDAAAAAElFTkSuQmCC
 </value>
@@ -630,8 +630,8 @@
   <data name="buttonItem80.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAG9JREFUOE9j/P//PwNVAchAamKqGgb2LTVdh9tABmAwIEFgGIMCGhQ4qBBLcGF3IUgb
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAG9JREFUOE9j/P//PwNVAchAamKqGgb2LTVdh9tABmAwIEFgGIMCGhQ4qBBLcGF3IUgb
         CwLDDUQSA8uTZCCSoSguhBkKkh8wA2EuIkQT7UJCBsGDYMC8DE8c0AgYjRRwrgHnHKIjhYISiE6Fw7B2
         IQBXTc/Ii1NFYgAAAABJRU5ErkJggg==
 </value>
@@ -639,8 +639,8 @@
   <data name="buttonItem57.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAHpJREFUOE9j/P//PwNVAchAamKqGgb2LTVdR0cDGYDhigSBkQaKOVBoo0Is4Y/dyyBt
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAHpJREFUOE9j/P//PwNVAchAamKqGgb2LTVdR0cDGYDhigSBkQaKOVBoo0Is4Y/dyyBt
         LAgMNxBJDCxPkoFIhqK4EGYoSJ5cA1E8So6BMBcRool2ISGD4EEwYF6Ghxk0vKgeKdQzEJp0MNIhLHkT
         HYYUlEBDtXAYTF4GABL477TaAfezAAAAAElFTkSuQmCC
 </value>
@@ -648,16 +648,16 @@
   <data name="buttonItem61.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAFFJREFUOE9j/P//PwNVAchAamKqGgb2LTVdN4QNhMY6KPrRMXKCAPoQM0KxhiEWg7AZ
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAFFJREFUOE9j/P//PwNVAchAamKqGgb2LTVdN4QNhMY6KPrRMXKCAPoQM0KxhiEWg7AZ
         TrKBKK7B5lpSXEhUWifVwJEUhpTkntGsR3nZOPjDEAAZ/81eNzDEKwAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="buttonItem79.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAF5JREFUOE9j/P//PwNVAchAamKqGgb2LTVdR0cDGcARBSLA+D8LMJxBEEQDMVgMR9hj
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAF5JREFUOE9j/P//PwNVAchAamKqGgb2LTVdR0cDGcARBSLA+D8LMJxBEEQDMVgMR9hj
         9TJYA5oBGBaQYiDUPXAXwflIlpDkwsFvIHJ44WKPehme/IZq1qOgSBuBXgYAUGAHm432490AAAAASUVO
         RK5CYII=
 </value>
@@ -665,8 +665,8 @@
   <data name="buttonItem76.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAKhJREFUOE/NlFkOwCAIRNuk97+yBSKExQUTmlSjHy7PEUbv1tpVWhBY2UphdFtRd4FS
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAKhJREFUOE/NlFkOwCAIRNuk97+yBSKExQUTmlSjHy7PEUbv1tpVWhBY2UphdFtRd4FS
         qFCwQ92hruaYI0BevAOODqKxHrq1wgcW9iYHqTGa45oC4mIFlM0M1UE5AYYwVABZ3TTWWYVeHTnAxzWd
         lG4jE3wXV7HYTKG2hcmsTsCJQg/k6xn/ATAkaqfQbHDeG5o/Azx6fivg9FWoqwb7BGDRN/bh9/VXhS9A
         +GdRV5V7oAAAAABJRU5ErkJggg==
@@ -675,8 +675,8 @@
   <data name="buttonItem77.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAKFJREFUOE/NlNsOgCAMQzHx/38Zt4WZbtzJTJTgA2I5pYwr55xCHxaM7KFi4tbQJaKl
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAKFJREFUOE/NlNsOgCAMQzHx/38Zt4WZbtzJTJTgA2I5pYwr55xCHxaM7KFi4tbQJaKl
         Rg+/mL1qzW/g0gjq5PenmwSxl8X8GELNCVUQyWFMPPQI1aCx5QRlToRgb5FjQhMSEZoFdi37ZDG8I0Kk
         q07CSih4+lp0HMqWZS+oqQppSfhIcLR3Zh9noeB5NFUBVbNNOKrnqt67hAFX2cfX1x8JH9infzlwvl0u
         AAAAAElFTkSuQmCC
@@ -685,8 +685,8 @@
   <data name="buttonItem58.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAJRJREFUOE/NlNEKgDAIRRf0/79salPWrLiSgwpftjxeTd2IqJU+Aqy0CGscAHg5K9YR
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAJRJREFUOE/NlNEKgDAIRRf0/79salPWrLiSgwpftjxeTd2IqJU+Aqy0CGscAHg5K9YR
         xbwCxWk2CaYwCQoD99PpyYjvU8ARNKYfzhGFFydT0msa0s8ANa0BqHXrZwaGaugfrwT6X61Q6DCp46+A
         oZaTutSklPahNvKKSbGZvZtlnx60sZFtg8/yx/1Yulx1+1dua2EdD2qAIPUd5s8AAAAASUVORK5CYII=
 </value>
@@ -694,8 +694,8 @@
   <data name="buttonItem59.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAIdJREFUOE/NlOEKwCAIhBvs/V/ZacywKduFsi3xT9THnaUbEbXSJcDKLIV1t05dY8WX
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAIdJREFUOE/NlOEKwCAIhBvs/V/ZacywKduFsi3xT9THnaUbEbXSJcDKLIV1t05dY8WX
         4JKIDx+Bu0egwDQdEgbufPXMCWj2OxwGymG+bGFDpUA1VoARzFlHgXewCYoAEdiAfgKUgiMql1+59FH0
         W4TfxvYLUsOo7X7aKcZabjgk5+ML8zCp8AC0/YvYhcL59wAAAABJRU5ErkJggg==
 </value>
@@ -703,8 +703,8 @@
   <data name="buttonItem70.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAIBJREFUOE/VlOEKwCAIhDfY+7+yeZJh2xqYFqzhjxkcn3fhSURH6oFgZqWKybSZdPsE
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAIBJREFUOE/VlOEKwCAIhDfY+7+yeZJh2xqYFqzhjxkcn3fhSURH6oFgZqWKybSZdPsE
         OSQk9Vmjyd5HFi2+ujgw+/G/9NEbhLlPEHSNplJ21F7CZYJK2ejU1xlCSxkXhG/Vx4fYTMr2udzD8T8b
         +GSqI9S+y8PABvrpcoistPSRC/8z/5QTH8xtAAAAAElFTkSuQmCC
 </value>
@@ -712,8 +712,8 @@
   <data name="buttonItem74.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAJBJREFUOE/NlIEKwCAIRBvs/3/ZqaSYOqIl2woJCl7nmR0A0EoHASujFMbZVqrLgQ0t
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAJBJREFUOE/NlIEKwCAIRBvs/3/ZqaSYOqIl2woJCl7nmR0A0EoHASujFMbZVqrLgQ0t
         MBP9JZM1xtNoV1TYYR50C3Y1SIGDohNVUNDENahdATJIYGKDgfIlM6AoEEVWVbq3CgzeddV68efA7ZTJ
         J02noigWSGBf5UfPxkOzR64dMyuKb6391tv8zl74bf6m8AKNAJvwV1fzVAAAAABJRU5ErkJggg==
 </value>
@@ -721,8 +721,8 @@
   <data name="buttonItem87.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAHpJREFUOE/tlFEKACEIRFvo/ld2zRrW+pBQif2oCKLoMWNTDxGV1NaAmSMVJm5NdYXV
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAHpJREFUOE/tlFEKACEIRFvo/ld2zRrW+pBQif2oCKLoMWNTDxGV1NaAmSMVJm5NdYXV
         c+fWfHzdcLUNnKBuYO3q9CBes1zZmwoG66LUq1AOD5WoYAgo9hZgyPIF9mBHYgMAbhs1dcdmikrK09Ox
         GfOYZcfXdvj7+oPCFzUrDpjs1cCOAAAAAElFTkSuQmCC
 </value>
@@ -730,8 +730,8 @@
   <data name="buttonItem63.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAHxJREFUOE/tlL0OwCAIhDXp+78ycqRnSQcGIKZDNQw6nN/JzxSR0bog2BmtYuY2pBtK
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAHxJREFUOE/tlL0OwCAIhDXp+78ycqRnSQcGIKZDNQw6nN/JzxSR0bog2BmtYuY2pBtK
         r1sXfDw7cHVY8FIqjU14nyNXMeFbEKZxl7b8C1rhVP7QsuuzzJrMJgWCDBa4PZIV9CJbuGKZzeYp7S5N
         6OuQXVIiTIy2w+PrC4QLMHgOlOq5QDwAAAAASUVORK5CYII=
 </value>
@@ -739,8 +739,8 @@
   <data name="buttonItem60.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAGRJREFUOE9j/P//PwNVAchAamKqGgb2LTVdNxQNZABGEBQCYx4U/aAoQ0AWIBuEkSFa
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAGRJREFUOE9j/P//PwNVAchAamKqGgb2LTVdNxQNZABGEBQCYx4U/aAoQ0AWIBuEkSFa
         pKKGIbph6JrJMRDuMmyaSTUQZhgpNHoqwfAyVV2IHNjgCKFGGFI3lqmQr0d81hsRYQgA/B8AgiUdBGUA
         AAAASUVORK5CYII=
 </value>
@@ -748,8 +748,8 @@
   <data name="buttonItem68.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAGtJREFUOE9j/P//PwNVAchAamKqGgb2LTVdNxQNZABGEAyyAFkgjASBqQGUJEDRiIBo
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAGtJREFUOE9j/P//PwNVAchAamKqGgb2LTVdNxQNZABGEAyyAFkgjASBqQGUJEDRiIBo
         kYoahgQMBFmAYSilBmIYis9AmO2k0OiphGQvk+RClMDGEikww6gWKeAYRot5/F6mQr4e8VlvRIQhAIwr
         AYWdxFZmAAAAAElFTkSuQmCC
 </value>
@@ -757,8 +757,8 @@
   <data name="buttonItem84.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAADxJREFUOE9j/P//PwNVAchAamKiDAP6AGgncRaPGog9nEbDEG/KGE02o8kGWsIM/pxC
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAADxJREFUOE9j/P//PwNVAchAamKiDAP6AGgncRaPGog9nEbDEG/KGE02o8kGWsIM/pxC
         bFkILv1JUUyMWgDrxVLnzhXMLQAAAABJRU5ErkJggg==
 </value>
   </data>
@@ -780,8 +780,8 @@
   <data name="btnInsHrdSpc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAHlJREFUOE/llI0KwCAIhB2+/zO7GQhmLQ2OYCyQ/uzjrqRLRAjaFIgMKKy5Rar7CJCZ
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAHlJREFUOE/llI0KwCAIhB2+/zO7GQhmLQ2OYCyQ/uzjrqRLRAjaFIgMKKy5Rar7CJCZ
         yYU8Yw2/NhtbXuwpJleBei7mtvkbcEelMQagQaoqZ7Y7y8N9JHe5tBwtVlSeA3qr/vVWKstlk9Vfup8m
         uHorPdofPwf0f3gD43NpwwQa5WcAAAAASUVORK5CYII=
 </value>
@@ -789,8 +789,8 @@
   <data name="btnInsStpParts.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAPxJREFUOE9j/P//PwOl4DPQAJAppOLPMMuXAzVvBOL1JGCQ+uUwA5KAnAwgTicBg9Qn
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAPxJREFUOE9j/P//PwOl4DPQAJAppOLPMMuXAzVvBOL1JGCQ+uUwA5KAnAwgTicBg9Qn
         wQzoBHImAfEEEjBIfSfF4YfLAGag6azEYLABbGxs9yUlJd9CYyETSCcC8S0gPokHnwHKHQAboKqq+nnJ
         kiWwKGwASggBsR8Qe+DBnkA5V5gXlkKjby+Q9gLiWCA+BcS78GCQ2o1UD0QLoKlrgHgeEINcJQ7EHEC8
         FmQbEG9AwpuA7BXoLogqKCj4n5KSAgsPTaAiEPCFhgkoXGDYH+RddANCpaSk/ouLi4Pyxj8gVgViNiA+
@@ -868,8 +868,8 @@
   <data name="btnInsRNO.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAADpJREFUOE9j/P//PwNFAGQAJRismZmZ+T86RjaUhYnlPzoGqQe7nhLbR5oBo4GIO7WS
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAADpJREFUOE9j/P//PwNFAGQAJRismZmZ+T86RjaUhYnlPzoGqQe7nhLbR5oBo4GIO7WS
         lJCQA3IYpUQA76epNf0QgmEAAAAASUVORK5CYII=
 </value>
   </data>
@@ -908,8 +908,8 @@
   <data name="btnInsStpParts.SuperTooltip" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAQAAAABmCAYAAAAkqE+VAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAGBdJREFUeF7tXXl0VFWaT4/9R0+PHnsWR7uZbu2eOTN2N7bSjo7YKrQaEVsRGlTUYysg
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAGBdJREFUeF7tXXl0VFWaT4/9R0+PHnsWR7uZbu2eOTN2N7bSjo7YKrQaEVsRGlTUYysg
         iNgsKYQACUISIMgSFoEUiQQIskcMIGsBWVgMEbOvkBASkkAgIWQnCeQ3777a3lZV79V6q+pyzj1Q1H3v
         fff7ft/vW+6tqh81t7Ti+NGDIVeuXgtpa2sPYX+YBpgGAlsD99xzd8h99/1ryJChr4WErFmzBgUFBWhs
         bERPTw8bTAcMA36GgetNzXBmfPnllwghzs8cnxEfw4D/YoA4f29vLz+IHbu7u3Hr1i1+dHV1oaOjgx/t
@@ -1018,8 +1018,8 @@
   <data name="btnInsBefore.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAASxJREFUOE9j/P//PwNVAchAamKEYQxAg7HAu0+//m9Z9ur/5XufQVbjhlCH4TUQZtiy
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAASxJREFUOE9j/P//PwNVAchAamKEYQxAg7HAu0+//m9Z9ur/5XufQVbjhlCH4TUQZtiy
         w7//J3ddw28oIQORDZuw8f3/9Ckv/oc33f5///l37C4lZCDImwbhK/9bJ23637Ds/X/X4nP/NYOW/5d3
         n0megbDQciq5+j+1985/abt2ysMQZKhe2qX/Su6T/0tZN5JmYFZh5f+M/Mr/6XkV/1Nyyv4nZZf+T8wo
         +R+XXvQ/JqXwf2RS/v/whLz/IXE5/4Nisv8HRGX+943I+O8Tnv7fMzQVmPIgyY9gssGbVJATEc0NzCiA
@@ -1030,8 +1030,8 @@
   <data name="btnInsAfter.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAASlJREFUOE9j/P//PwNFAGQAJZgizWDXU2L7IDEgq7Dyf0Z+5f/0vIr/KTll/5OyS/8n
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAASlJREFUOE9j/P//PwNFAGQAJZgizWDXU2L7IDEgq7Dyf0Z+5f/0vIr/KTll/5OyS/8n
         ZpT8j0sv+h+TUvg/Min/f3hC3v+QuJz/QTHZ/wOiMv/7RmT89wlP/+8ZmgqMAQohhdqBsZBRAHF+am75
         /2SQ8zNL/sdnFP2PTS36H5Vc8D8sseh/aHze/+BYkPOz/vtFQpzvFZr23zM4BbcHKmc/+B9Rdfi/f9Fu
         UFLDCXFKtCx79X/hvu//HVPXk2aAQ9Kq/5ndF/+DDJi5/ct/38Id/81jV/xX9ZiA1SAMF1y7++a/pv+c
@@ -1061,8 +1061,8 @@
   <data name="btnInsRO.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAJVJREFUOE/tk0ESgCAIRfX+hyZEcECJyEW1iMbJIXz8ACsAFDQoFZ++IweZ+IYj2Mip
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAJVJREFUOE/tk0ESgCAIRfX+hyZEcECJyEW1iMbJIXz8ACsAFDQoFZ++IweZ+IYj2Mip
         BsRljajKj2nYI1/Wd+e0yAmoQ1sagu0C3YO7wFDJjsLHgUvnnFaapgyF+vekfusgOPypyxHwWh3Ngx0b
         M1msLAeSKAX0xpXD6O4ES+XMAW+IzAN/hWdlzddwzIXT7W90+VWFB0CnMA5SEwr4AAAAAElFTkSuQmCC
 </value>
@@ -1088,8 +1088,8 @@
   <data name="btnUline.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAGhJREFUOE9j/P//PwNVAchAamKqGgb2LTVdh9NAYJiCAhaOgYECCmZUMRxBhd2FSAaA
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAGhJREFUOE9j/P//PwNVAchAamKqGgb2LTVdh9NAYJiCAhaOgYECCmZUMRxBhd2FSAaA
         DINBmKFg/qiBsCAYDUNocoAmFPS0B+LDExGpyQY5/WFlk2IgNpdRllMoKIHoUzhQUgINfhcCAK1G3k1g
         YwCYAAAAAElFTkSuQmCC
 </value>
@@ -1127,8 +1127,8 @@
   <data name="btnRepaginate.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAJhJREFUOE/tlNEKgDAIRTe2///fQDAcGBd1rFkPPRRIYOt6NLuVmYu9eu8+6U75BBHV
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAJhJREFUOE/tlNEKgDAIRTe2///fQDAcGBd1rFkPPRRIYOt6NLuVmYu9eu8+6U75BBHV
         IoI2WmtMB22FvDPgUEySmZDiU8EMmRPMUOlY8H61nJ2ZkoWEmsSKSB49XwruzO9WyzM6S2rJpi2/Tmgr
         KxnOL2r1J+SCix196e/McLWHuFbR2cf/sq4VWuDww6w5ROZ8CWYsLBI8ASIt+Tz8pxenAAAAAElFTkSu
         QmCC
@@ -1137,8 +1137,8 @@
   <data name="btnPrnPreview.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAkZJREFUOE/VlF1IU2EYxxsbXUQJ0s0qCLooum6ZfaIXzjlbenL0QUa0UcxjbBOLIAdm
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAkZJREFUOE/VlF1IU2EYxxsbXUQJ0s0qCLooum6ZfaIXzjlbenL0QUa0UcxjbBOLIAdm
         VhcZG9K5KfJzq4TA40cWq5GsL83JgmgthyJqynLK5oY7zm307xzrhKm5GQT1wMv7+fx4/+/75xEAWMWF
         SCT6PlhBxONxwaLjHJBrQqGQ7ZKPH+fncue3n5O/BuTAPHyp8fy9hbebe77/V/Jy0rmv+zc+RbxhE0a9
         EyirNKGR7sS5MiNOkgYMjk6u/IZhJoJXPS40W1+j1zMEx/A4aEcfKmrbUWSgIN68jVOe2Ie8LfZl5uDu
@@ -1154,8 +1154,8 @@
   <data name="btnPrint2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAYAAADE6YVjAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAYFJREFUSEvtlTFrg0AUx2PTUhCEOGQQA8mS2UlDvkI+gd8ikCFDBCFDloAJxNCldnFx
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAYFJREFUSEvtlTFrg0AUx2PTUhCEOGQQA8mS2UlDvkI+gd8ikCFDBCFDloAJxNCldnFx
         cnC0zaAfSwK+eocJnrlLrlI79cGfO+R5P9//PVUAgE7rgSBtq3UAdqrtKgjIarXqdLtdWnueiwBe0R76
         WskdyAsC8ESZd+POI4hQBYzHb5hVX9E1FoDHLmwViun0A6+TyTsBulRYhTiOQ1Rzt5K6TaxKUF7RTOHS
         j81mQ4es12uh7PoTWn/ShyL9tdrw3W5Hh7CmR+71QJZlplj3VaFXIkpOkqSxVFUFz/NguVzeDAEB+UyS
@@ -1167,8 +1167,8 @@
   <data name="btnExit2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAYAAADE6YVjAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAwBJREFUSEt9ljuOGkEQhmdYMLt47fUL24FtIhLLqUlISCwi7sEVyCDlChyBA5AgQbIr
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAwBJREFUSEt9ljuOGkEQhmdYMLt47fUL24FtIhLLqUlISCwi7sEVyCDlChyBA5AgQbIr
         JyQ+wUpOEQcAi9n6Sl2tmma8K9X2Y7rqr8ff1eRFUXSyLPsrchbhLw8jQyFSE6mL3IT5UcZT+IYOwhnO
         IqbfCOt/mYDkIjbavOb2+ebP2ZrRzqF3FaQexoaML9A1BRYGYHsoeYM6r9frGPbA6LGHjTfum+0pCAvQ
         myKgY5y5GfoY1vlsNqsJSIE4rz8F4y9lvBF5G2yir476NLVk484ZRwEDjIBqahwIDl2LvHaA7OGBOR9B
@@ -1187,8 +1187,8 @@
   <data name="btnSave2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAYAAADE6YVjAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAABlVJREFUSEu1lntQ1NcVx5fMpNPp2CZpxyax0TQz2EweplaiILDLG9HgA4NWFgwSWEQQ
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAABlVJREFUSEu1lntQ1NcVx5fMpNPp2CZpxyax0TQz2EweplaiILDLG9HgA4NWFgwSWEQQ
         EESQII8ICAiE1QkooEIAEQHlISCQGjQ1FuShlggCFmMBRZaHxAWEAp9e1nZ++SPPP3Jn7v529p7f/dzv
         Ofecs3qA7Gcfc5DzVWPMzZpqrXg+orTkISfzRsjMGCb14wEOqe+TnNRLfNy/+TDqLvvCugn7oIvgoFsE
         7GrDz7edwICbhO29RcS+TrHWQcieDoJ23xLbCxFzH1WVj/i0dpy6z6bI+WSC3Bwt11rGaGwc5/LftVy6
@@ -1221,8 +1221,8 @@
   <data name="btnNew2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAJtJREFUOE/VVIsOgCAIrP//KfsyE/K2RB5ari035hxyHKew55y3pYsAU0qhlaRHdI/J
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAJtJREFUOE/VVIsOgCAIrP//KfsyE/K2RB5ari035hxyHKew55y3pYsAU0qhlaRHdI/J
         ATAK8PzwNYCUPQLVGN5jOkAE0CXLvLJ9wOKlRZpgRxIL1AWUYHwukrPoxgM9YXiBVkkk03mGonwTUGbk
         s6JhI4NS9jKGIDSt4WcMoeXfGTrtN/wPlw6HkfFk9bA5vqKA4QFbhwr3/Vs7AVX9hX1v7jIzAAAAAElF
         TkSuQmCC
@@ -1278,8 +1278,8 @@
   <data name="btnProperties.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAYAAADE6YVjAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAB6xJREFUSEt9lQk81ekaxx/EZJuZhBaU0u2OSZ0pmQ8lspTKVnPFFJG6tlKSi5sl4Vja
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAB6xJREFUSEt9lQk81ekaxx/EZJuZhBaU0u2OSZ0pmQ8lspTKVnPFFJG6tlKSi5sl4Vja
         EMpSp1KdpJWyTE2WlELGEpU+Mpm2a9LGib8czu++TjV3rntn3s/n+/m/z/N//8/vfZ7nfc+RERbW0lsR
         R2/eciQzSoE+V9Mg1dHyJN9ZSEQyJCMjS0MSGZIfhbV9nGzagFiG3ovFRBIJiQeHaGhIwmwJWyshBdlB
         Uux70yz7pZxQwXhKoqLSRFLqUx2kYZH9udeIn/EDxR0so/Tzdyir4BElJwkolR9BWWnJFBqapp25L31/
@@ -1318,8 +1318,8 @@
   <data name="btnProperties.SuperTooltip" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAALQAAABjCAYAAAAy9iqlAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAJx1JREFUeF7tffd3FMf2J3v2e87+uP/Gnu/ue34mJ9vYGHAEbGyCAYNxwgkwGIzJOdgE
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAJx1JREFUeF7tffd3FMf2J3v2e87+uP/Gnu/ue34mJ9vYGHAEbGyCAYNxwgkwGIzJOdgE
         g9Ozcc429jM5RwkkJKGcc85plEcS4u7nUz0909PTEyQGmdA656or3LqVPnXrdldN1f948qU9xf+r/sz/
         Lq5wDPiv//qfA+w/uwVutxYQGTBArl8f8M9//p+mAf8YMqH1gYcel4fGT5aHxtlkt8HtiYExwO79Y8a3
         Dhg2bIRj9JhHZPjIMTLyvodl1P3jZeT9D8uI0WNl5OiH8GTYOBWu0TjFq4VrfmPcqAc8YSMhg3y6XJ1/
@@ -2738,8 +2738,8 @@
   <data name="btnROUsages.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAJVJREFUOE/tk0ESgCAIRfX+hyZEcECJyEW1iMbJIXz8ACsAFDQoFZ++IweZ+IYj2Mip
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAJVJREFUOE/tk0ESgCAIRfX+hyZEcECJyEW1iMbJIXz8ACsAFDQoFZ++IweZ+IYj2Mip
         BsRljajKj2nYI1/Wd+e0yAmoQ1sagu0C3YO7wFDJjsLHgUvnnFaapgyF+vekfusgOPypyxHwWh3Ngx0b
         M1msLAeSKAX0xpXD6O4ES+XMAW+IzAN/hWdlzddwzIXT7W90+VWFB0CnMA5SEwr4AAAAAElFTkSuQmCC
 </value>
@@ -2747,8 +2747,8 @@
   <data name="btnSimStps.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAKRJREFUOE/NlNEOgCAIRcv55P//ay8u61owJE03aavGJgInuC7XlNJi+gBoaaawPK1l
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAKRJREFUOE/NlNEOgCAIRcv55P//ay8u61owJE03aavGJgInuC7XlNJi+gBoaaawPK1l
         dwUwuLBpO8XgtxbHHmfc0nGH3vkU98hGACqAL+NYFzk9YP5AvIoArQGLnBEgCuSoukPEyegsmiPXivUe
         +YB2gVrTN38YKCF6rf1mh1IXWmM0Aug4xYZGNulQCi0PYVrD6VNu/Vqj+w8NrS6J726b33Z4AFzeFLS3
         F5viAAAAAElFTkSuQmCC
@@ -3387,8 +3387,8 @@
   <data name="btnNew.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAABEVJREFUWEfNV9tOlFcY/e56ZdMn6Cv4FD5AY7VWrVbFEyPtrRdNTJrGZ+g71BLjRdNo
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAABEVJREFUWEfNV9tOlFcY/e56ZdMn6Cv4FD5AY7VWrVbFEyPtrRdNTJrGZ+g71BLjRdNo
         bBPTtLYesCgUOXigOAKOMwNyHOBfXWvP/obNwGwghqQ7WSGBP986fN8+YPa/Wgdv1+zTX2GH7hC/wQ7/
         DvvsLuzIX7DP78OOPiQewY71w44/gX0xSAzBTgzDTo4QY7Avn8NOvSDGa3Z64uTu/JH8wSTeGz8OApd/
         Wsa+Uhl2prwLEXQ+8Abvjd5+4MD3wDc/N7Dv0hSsa2qHIhj7aA0B/1SAx9PAE0KiBgn9Thginr5tYjhi
@@ -3412,8 +3412,8 @@
   <data name="btnOpen.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAz9JREFUWEftl2tIk2EUxyXCEs0Ki8hkVtrKCvxQGFSmeJnm1MQuQlJiikJSU3CaZm1K
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAz9JREFUWEftl2tIk2EUxyXCEs0Ki8hkVtrKCvxQGFSmeJnm1MQuQlJiikJSU3CaZm1K
         ZJhkyIRpk+UNRaRQW9GU3kRRIy+laB90rEiyqBRU1Ozy77yOvM3pPjxCHxz84GEMzm/nfc7ltbBY/fwP
         GUj0EboSMimP7yxJdE4SGUiei59Qds3AKSb+FJyryIqBtijNmGL6jqhbBBIYZibQ31mKP5Ma/B5RmQ0J
         gIkApZ3r71Tj50AMJtsszSbFXwjCgyeV56SB6/8IoDOxrOS0QEc+pj5GY/zVerNRxh1EgfQMHvAkzaKi
@@ -3433,8 +3433,8 @@
   <data name="btnSave.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAABWRJREFUWEfFl2tQVGUch/nuNDZ9yWb61AdrqrEZdaY+FGZjXhpKzEQhkMBrDCiKLhcB
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAABWRJREFUWEfFl2tQVGUch/nuNDZ9yWb61AdrqrEZdaY+FGZjXhpKzEQhkMBrDCiKLhcB
         EVTkzoYSF3FJZHUrL1wSUVdWUTSdadQ2MbVNK9BEBfG+lU//9xwXhj1rVO7omfnNnrN7zj7P+77/877n
         BAQ8+a1gaEBAQbeExxxhapsmQNl+Hmv0xvZtBTxtgsBcGJMnIg5oOQ37JHtPwZ4foNkJu76HnSehSaL2
         1Xe75bc9co69XT9fXef4EfafgdazcPAcHJD9DQdhhgXCJIplEHhqKYyKdTA6zsE++dPe23p6bsK1G3Dl
@@ -3463,8 +3463,8 @@
   <data name="buttonItem5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAACZZJREFUWEfFl2dUVFkWRhXDCJIzigTFbItSpjEHBIlFFAMCY+oxgmIYTCWhwVYEJSmI
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAACZZJREFUWEfFl2dUVFkWRhXDCJIzigTFbItSpjEHBIlFFAMCY+oxgmIYTCWhwVYEJSmI
         VYoBoUREQRAVxJwds20r2CYMQIFEbeWbc28JDoPMcvwzrHXWg6pX7+z3nX3vo1q3auEn3L6TULHNJyet
         9rVjP9e3NvkEhVaf6lm1LqffD3+GwpbFmW9utfT573kdQPPTjnu2Nz82/S83V1t1hdhFE4c8lCCdrIxk
         NxUkuahB7KSBeEctxNjrYqudnvf3NGrpnGYABT5t1PK82sikHspYY90VyZNVkTmtAw5PUcTByR1xwF0F
@@ -3511,8 +3511,8 @@
   <data name="btnPrint.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAABadJREFUWEftl1lMVFcYx89r0xcf2jRp04cqBglqkYALiCAVClqkbMowwIDsy4gCFZfg
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAABadJREFUWEftl1lMVFcYx89r0xcf2jRp04cqBglqkYALiCAVClqkbMowwIDsy4gCFZfg
         aSIaGKgjRLHaugA6NdJqjAKJSy4FAkEFBCoWquBQBEQEBGWHf883Aqm5jQyEx97kl+Ee7ve/v/vdM5Nz
         GPv/mK0DXhJnPqVg2yvAFPfB/GrB/B+CBTaCqZ6ABevBdrSBhXSAhXWBhb8Ei+gDi+yXZos27v8+ZXyP
         rhU9g0DfMDAwArwZBQYFQ2PA8L+gcxovejguBF4vkMD2Sp6oe4YXb4CeobcS/ULi9ZTItAx9EiRYSAJR
@@ -3542,8 +3542,8 @@
   <data name="btnClose.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAA8JJREFUWEftln1M1HUcx/kjCRE4EWiwllB/XKutteqPVqtsJfjEQzYqXVSuMFM3L4sH
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAA8JJREFUWEftln1M1HUcx/kjCRE4EWiwllB/XKutteqPVqtsJfjEQzYqXVSuMFM3L4sH
         w+N+lE4nD00d8hAgSa6YMhK1MbHrcCytLSM2bOZIatacPcyJYFCxV+/fHXh33ulw+7n1h7e9tt/3e7f7
         vu7z+Xw/94mIuPn6P0SgYK49RxiF6cEUaV2U4aM4kHl2Y50PmyX+OpyuXc7wtGhfHL6ClrI8JNBsiUCh
         BBj/lvGRVsaHGqfEwDGXKeCxRiDdFDjG6DeRU+bk3jjemW/vFXNMSkwW+FmvZy8LfTgX2u+/qqxyD/92
@@ -3565,8 +3565,8 @@
   <data name="btnOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAt5JREFUOE990mlIFGEYwPEx61tEQfUlKoiCoMCgvnQa9KGIgm6prIgOrdUsu9Mao/uk
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAt5JREFUOE990mlIFGEYwPEx61tEQfUlKoiCoMCgvnQa9KGIgm6prIgOrdUsu9Mao/uk
         Qwm0UsotK0srLzowKDvddjfLbdXWaEjUckqzVdx1/j3jTkkEDfyZYdj39z7vsGGKec1/GKmEhU9VevRS
         lLCeitLDqus5PPQuzLyHf1cyh5zuWiMXYD0teKS6GuB/5VZAVHYHAzY1Zv4LLCpTa79DRSO4BXor98ov
         4P0KVU1QrUNuucGYFIMl9gADN+tdSPcEUS/Uhp8CvCjFcSUFZ85eXDkpeF6V4vsGHwW/8dyg37IQEn01
@@ -3584,8 +3584,8 @@
   <data name="btnExit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAmVJREFUOE+lU1tsi2EY5u7//57Wrqtu7dodulI7VDY26RRzmLDZuLFgF+wCcdNLFxJ1
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAmVJREFUOE+lU1tsi2EY5u7//57Wrqtu7dodulI7VDY26RRzmLDZuLFgF+wCcdNLFxJ1
         oavMeQkSMaeNYKMTyw5dpqWMOWQuiFo6P0NCikZiC0Me3/dVk7ZzIXzJ8+fL+/7v872H550OYNp/nRjB
         Dp4zEhzaI3C+GFwS3tdI4Iqz7eS50+S/RfRRFks/xKBwClykRcbhjJzHeZUMVzJScd2oRVeWFp2ZGlzS
         pOCcQmD+RoEDJYkncJwgwWeJs0OrQp85EwGrGUPz8nG/tACDJRb48nMYYZtKykh28ZwnnsBJje1aJQYs
@@ -3601,8 +3601,8 @@
   <data name="btnMarkPrevPos.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAm5JREFUOE/V1N9PklEYB3D7j5oX4kYujUSwCeTCMBnzZy5/IqYU+PKC/MjUV0HBH6kY
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAm5JREFUOE/V1N9PklEYB3D7j5oX4kYujUSwCeTCMBnzZy5/IqYU+PKC/MjUV0HBH6kY
         hgqJFWWOdM1y1hxUyua8SC9aF82buugmHB6/Hd/WRbr2XuRN5+y5OtvnPM95zp4zADJOdR2BpxknsQx6
         wV+2rKAAR/HH+bGE/kPQ631P3O446e1ZIw/DOyQY3CKBQJJMTn4g4+MJMjq6Try+14jFNsje3jdy/P1P
         lNzdvUJGRzbhsMcQjf7A2PgXDHo/oYf7CLtzG2Z2E7V1r6gD6HQjwqDLtUwGBtZhZZ9ibu47BnwU69uB
@@ -3618,8 +3618,8 @@
   <data name="btnPrevPos.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAqJJREFUOE+11Nsz1GEcx3H9B/0j3XTRRTNNE2MoCjnFThMbOUeOG4vdikJb2ZyKqW21
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAqJJREFUOE+11Nsz1GEcx3H9B/0j3XTRRTNNE2MoCjnFThMbOUeOG4vdikJb2ZyKqW21
         hUZc2MHKMK0I01iHQgwt5Vg5LbvsmHfLjFXTr67W75lnnovfzGs+n+eZ+R4CnBz67YCO3A7Fdtva0znZ
         kv5nnXZ3JyoiYqfP3+u3lgcPylUfeVg7hrrpyx9p9hKqtOMUVhlIVXbt/xdK+LRhlIyyXmSqIcybVqYX
         N6jvmNndOyX3wKHJdXQ9P5CVtHK7SIM4qcB2a/sPa6+saRxBqx9FUtKDZWubqtZpalrH6eifR1rylj1w
@@ -3633,15 +3633,9 @@
         4xKQjJsoHR+xHFGs4t+go2biAc5DB03uX5vZMUQuZEGBAAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="c1AnnotationGrid.ColumnInfo" xml:space="preserve">
-    <value>5,0,0,0,0,85,Columns:0{Width:109;Name:"MyAnnotationType";Caption:"Type";AllowEditing:False;Style:"TextAlign:GeneralCenter;";}	1{Width:66;Name:"DTS";Caption:"Date";AllowEditing:False;Style:"Format:""d"";DataType:System.DateTime;TextAlign:LeftCenter;";}	2{Width:91;Name:"UserID";Caption:"User";AllowEditing:False;Style:"DataType:System.String;TextAlign:LeftCenter;";}	3{Name:"BrokenRules";Caption:"BrokenRules";Visible:False;AllowEditing:False;Style:"TextAlign:GeneralCenter;";}	4{Width:82;Name:"SearchText";Caption:"Description";AllowEditing:False;Style:"DataType:System.String;TextAlign:GeneralCenter;";}	</value>
-  </data>
   <metadata name="itemAnnotationsBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>156, 17</value>
   </metadata>
-  <data name="c1AnnotationGrid.StyleInfo" xml:space="preserve">
-    <value>Normal{Font:Microsoft Sans Serif, 8pt;BackColor:Transparent;WordWrap:False;}	Alternate{}	Fixed{BackColor:Control;ForeColor:ControlText;Border:Flat,1,ControlDark,Both;BackgroundImageLayout:Hide;}	Highlight{BackColor:Highlight;ForeColor:HighlightText;}	Focus{}	Editor{}	Search{BackColor:Highlight;ForeColor:HighlightText;}	Frozen{BackColor:Beige;}	NewRow{}	EmptyArea{BackColor:Transparent;Border:Flat,1,ControlDarkDark,Both;}	SelectedColumnHeader{}	SelectedRowHeader{}	GrandTotal{BackColor:Black;ForeColor:White;}	Subtotal0{BackColor:ControlDarkDark;ForeColor:White;}	Subtotal1{BackColor:ControlDarkDark;ForeColor:White;}	Subtotal2{BackColor:ControlDarkDark;ForeColor:White;}	Subtotal3{BackColor:ControlDarkDark;ForeColor:White;}	Subtotal4{BackColor:ControlDarkDark;ForeColor:White;}	Subtotal5{BackColor:ControlDarkDark;ForeColor:White;}	</value>
-  </data>
   <data name="btnSrchRslt.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -3662,8 +3656,8 @@
   <data name="btnSimStpsRslt.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAKRJREFUOE/NlNEOgCAIRcv55P//ay8u61owJE03aavGJgInuC7XlNJi+gBoaaawPK1l
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA
+        EnABIZuYagAAAKRJREFUOE/NlNEOgCAIRcv55P//ay8u61owJE03aavGJgInuC7XlNJi+gBoaaawPK1l
         dwUwuLBpO8XgtxbHHmfc0nGH3vkU98hGACqAL+NYFzk9YP5AvIoArQGLnBEgCuSoukPEyegsmiPXivUe
         +YB2gVrTN38YKCF6rf1mh1IXWmM0Aug4xYZGNulQCi0PYVrD6VNu/Vqj+w8NrS6J726b33Z4AFzeFLS3
         F5viAAAAAElFTkSuQmCC
@@ -3672,15 +3666,15 @@
   <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>402, 17</value>
   </metadata>
+  <metadata name="tmrTreeView.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>499, 17</value>
+  </metadata>
   <data name="buttonItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhFAAUAPEAAAAAAP///////wAAACH5BAEAAAIALAAAAAAUABQAAAIjlI+py20AoUOxThFPdpKC
         2WkfN4pguJFVeabXC8fyTNf2bRcAOw==
 </value>
   </data>
-  <metadata name="tmrTreeView.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>499, 17</value>
-  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>41</value>
   </metadata>