diff --git a/PROMS/VEPROMS User Interface/Resources/Admin.png b/PROMS/VEPROMS User Interface/Resources/Admin.png new file mode 100644 index 00000000..4cbf2550 Binary files /dev/null and b/PROMS/VEPROMS User Interface/Resources/Admin.png differ diff --git a/PROMS/VEPROMS User Interface/Resources/Save.png b/PROMS/VEPROMS User Interface/Resources/Save.png new file mode 100644 index 00000000..0e6ace89 Binary files /dev/null and b/PROMS/VEPROMS User Interface/Resources/Save.png differ diff --git a/PROMS/VEPROMS User Interface/Resources/SaveAllHS.png b/PROMS/VEPROMS User Interface/Resources/SaveAllHS.png new file mode 100644 index 00000000..7bde10a6 Binary files /dev/null and b/PROMS/VEPROMS User Interface/Resources/SaveAllHS.png differ diff --git a/PROMS/VEPROMS User Interface/Resources/SaveAs.png b/PROMS/VEPROMS User Interface/Resources/SaveAs.png new file mode 100644 index 00000000..33b7f93e Binary files /dev/null and b/PROMS/VEPROMS User Interface/Resources/SaveAs.png differ diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index 02e5f11a..050823f2 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -92,9 +92,6 @@ namespace VEPROMS this.tv = new Volian.Controls.Library.vlnTreeView(); this.infoPanel = new DevComponents.DotNetBar.ExpandablePanel(); this.infoTabs = new DevComponents.DotNetBar.TabControl(); - this.infotabControlPanelRO = new DevComponents.DotNetBar.TabControlPanel(); - this.displayRO = new Volian.Controls.Library.DisplayRO(); - this.infotabRO = new DevComponents.DotNetBar.TabItem(this.components); this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.groupPanel4 = new DevComponents.DotNetBar.Controls.GroupPanel(); @@ -109,6 +106,9 @@ namespace VEPROMS this.txbChgMsg2 = new DevComponents.DotNetBar.Controls.TextBoxX(); this.checkBoxX1 = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.infotabTags = new DevComponents.DotNetBar.TabItem(this.components); + this.infotabControlPanelRO = new DevComponents.DotNetBar.TabControlPanel(); + this.displayRO = new Volian.Controls.Library.DisplayRO(); + this.infotabRO = new DevComponents.DotNetBar.TabItem(this.components); this.infotabControlPanelTransitions = new DevComponents.DotNetBar.TabControlPanel(); this.displayTransition = new Volian.Controls.Library.DisplayTransition(); this.infotabTransition = new DevComponents.DotNetBar.TabItem(this.components); @@ -125,13 +125,6 @@ namespace VEPROMS this.itemAnnotationsBindingSource = new System.Windows.Forms.BindingSource(this.components); this.searchPanel = new DevComponents.DotNetBar.ExpandablePanel(); this.searchTabControl = new DevComponents.DotNetBar.TabControl(); - this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel(); - this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); - this.lbxBookMarks = new System.Windows.Forms.ListBox(); - this.btnClrBookMrks = new DevComponents.DotNetBar.ButtonX(); - this.btnRmvCurBookMrk = new DevComponents.DotNetBar.ButtonX(); - this.btnSetBookMrk = new DevComponents.DotNetBar.ButtonX(); - this.infotabBookMarks = new DevComponents.DotNetBar.TabItem(this.components); this.annotationSearch = new DevComponents.DotNetBar.TabControlPanel(); this.navpaneResults = new DevComponents.DotNetBar.NavigationPane(); this.navpanSrchRslts = new DevComponents.DotNetBar.NavigationPanePanel(); @@ -139,29 +132,36 @@ namespace VEPROMS this.navigationPanePanel3 = new DevComponents.DotNetBar.NavigationPanePanel(); this.btnSimStpsRslt = new DevComponents.DotNetBar.ButtonItem(); this.infotabResults = new DevComponents.DotNetBar.TabItem(this.components); + this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel(); + this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); + this.lbxBookMarks = new System.Windows.Forms.ListBox(); + this.btnClrBookMrks = new DevComponents.DotNetBar.ButtonX(); + this.btnRmvCurBookMrk = new DevComponents.DotNetBar.ButtonX(); + this.btnSetBookMrk = new DevComponents.DotNetBar.ButtonX(); + this.infotabBookMarks = new DevComponents.DotNetBar.TabItem(this.components); ((System.ComponentModel.ISupportInitialize)(this.bottomBar)).BeginInit(); this.epAnnotations.SuspendLayout(); this.expandablePanel2.SuspendLayout(); this.infoPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.infoTabs)).BeginInit(); this.infoTabs.SuspendLayout(); - this.infotabControlPanelRO.SuspendLayout(); this.tabControlPanel1.SuspendLayout(); this.panelEx1.SuspendLayout(); this.groupPanel4.SuspendLayout(); this.groupPanel3.SuspendLayout(); this.groupPanel2.SuspendLayout(); this.groupPanel1.SuspendLayout(); + this.infotabControlPanelRO.SuspendLayout(); this.infotabControlPanelTransitions.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.itemAnnotationsBindingSource)).BeginInit(); this.searchPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.searchTabControl)).BeginInit(); this.searchTabControl.SuspendLayout(); - this.tabControlPanel2.SuspendLayout(); - this.panelEx3.SuspendLayout(); this.annotationSearch.SuspendLayout(); this.navpaneResults.SuspendLayout(); this.navpanSrchRslts.SuspendLayout(); + this.tabControlPanel2.SuspendLayout(); + this.panelEx3.SuspendLayout(); this.SuspendLayout(); // // ribbonControl1 @@ -242,6 +242,7 @@ namespace VEPROMS this.office2007StartButton1.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.itemContainer1}); this.office2007StartButton1.Text = "&File"; + this.office2007StartButton1.Click += new System.EventHandler(this.office2007StartButton1_Click); // // itemContainer1 // @@ -311,7 +312,7 @@ namespace VEPROMS // btnSave // this.btnSave.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btnSave.Image = global::VEPROMS.Properties.Resources.Save1; + this.btnSave.Image = global::VEPROMS.Properties.Resources.Save; this.btnSave.ImageListSizeSelection = DevComponents.DotNetBar.eButtonImageListSelection.NotSet; this.btnSave.ImagePaddingHorizontal = 8; this.btnSave.Name = "btnSave"; @@ -322,7 +323,7 @@ namespace VEPROMS // btnSaveAs // this.btnSaveAs.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btnSaveAs.Image = global::VEPROMS.Properties.Resources.SaveAs1; + this.btnSaveAs.Image = global::VEPROMS.Properties.Resources.SaveAs; this.btnSaveAs.ImageListSizeSelection = DevComponents.DotNetBar.eButtonImageListSelection.NotSet; this.btnSaveAs.ImagePaddingHorizontal = 8; this.btnSaveAs.Name = "btnSaveAs"; @@ -352,7 +353,7 @@ namespace VEPROMS // btnAdmin // this.btnAdmin.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btnAdmin.Image = global::VEPROMS.Properties.Resources.Admin1; + this.btnAdmin.Image = global::VEPROMS.Properties.Resources.Admin; this.btnAdmin.ImageListSizeSelection = DevComponents.DotNetBar.eButtonImageListSelection.NotSet; this.btnAdmin.ImagePaddingHorizontal = 8; this.btnAdmin.Name = "btnAdmin"; @@ -574,7 +575,7 @@ namespace VEPROMS this.btnSetLock, this.btnReleaseLck}); this.superTooltip1.SetSuperTooltip(this.btnLckUlck, new DevComponents.DotNetBar.SuperTooltipInfo("Procedure Lock", "", "This will allow you to set or remove a lock on the current procedure. The button" + - " tells you the current lock status.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); + " tells you the current lock status.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.btnLckUlck.Text = "Unlocked"; // // btnSetLock @@ -691,7 +692,7 @@ namespace VEPROMS this.btnMarkPrevPos.Name = "btnMarkPrevPos"; this.btnMarkPrevPos.PopupSide = DevComponents.DotNetBar.ePopupSide.Top; this.superTooltip1.SetSuperTooltip(this.btnMarkPrevPos, new DevComponents.DotNetBar.SuperTooltipInfo("Simple Bookmark", "", "Mark your current positon and/or jump to the previously marked position. Note th" + - "at markking the the current position will also add to the list of bookmarks", null, null, DevComponents.DotNetBar.eTooltipColor.System)); + "at markking the the current position will also add to the list of bookmarks", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.btnMarkPrevPos.Text = "BookMark"; this.btnMarkPrevPos.Click += new System.EventHandler(this.btnMarkPrevPos_Click); // @@ -713,7 +714,7 @@ namespace VEPROMS this.btnPrevPos.Name = "btnPrevPos"; this.btnPrevPos.PopupSide = DevComponents.DotNetBar.ePopupSide.Top; this.superTooltip1.SetSuperTooltip(this.btnPrevPos, new DevComponents.DotNetBar.SuperTooltipInfo("Simple Bookmark", "", "Mark your current positon and/or jump to the previously marked position. Note th" + - "at markking the the current position will also add to the list of bookmarks", null, null, DevComponents.DotNetBar.eTooltipColor.System)); + "at markking the the current position will also add to the list of bookmarks", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.btnPrevPos.Text = "Previous Positon"; this.btnPrevPos.Click += new System.EventHandler(this.btnPrevPos_Click); // @@ -731,7 +732,7 @@ namespace VEPROMS this.btnGetRoVals.ImagePaddingHorizontal = 8; this.btnGetRoVals.Name = "btnGetRoVals"; this.superTooltip1.SetSuperTooltip(this.btnGetRoVals, new DevComponents.DotNetBar.SuperTooltipInfo("Update Referenced Object Values", "", "This will update the RO Values in this procedure set.\r\n\r\nThis button will become " + - "active when new Referenced Object Values are available.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); + "active when new Referenced Object Values are available.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.btnGetRoVals.Text = "Update RO Values"; // // epAnnotations @@ -769,13 +770,13 @@ namespace VEPROMS // ctrlAnnotationDetails // this.ctrlAnnotationDetails.AnnotationRTFText = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang1033{\\fonttbl{\\f0\\fnil\\fcharset0 Microsoft S" + - "ans Serif;}}\r\n\\viewkind4\\uc1\\pard\\f0\\fs20\\par\r\n}\r\n"; + "ans Serif;}}\r\n\\viewkind4\\uc1\\pard\\f0\\fs20\\par\r\n}\r\n"; this.ctrlAnnotationDetails.Annotations = null; this.ctrlAnnotationDetails.AnnotationText = ""; this.ctrlAnnotationDetails.CurrentAnnotation = null; this.ctrlAnnotationDetails.Dock = System.Windows.Forms.DockStyle.Fill; this.ctrlAnnotationDetails.Location = new System.Drawing.Point(0, 26); - this.ctrlAnnotationDetails.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ctrlAnnotationDetails.Margin = new System.Windows.Forms.Padding(2); this.ctrlAnnotationDetails.Name = "ctrlAnnotationDetails"; this.ctrlAnnotationDetails.Size = new System.Drawing.Size(1114, 0); this.ctrlAnnotationDetails.TabIndex = 15; @@ -796,7 +797,7 @@ namespace VEPROMS this.btnAnnoDetailsPushPin.ShowSubItems = false; this.btnAnnoDetailsPushPin.Size = new System.Drawing.Size(27, 23); this.superTooltip1.SetSuperTooltip(this.btnAnnoDetailsPushPin, new DevComponents.DotNetBar.SuperTooltipInfo("Annotation Details Push Pin", "", "This will toggle between keeping the Annotation Details window opened or to open/" + - "close automatically.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + "close automatically.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.btnAnnoDetailsPushPin.TabIndex = 14; this.btnAnnoDetailsPushPin.ThemeAware = true; // @@ -894,42 +895,6 @@ namespace VEPROMS this.infoTabs.Text = "tabControl1"; this.infoTabs.ThemeAware = true; // - // infotabControlPanelRO - // - this.infotabControlPanelRO.Controls.Add(this.displayRO); - this.infotabControlPanelRO.Dock = System.Windows.Forms.DockStyle.Fill; - this.infotabControlPanelRO.Location = new System.Drawing.Point(0, 0); - this.infotabControlPanelRO.Name = "infotabControlPanelRO"; - this.infotabControlPanelRO.Padding = new System.Windows.Forms.Padding(1); - this.infotabControlPanelRO.Size = new System.Drawing.Size(3, 431); - this.infotabControlPanelRO.Style.BackColor1.Color = System.Drawing.SystemColors.Control; - this.infotabControlPanelRO.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.infotabControlPanelRO.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) - | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.infotabControlPanelRO.Style.GradientAngle = 180; - this.infotabControlPanelRO.TabIndex = 4; - this.infotabControlPanelRO.TabItem = this.infotabRO; - this.infotabControlPanelRO.ThemeAware = true; - // - // displayRO - // - this.displayRO.CurROLink = null; - this.displayRO.Dock = System.Windows.Forms.DockStyle.Fill; - this.displayRO.Location = new System.Drawing.Point(1, 1); - this.displayRO.Margin = new System.Windows.Forms.Padding(4); - this.displayRO.MyROFST = null; - this.displayRO.MyRTB = null; - this.displayRO.Name = "displayRO"; - this.displayRO.Size = new System.Drawing.Size(1, 429); - this.displayRO.TabIndex = 0; - // - // infotabRO - // - this.infotabRO.AttachedControl = this.infotabControlPanelRO; - this.infotabRO.Name = "infotabRO"; - this.infotabRO.Text = "RO"; - this.infotabRO.Click += new System.EventHandler(this.infotabRO_Click); - // // tabControlPanel1 // this.tabControlPanel1.Controls.Add(this.panelEx1); @@ -941,7 +906,7 @@ namespace VEPROMS this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) - | DevComponents.DotNetBar.eBorderSide.Bottom))); + | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tabControlPanel1.Style.GradientAngle = 180; this.tabControlPanel1.TabIndex = 1; this.tabControlPanel1.TabItem = this.infotabTags; @@ -1004,10 +969,10 @@ namespace VEPROMS this.comboBoxEx1.DisplayMember = "Text"; this.comboBoxEx1.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxEx1.FormattingEnabled = true; - this.comboBoxEx1.ItemHeight = 14; + this.comboBoxEx1.ItemHeight = 17; this.comboBoxEx1.Location = new System.Drawing.Point(4, 20); this.comboBoxEx1.Name = "comboBoxEx1"; - this.comboBoxEx1.Size = new System.Drawing.Size(189, 20); + this.comboBoxEx1.Size = new System.Drawing.Size(189, 23); this.comboBoxEx1.TabIndex = 0; this.comboBoxEx1.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.comboBoxEx1.WatermarkText = "select signoff / checkoff"; @@ -1154,7 +1119,7 @@ namespace VEPROMS this.txbChgMsg1.Location = new System.Drawing.Point(16, 38); this.txbChgMsg1.MaxLength = 3; this.txbChgMsg1.Name = "txbChgMsg1"; - this.txbChgMsg1.Size = new System.Drawing.Size(36, 20); + this.txbChgMsg1.Size = new System.Drawing.Size(36, 23); this.txbChgMsg1.TabIndex = 1; this.txbChgMsg1.WatermarkText = "XXX"; // @@ -1168,7 +1133,7 @@ namespace VEPROMS this.txbChgMsg2.Location = new System.Drawing.Point(16, 66); this.txbChgMsg2.MaxLength = 3; this.txbChgMsg2.Name = "txbChgMsg2"; - this.txbChgMsg2.Size = new System.Drawing.Size(36, 20); + this.txbChgMsg2.Size = new System.Drawing.Size(36, 23); this.txbChgMsg2.TabIndex = 2; this.txbChgMsg2.WatermarkText = "XXX"; // @@ -1187,6 +1152,42 @@ namespace VEPROMS this.infotabTags.Text = "Tags"; this.infotabTags.Visible = false; // + // infotabControlPanelRO + // + this.infotabControlPanelRO.Controls.Add(this.displayRO); + this.infotabControlPanelRO.Dock = System.Windows.Forms.DockStyle.Fill; + this.infotabControlPanelRO.Location = new System.Drawing.Point(0, 0); + this.infotabControlPanelRO.Name = "infotabControlPanelRO"; + this.infotabControlPanelRO.Padding = new System.Windows.Forms.Padding(1); + this.infotabControlPanelRO.Size = new System.Drawing.Size(3, 431); + this.infotabControlPanelRO.Style.BackColor1.Color = System.Drawing.SystemColors.Control; + this.infotabControlPanelRO.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.infotabControlPanelRO.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.infotabControlPanelRO.Style.GradientAngle = 180; + this.infotabControlPanelRO.TabIndex = 4; + this.infotabControlPanelRO.TabItem = this.infotabRO; + this.infotabControlPanelRO.ThemeAware = true; + // + // displayRO + // + this.displayRO.CurROLink = null; + this.displayRO.Dock = System.Windows.Forms.DockStyle.Fill; + this.displayRO.Location = new System.Drawing.Point(1, 1); + this.displayRO.Margin = new System.Windows.Forms.Padding(4); + this.displayRO.MyROFST = null; + this.displayRO.MyRTB = null; + this.displayRO.Name = "displayRO"; + this.displayRO.Size = new System.Drawing.Size(1, 429); + this.displayRO.TabIndex = 0; + // + // infotabRO + // + this.infotabRO.AttachedControl = this.infotabControlPanelRO; + this.infotabRO.Name = "infotabRO"; + this.infotabRO.Text = "RO"; + this.infotabRO.Click += new System.EventHandler(this.infotabRO_Click); + // // infotabControlPanelTransitions // this.infotabControlPanelTransitions.Controls.Add(this.displayTransition); @@ -1198,7 +1199,7 @@ namespace VEPROMS this.infotabControlPanelTransitions.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.infotabControlPanelTransitions.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.infotabControlPanelTransitions.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) - | DevComponents.DotNetBar.eBorderSide.Bottom))); + | DevComponents.DotNetBar.eBorderSide.Bottom))); this.infotabControlPanelTransitions.Style.GradientAngle = 180; this.infotabControlPanelTransitions.TabIndex = 5; this.infotabControlPanelTransitions.TabItem = this.infotabTransition; @@ -1362,7 +1363,7 @@ namespace VEPROMS // this.tc.Dock = System.Windows.Forms.DockStyle.Fill; this.tc.Location = new System.Drawing.Point(37, 57); - this.tc.Margin = new System.Windows.Forms.Padding(4); + this.tc.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tc.Name = "tc"; this.tc.SelectedDisplayTabItem = null; this.tc.Size = new System.Drawing.Size(720, 457); @@ -1418,8 +1419,8 @@ namespace VEPROMS // this.searchTabControl.BackColor = System.Drawing.Color.Transparent; this.searchTabControl.CanReorderTabs = true; - this.searchTabControl.Controls.Add(this.annotationSearch); this.searchTabControl.Controls.Add(this.tabControlPanel2); + this.searchTabControl.Controls.Add(this.annotationSearch); this.searchTabControl.Dock = System.Windows.Forms.DockStyle.Fill; this.searchTabControl.Location = new System.Drawing.Point(0, 26); this.searchTabControl.Name = "searchTabControl"; @@ -1434,97 +1435,6 @@ namespace VEPROMS this.searchTabControl.Text = "tabControl1"; this.searchTabControl.ThemeAware = true; // - // tabControlPanel2 - // - this.tabControlPanel2.Controls.Add(this.panelEx3); - this.tabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel2.Location = new System.Drawing.Point(0, 0); - this.tabControlPanel2.Name = "tabControlPanel2"; - this.tabControlPanel2.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel2.Size = new System.Drawing.Size(203, 431); - this.tabControlPanel2.Style.BackColor1.Color = System.Drawing.SystemColors.Control; - this.tabControlPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tabControlPanel2.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) - | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.tabControlPanel2.Style.GradientAngle = 180; - this.tabControlPanel2.TabIndex = 2; - this.tabControlPanel2.TabItem = this.infotabBookMarks; - this.tabControlPanel2.ThemeAware = true; - // - // panelEx3 - // - this.panelEx3.AutoScroll = true; - this.panelEx3.CanvasColor = System.Drawing.SystemColors.Control; - this.panelEx3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.panelEx3.Controls.Add(this.lbxBookMarks); - this.panelEx3.Controls.Add(this.btnClrBookMrks); - this.panelEx3.Controls.Add(this.btnRmvCurBookMrk); - this.panelEx3.Controls.Add(this.btnSetBookMrk); - this.panelEx3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panelEx3.Location = new System.Drawing.Point(1, 1); - this.panelEx3.Name = "panelEx3"; - this.panelEx3.Size = new System.Drawing.Size(201, 429); - this.panelEx3.Style.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx3.Style.BackColor1.Color = System.Drawing.Color.Transparent; - this.panelEx3.Style.BackColor2.Color = System.Drawing.Color.SlateGray; - this.panelEx3.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.panelEx3.Style.BorderColor.Color = System.Drawing.Color.Gray; - this.panelEx3.Style.ForeColor.Color = System.Drawing.Color.Transparent; - this.panelEx3.TabIndex = 3; - // - // lbxBookMarks - // - this.lbxBookMarks.Dock = System.Windows.Forms.DockStyle.Fill; - this.lbxBookMarks.FormattingEnabled = true; - this.lbxBookMarks.HorizontalScrollbar = true; - this.lbxBookMarks.Location = new System.Drawing.Point(0, 87); - this.lbxBookMarks.Name = "lbxBookMarks"; - this.lbxBookMarks.Size = new System.Drawing.Size(201, 342); - this.lbxBookMarks.TabIndex = 3; - this.lbxBookMarks.Click += new System.EventHandler(this.lbxBookMarks_Click); - // - // btnClrBookMrks - // - this.btnClrBookMrks.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnClrBookMrks.Dock = System.Windows.Forms.DockStyle.Top; - this.btnClrBookMrks.Location = new System.Drawing.Point(0, 58); - this.btnClrBookMrks.Name = "btnClrBookMrks"; - this.btnClrBookMrks.Size = new System.Drawing.Size(201, 29); - this.btnClrBookMrks.TabIndex = 2; - this.btnClrBookMrks.Text = "Clear ALL Bookmarks"; - this.btnClrBookMrks.ThemeAware = true; - this.btnClrBookMrks.Click += new System.EventHandler(this.btnClrBookMrks_Click); - // - // btnRmvCurBookMrk - // - this.btnRmvCurBookMrk.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnRmvCurBookMrk.Dock = System.Windows.Forms.DockStyle.Top; - this.btnRmvCurBookMrk.Location = new System.Drawing.Point(0, 29); - this.btnRmvCurBookMrk.Name = "btnRmvCurBookMrk"; - this.btnRmvCurBookMrk.Size = new System.Drawing.Size(201, 29); - this.btnRmvCurBookMrk.TabIndex = 1; - this.btnRmvCurBookMrk.Text = "Remove Bookmark"; - this.btnRmvCurBookMrk.ThemeAware = true; - this.btnRmvCurBookMrk.Click += new System.EventHandler(this.btnRmvCurBookMrk_Click); - // - // btnSetBookMrk - // - this.btnSetBookMrk.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnSetBookMrk.Dock = System.Windows.Forms.DockStyle.Top; - this.btnSetBookMrk.Location = new System.Drawing.Point(0, 0); - this.btnSetBookMrk.Name = "btnSetBookMrk"; - this.btnSetBookMrk.Size = new System.Drawing.Size(201, 29); - this.btnSetBookMrk.TabIndex = 0; - this.btnSetBookMrk.Text = "Set Bookmark"; - this.btnSetBookMrk.ThemeAware = true; - this.btnSetBookMrk.Click += new System.EventHandler(this.btnSetBookMrk_Click); - // - // infotabBookMarks - // - this.infotabBookMarks.AttachedControl = this.tabControlPanel2; - this.infotabBookMarks.Name = "infotabBookMarks"; - this.infotabBookMarks.Text = "BookMarks"; - // // annotationSearch // this.annotationSearch.Controls.Add(this.navpaneResults); @@ -1536,7 +1446,7 @@ namespace VEPROMS this.annotationSearch.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.annotationSearch.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.annotationSearch.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) - | DevComponents.DotNetBar.eBorderSide.Bottom))); + | DevComponents.DotNetBar.eBorderSide.Bottom))); this.annotationSearch.Style.GradientAngle = 180; this.annotationSearch.TabIndex = 3; this.annotationSearch.TabItem = this.infotabResults; @@ -1554,7 +1464,7 @@ namespace VEPROMS this.btnSimStpsRslt}); this.navpaneResults.Location = new System.Drawing.Point(1, 1); this.navpaneResults.Name = "navpaneResults"; - this.navpaneResults.NavigationBarHeight = 90; + this.navpaneResults.NavigationBarHeight = 64; this.navpaneResults.Padding = new System.Windows.Forms.Padding(1); this.navpaneResults.Size = new System.Drawing.Size(1, 429); this.navpaneResults.TabIndex = 0; @@ -1565,7 +1475,7 @@ namespace VEPROMS this.navpaneResults.TitlePanel.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.navpaneResults.TitlePanel.Location = new System.Drawing.Point(1, 1); this.navpaneResults.TitlePanel.Name = "panelTitle"; - this.navpaneResults.TitlePanel.Size = new System.Drawing.Size(199, 24); + this.navpaneResults.TitlePanel.Size = new System.Drawing.Size(0, 24); this.navpaneResults.TitlePanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.navpaneResults.TitlePanel.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; this.navpaneResults.TitlePanel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -1584,7 +1494,7 @@ namespace VEPROMS this.navpanSrchRslts.Location = new System.Drawing.Point(1, 25); this.navpanSrchRslts.Name = "navpanSrchRslts"; this.navpanSrchRslts.ParentItem = this.btnSrchRslt; - this.navpanSrchRslts.Size = new System.Drawing.Size(0, 313); + this.navpanSrchRslts.Size = new System.Drawing.Size(0, 339); this.navpanSrchRslts.Style.Alignment = System.Drawing.StringAlignment.Center; this.navpanSrchRslts.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.navpanSrchRslts.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; @@ -1598,9 +1508,9 @@ namespace VEPROMS this.CtrlAnnotationSearch.Dock = System.Windows.Forms.DockStyle.Fill; this.CtrlAnnotationSearch.LoadingList = false; this.CtrlAnnotationSearch.Location = new System.Drawing.Point(0, 0); - this.CtrlAnnotationSearch.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.CtrlAnnotationSearch.Margin = new System.Windows.Forms.Padding(2); this.CtrlAnnotationSearch.Name = "CtrlAnnotationSearch"; - this.CtrlAnnotationSearch.Size = new System.Drawing.Size(0, 313); + this.CtrlAnnotationSearch.Size = new System.Drawing.Size(0, 339); this.CtrlAnnotationSearch.TabIndex = 0; // // navigationPanePanel3 @@ -1609,7 +1519,7 @@ namespace VEPROMS this.navigationPanePanel3.Location = new System.Drawing.Point(1, 1); this.navigationPanePanel3.Name = "navigationPanePanel3"; this.navigationPanePanel3.ParentItem = this.btnSimStpsRslt; - this.navigationPanePanel3.Size = new System.Drawing.Size(0, 337); + this.navigationPanePanel3.Size = new System.Drawing.Size(0, 363); this.navigationPanePanel3.Style.Alignment = System.Drawing.StringAlignment.Center; this.navigationPanePanel3.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.navigationPanePanel3.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; @@ -1620,8 +1530,8 @@ namespace VEPROMS // // btnSimStpsRslt // - this.btnSimStpsRslt.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; this.btnSimStpsRslt.Image = ((System.Drawing.Image)(resources.GetObject("btnSimStpsRslt.Image"))); + this.btnSimStpsRslt.ImageFixedSize = new System.Drawing.Size(16, 16); this.btnSimStpsRslt.ImageListSizeSelection = DevComponents.DotNetBar.eButtonImageListSelection.NotSet; this.btnSimStpsRslt.ImagePaddingHorizontal = 8; this.btnSimStpsRslt.Name = "btnSimStpsRslt"; @@ -1634,9 +1544,101 @@ namespace VEPROMS this.infotabResults.Name = "infotabResults"; this.infotabResults.Text = "Search"; // + // tabControlPanel2 + // + this.tabControlPanel2.Controls.Add(this.panelEx3); + this.tabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControlPanel2.Location = new System.Drawing.Point(0, 0); + this.tabControlPanel2.Name = "tabControlPanel2"; + this.tabControlPanel2.Padding = new System.Windows.Forms.Padding(1); + this.tabControlPanel2.Size = new System.Drawing.Size(3, 431); + this.tabControlPanel2.Style.BackColor1.Color = System.Drawing.SystemColors.Control; + this.tabControlPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.tabControlPanel2.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.tabControlPanel2.Style.GradientAngle = 180; + this.tabControlPanel2.TabIndex = 2; + this.tabControlPanel2.TabItem = this.infotabBookMarks; + this.tabControlPanel2.ThemeAware = true; + // + // panelEx3 + // + this.panelEx3.AutoScroll = true; + this.panelEx3.CanvasColor = System.Drawing.SystemColors.Control; + this.panelEx3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.panelEx3.Controls.Add(this.lbxBookMarks); + this.panelEx3.Controls.Add(this.btnClrBookMrks); + this.panelEx3.Controls.Add(this.btnRmvCurBookMrk); + this.panelEx3.Controls.Add(this.btnSetBookMrk); + this.panelEx3.Dock = System.Windows.Forms.DockStyle.Fill; + this.panelEx3.Location = new System.Drawing.Point(1, 1); + this.panelEx3.Name = "panelEx3"; + this.panelEx3.Size = new System.Drawing.Size(1, 429); + this.panelEx3.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx3.Style.BackColor1.Color = System.Drawing.Color.Transparent; + this.panelEx3.Style.BackColor2.Color = System.Drawing.Color.SlateGray; + this.panelEx3.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.panelEx3.Style.BorderColor.Color = System.Drawing.Color.Gray; + this.panelEx3.Style.ForeColor.Color = System.Drawing.Color.Transparent; + this.panelEx3.TabIndex = 3; + // + // lbxBookMarks + // + this.lbxBookMarks.Dock = System.Windows.Forms.DockStyle.Fill; + this.lbxBookMarks.FormattingEnabled = true; + this.lbxBookMarks.HorizontalScrollbar = true; + this.lbxBookMarks.ItemHeight = 16; + this.lbxBookMarks.Location = new System.Drawing.Point(0, 87); + this.lbxBookMarks.Name = "lbxBookMarks"; + this.lbxBookMarks.Size = new System.Drawing.Size(1, 340); + this.lbxBookMarks.TabIndex = 3; + this.lbxBookMarks.Click += new System.EventHandler(this.lbxBookMarks_Click); + // + // btnClrBookMrks + // + this.btnClrBookMrks.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnClrBookMrks.Dock = System.Windows.Forms.DockStyle.Top; + this.btnClrBookMrks.Location = new System.Drawing.Point(0, 58); + this.btnClrBookMrks.Name = "btnClrBookMrks"; + this.btnClrBookMrks.Size = new System.Drawing.Size(1, 29); + this.btnClrBookMrks.TabIndex = 2; + this.btnClrBookMrks.Text = "Clear ALL Bookmarks"; + this.btnClrBookMrks.ThemeAware = true; + this.btnClrBookMrks.Click += new System.EventHandler(this.btnClrBookMrks_Click); + // + // btnRmvCurBookMrk + // + this.btnRmvCurBookMrk.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnRmvCurBookMrk.Dock = System.Windows.Forms.DockStyle.Top; + this.btnRmvCurBookMrk.Location = new System.Drawing.Point(0, 29); + this.btnRmvCurBookMrk.Name = "btnRmvCurBookMrk"; + this.btnRmvCurBookMrk.Size = new System.Drawing.Size(1, 29); + this.btnRmvCurBookMrk.TabIndex = 1; + this.btnRmvCurBookMrk.Text = "Remove Bookmark"; + this.btnRmvCurBookMrk.ThemeAware = true; + this.btnRmvCurBookMrk.Click += new System.EventHandler(this.btnRmvCurBookMrk_Click); + // + // btnSetBookMrk + // + this.btnSetBookMrk.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnSetBookMrk.Dock = System.Windows.Forms.DockStyle.Top; + this.btnSetBookMrk.Location = new System.Drawing.Point(0, 0); + this.btnSetBookMrk.Name = "btnSetBookMrk"; + this.btnSetBookMrk.Size = new System.Drawing.Size(1, 29); + this.btnSetBookMrk.TabIndex = 0; + this.btnSetBookMrk.Text = "Set Bookmark"; + this.btnSetBookMrk.ThemeAware = true; + this.btnSetBookMrk.Click += new System.EventHandler(this.btnSetBookMrk_Click); + // + // infotabBookMarks + // + this.infotabBookMarks.AttachedControl = this.tabControlPanel2; + this.infotabBookMarks.Name = "infotabBookMarks"; + this.infotabBookMarks.Text = "BookMarks"; + // // frmVEPROMS // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScroll = true; this.ClientSize = new System.Drawing.Size(824, 574); @@ -1661,24 +1663,24 @@ namespace VEPROMS this.infoPanel.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.infoTabs)).EndInit(); this.infoTabs.ResumeLayout(false); - this.infotabControlPanelRO.ResumeLayout(false); this.tabControlPanel1.ResumeLayout(false); this.panelEx1.ResumeLayout(false); this.groupPanel4.ResumeLayout(false); this.groupPanel3.ResumeLayout(false); this.groupPanel2.ResumeLayout(false); this.groupPanel1.ResumeLayout(false); + this.infotabControlPanelRO.ResumeLayout(false); this.infotabControlPanelTransitions.ResumeLayout(false); this.infotabControlPanelTransitions.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.itemAnnotationsBindingSource)).EndInit(); this.searchPanel.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.searchTabControl)).EndInit(); this.searchTabControl.ResumeLayout(false); - this.tabControlPanel2.ResumeLayout(false); - this.panelEx3.ResumeLayout(false); this.annotationSearch.ResumeLayout(false); this.navpaneResults.ResumeLayout(false); this.navpanSrchRslts.ResumeLayout(false); + this.tabControlPanel2.ResumeLayout(false); + this.panelEx3.ResumeLayout(false); this.ResumeLayout(false); } diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 5c55dae8..1c794600 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -902,9 +902,30 @@ namespace VEPROMS private void btnNew_Click(object sender, EventArgs e) { if (!expandablePanel2.Expanded) return; - // TODO: Need vlntreeview method to determine type + VETreeNode vtn = tv.SelectedNode as VETreeNode; + if (vtn == null) return; // nothing was selected. + if (btnNew.SubItems.Count > 0) return; // submenu will be displayed + vtn.Expand(); + + // Determine type of 'new' based on tree node's object type. The + // only options here are those that would not have created, based on + // containers, a submenu (see the office2007buttonstartbutton1_click code) + FolderInfo fi = vtn.VEObject as FolderInfo; + if (fi != null) + { + tv.tv_NodeNew(vlnTreeView.MenuSelections.Folder); + return; + } + + DocVersionInfo dvi = vtn.VEObject as DocVersionInfo; + if (dvi != null) + { + tv.tv_NodeNew(vlnTreeView.MenuSelections.Procedure); + return; + } + + // All other types are handled with sub-menus. - tv.tv_NodeNew(vlnTreeView.MenuSelections.None); } // TODO: DeleteMe //private void OpenNode(VETreeNode tn) @@ -1087,5 +1108,181 @@ namespace VEPROMS displayRO.CurROLink = args.MyLinkText.RoUsageid; // this is wrong - use for now. } #endregion + #region VButton_New + private void office2007StartButton1_Click(object sender, EventArgs e) + { + // If the V-Button is clicked, check to see what tree node is s selected + // to set up the New submenus. The New submenus are dependent on the type of + // object selected, i.e. folder, docversion, etc. + + // reset in case previous selection changed items. + btnNew.SubItems.Clear(); + btnNew.Enabled = true; + + VETreeNode vtn = tv.SelectedNode as VETreeNode; + if (vtn == null) return; + + vtn.Expand(); + + // Folders can have either folders & docversions, but + // not a mix. + FolderInfo fi = vtn.VEObject as FolderInfo; + if (fi != null) + { + if (fi.FolderDocVersionCount > 0) + { + btnNew.Enabled = false; + return; + } + // if at top, 'VE-PROMS', folder and childfolders below this only + // option is to create a new (sub)folder, i.e. no submenu items. + if (fi.ChildFolderCount > 0 && fi.MyParent==null) return; + //if (fi.ChildFolderCount == 0) // submenu folders/docversion + //{ + if (fi.MyParent != null) + { + ButtonItem fldbbtn = new ButtonItem("fldbtn", "Folder Before"); + ButtonItem fldabtn = new ButtonItem("fldabtn", "Folder After"); + btnNew.SubItems.Add(fldbbtn); + btnNew.SubItems.Add(fldabtn); + fldbbtn.Click += new EventHandler(fldbbtn_Click); + fldabtn.Click += new EventHandler(fldabtn_Click); + } + ButtonItem fldbtn = new ButtonItem("fldbtn", "Folder"); + btnNew.SubItems.Add(fldbtn); + fldbtn.Click += new EventHandler(fldbtn_Click); + if (fi.ChildFolderCount == 0) + { + ButtonItem dvbtn = new ButtonItem("dvbtn", "Document Version"); + btnNew.SubItems.Add(dvbtn); + dvbtn.Click += new EventHandler(dvbtn_Click); + } + return; + //} + } + + // DocVersions can only have procedures, so no sub-menu + DocVersionInfo dvi = vtn.VEObject as DocVersionInfo; + if (dvi != null) return; + + // Procedures can have a section added or a new procedure before + // or after. + ProcedureInfo pi = vtn.VEObject as ProcedureInfo; + if (pi != null) + { + ButtonItem pbbtn = new ButtonItem("pfbtn", "Procedure Before"); + ButtonItem pabtn = new ButtonItem("pabtn", "Procedure After"); + ButtonItem sctbtn = new ButtonItem("sctbtn", "Section"); + btnNew.SubItems.Add(pbbtn); + btnNew.SubItems.Add(pabtn); + btnNew.SubItems.Add(sctbtn); + pbbtn.Click += new EventHandler(pbbtn_Click); + pabtn.Click += new EventHandler(pabtn_Click); + sctbtn.Click += new EventHandler(sctbtn_Click); + return; + } + + // Sections can have sections before, after, new subsections & if is + // a step section, can have steps + SectionInfo si = vtn.VEObject as SectionInfo; + if (si != null) + { + ButtonItem sbbtn = new ButtonItem("sbbtn", "Section Before"); + ButtonItem sabtn = new ButtonItem("sabtn", "Section After"); + ButtonItem subbtn = new ButtonItem("subbtn", "SubSection"); + btnNew.SubItems.Add(sbbtn); + btnNew.SubItems.Add(sabtn); + btnNew.SubItems.Add(subbtn); + sbbtn.Click += new EventHandler(sbbtn_Click); + sabtn.Click += new EventHandler(sabtn_Click); + subbtn.Click += new EventHandler(subbtn_Click); + if (si.IsStepSection) + { + ButtonItem stpbtn = new ButtonItem("stpbtn", "New Step"); + btnNew.SubItems.Add(stpbtn); + stpbtn.Click += new EventHandler(stpbtn_Click); + } + return; + } + + // Steps can have steps before or after only. + StepInfo stpi = vtn.VEObject as StepInfo; + if (stpi != null) + { + ButtonItem stpbbtn = new ButtonItem("stpbbtn", "New Step Before"); + ButtonItem stpabtn = new ButtonItem("stpabtn", "New Step After"); + btnNew.SubItems.Add(stpbbtn); + btnNew.SubItems.Add(stpabtn); + stpbbtn.Click += new EventHandler(stpbbtn_Click); + stpabtn.Click += new EventHandler(stpabtn_Click); + return; + } + } + + void fldabtn_Click(object sender, EventArgs e) + { + tv.tv_NodeNew(vlnTreeView.MenuSelections.FolderAfter); + } + + void fldbbtn_Click(object sender, EventArgs e) + { + tv.tv_NodeNew(vlnTreeView.MenuSelections.FolderBefore); + } + + void stpabtn_Click(object sender, EventArgs e) + { + tv.tv_NodeNew(vlnTreeView.MenuSelections.StepAfter); + } + + void stpbbtn_Click(object sender, EventArgs e) + { + tv.tv_NodeNew(vlnTreeView.MenuSelections.StepBefore); + } + + void subbtn_Click(object sender, EventArgs e) + { + tv.tv_NodeNew(vlnTreeView.MenuSelections.Section); + } + + void sabtn_Click(object sender, EventArgs e) + { + tv.tv_NodeNew(vlnTreeView.MenuSelections.SectionAfter); + } + + void sbbtn_Click(object sender, EventArgs e) + { + tv.tv_NodeNew(vlnTreeView.MenuSelections.SectionBefore); + } + + void stpbtn_Click(object sender, EventArgs e) + { + tv.tv_NodeNew(vlnTreeView.MenuSelections.Step); + } + + void sctbtn_Click(object sender, EventArgs e) + { + tv.tv_NodeNew(vlnTreeView.MenuSelections.Section); + } + + void pabtn_Click(object sender, EventArgs e) + { + tv.tv_NodeNew(vlnTreeView.MenuSelections.ProcedureAfter); + } + + void pbbtn_Click(object sender, EventArgs e) + { + tv.tv_NodeNew(vlnTreeView.MenuSelections.ProcedureBefore); + } + + void dvbtn_Click(object sender, EventArgs e) + { + tv.tv_NodeNew(vlnTreeView.MenuSelections.DocVersion); + } + + void fldbtn_Click(object sender, EventArgs e) + { + tv.tv_NodeNew(vlnTreeView.MenuSelections.Folder); + } + #endregion } } diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.resx b/PROMS/VEPROMS User Interface/frmVEPROMS.resx index 343482f5..9ec1afd6 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.resx +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.resx @@ -121,8 +121,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEQAA - CxEBf2RfkQAAAjNJREFUOE+lk01rE1EUhvUf5CfkJxQFF66ydDloA1lGcNGFSnAhQRCHghAMakSKBktn + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEAAA + CxABrSO9dQAAAjNJREFUOE+lk01rE1EUhvUf5CfkJxQFF66ydDloA1lGcNGFSnAhQRCHghAMakSKBktn rIqNpDqb2hitHdFWi0gHazW2YZKWqGkzTa9OlX5oXs+5k8407cKFFw733Mt5n/Mxd/YD2PdfiwG7bWLG xZ3iMlJ3K+gdmENfvoyRV18obG9sh/i9vY7ceBNacQnVxia+r21BuJvkb+ByroSUZqH4erED5ANY/MBc hfOzBdMC1CFASXnGvmkJ2KstXOibxMiLsg/xAZx55VcLuglEkoBeAMQ6xwFVASRu8p1AhSBn0s86ARMf @@ -137,8 +137,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAldJREFUOE+Nk91PUnEYx4E27/sDuu2q7rrpos3mWv0BratWa2urluuiLaerC6cXsbHZ + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAldJREFUOE+Nk91PUnEYx4E27/sDuu2q7rrpos3mWv0BratWa2urluuiLaerC6cXsbHZ elHUWavmC9qAlR6zDA0wA6NA3gSBhMjMgyIICJ63b88PFhtCW2d7dn5n5/l+ns/vd3bUAFTs0k7EKosD l1qjUUmlkupQU5NKo5JVbReOqmtaGIDV/fEo3QBRAUoiUBAUZEsK0nsKtnIy2Pu2SZ61lPv/VnXBGkQZ KFI4v0/hooLtgoIUhTeyMlpGi+VqfhSvgdQAigKQo6kZNjWv4KMnBaM1CUc4C1cA5ZqYLKC1fbwKqQHs @@ -154,8 +154,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAo1JREFUOE+lke1LU2EYxu2v6D8IgkKIIMIg8kMtlRQjskkGc03NN1j2YpYFMYmpuTXn + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAo1JREFUOE+lke1LU2EYxu2v6D8IgkKIIMIg8kMtlRQjskkGc03NN1j2YpYFMYmpuTXn 0rItU8wyQ2TqamjpUGwYCr5sJtN0tXd1O9vZjjvr6rzk9ODHbngOz/1cz/27r+c+BwCk/FewgL2rotWB mjdreNjtxW2DF1LVEm7UT6C6ycRcE97lmu8clmrtkOtX0DjggmWZxJKLwqqXhsNF4sv0GpR6Cy5WGiC5 /1YA4gAy1TzkLx3omfSDZuV/sRWhsRmJc1kwHEP34DRyytogrjIkIRygRDOHZwNre0oBV4DEyfJJHJd9 @@ -172,8 +172,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEQAA - CxEBf2RfkQAAAwtJREFUOE99kmtMklEYx+t7a6v5qWYfal281Lob1rqoqSU0o0wzyxRDUUmszEkgmmFR + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEAAA + CxABrSO9dQAAAwtJREFUOE99kmtMklEYx+t7a6v5qWYfal281Lob1rqoqSU0o0wzyxRDUUmszEkgmmFR vhiCeAsSrAwnhWihfcjpcN106lRWK2GFU4c11zQTsP69L84vUj3b/5yd/Z/nt/M85ywFsIQKRV2rL7md IBUxNze3w+V2L3G53D1Ol6vNOevU3+az7J7ExUEB5FoTjZShpEUPeY8OZZZqyD4V4mJ7NJJKCWTmlxtS rhI0KnexqGJfqvjaMylufsjD86/t6J6xIk0ngOR9DpL0oQgrkuEMV2w4wc73/RuAl6dVIfnVLihtuTB9 @@ -218,8 +218,8 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASbgAA - Em4BzAbEXgAABEVJREFUWEfNV9tOlFcY/e56ZdMn6Cv4FD5AY7VWrVbFEyPtrRdNTJrGZ+g71BLjRdNo + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASbQAA + Em0BYb/lMwAABEVJREFUWEfNV9tOlFcY/e56ZdMn6Cv4FD5AY7VWrVbFEyPtrRdNTJrGZ+g71BLjRdNo bBPTtLYesCgUOXigOAKOMwNyHOBfXWvP/obNwGwghqQ7WSGBP986fN8+YPa/Wgdv1+zTX2GH7hC/wQ7/ DvvsLuzIX7DP78OOPiQewY71w44/gX0xSAzBTgzDTo4QY7Avn8NOvSDGa3Z64uTu/JH8wSTeGz8OApd/ Wsa+Uhl2prwLEXQ+8Abvjd5+4MD3wDc/N7Dv0hSsa2qHIhj7aA0B/1SAx9PAE0KiBgn9Thginr5tYjhi @@ -243,8 +243,8 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASbgAA - Em4BzAbEXgAAAz9JREFUWEftl2tIk2EUxyXCEs0Ki8hkVtrKCvxQGFSmeJnm1MQuQlJiikJSU3CaZm1K + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASbQAA + Em0BYb/lMwAAAz9JREFUWEftl2tIk2EUxyXCEs0Ki8hkVtrKCvxQGFSmeJnm1MQuQlJiikJSU3CaZm1K ZJhkyIRpk+UNRaRQW9GU3kRRIy+laB90rEiyqBRU1Ozy77yOvM3pPjxCHxz84GEMzm/nfc7ltbBY/fwP GUj0EboSMimP7yxJdE4SGUiei59Qds3AKSb+FJyryIqBtijNmGL6jqhbBBIYZibQ31mKP5Ma/B5RmQ0J gIkApZ3r71Tj50AMJtsszSbFXwjCgyeV56SB6/8IoDOxrOS0QEc+pj5GY/zVerNRxh1EgfQMHvAkzaKi @@ -264,8 +264,8 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASbgAA - Em4BzAbEXgAABadJREFUWEftl1lMVFcYx89r0xcf2jRp04cqBglqkYALiCAVClqkbMowwIDsy4gCFZfg + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASbQAA + Em0BYb/lMwAABadJREFUWEftl1lMVFcYx89r0xcf2jRp04cqBglqkYALiCAVClqkbMowwIDsy4gCFZfg aSIaGKgjRLHaugA6NdJqjAKJSy4FAkEFBCoWquBQBEQEBGWHf883Aqm5jQyEx97kl+Ee7ve/v/vdM5Nz GPv/mK0DXhJnPqVg2yvAFPfB/GrB/B+CBTaCqZ6ABevBdrSBhXSAhXWBhb8Ei+gDi+yXZos27v8+ZXyP rhU9g0DfMDAwArwZBQYFQ2PA8L+gcxovejguBF4vkMD2Sp6oe4YXb4CeobcS/ULi9ZTItAx9EiRYSAJR @@ -295,8 +295,8 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASbgAA - Em4BzAbEXgAACZZJREFUWEfFl2dUVFkWRhXDCJIzigTFbItSpjEHBIlFFAMCY+oxgmIYTCWhwVYEJSmI + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASbQAA + Em0BYb/lMwAACZZJREFUWEfFl2dUVFkWRhXDCJIzigTFbItSpjEHBIlFFAMCY+oxgmIYTCWhwVYEJSmI VYoBoUREQRAVxJwds20r2CYMQIFEbeWbc28JDoPMcvwzrHXWg6pX7+z3nX3vo1q3auEn3L6TULHNJyet 9rVjP9e3NvkEhVaf6lm1LqffD3+GwpbFmW9utfT573kdQPPTjnu2Nz82/S83V1t1hdhFE4c8lCCdrIxk NxUkuahB7KSBeEctxNjrYqudnvf3NGrpnGYABT5t1PK82sikHspYY90VyZNVkTmtAw5PUcTByR1xwF0F @@ -343,8 +343,8 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASbgAA - Em4BzAbEXgAAA8JJREFUWEftln1M1HUcx/kjCRE4EWiwllB/XKutteqPVqtsJfjEQzYqXVSuMFM3L4sH + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASbQAA + Em0BYb/lMwAAA8JJREFUWEftln1M1HUcx/kjCRE4EWiwllB/XKutteqPVqtsJfjEQzYqXVSuMFM3L4sH w+N+lE4nD00d8hAgSa6YMhK1MbHrcCytLSM2bOZIatacPcyJYFCxV+/fHXh33ulw+7n1h7e9tt/3e7f7 vu7z+Xw/94mIuPn6P0SgYK49RxiF6cEUaV2U4aM4kHl2Y50PmyX+OpyuXc7wtGhfHL6ClrI8JNBsiUCh BBj/lvGRVsaHGqfEwDGXKeCxRiDdFDjG6DeRU+bk3jjemW/vFXNMSkwW+FmvZy8LfTgX2u+/qqxyD/92 @@ -366,8 +366,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASbgAA - Em4BzAbEXgAAAt5JREFUOE990mlIFGEYwPEx61tEQfUlKoiCoMCgvnQa9KGIgm6prIgOrdUsu9Mao/uk + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASbQAA + Em0BYb/lMwAAAt5JREFUOE990mlIFGEYwPEx61tEQfUlKoiCoMCgvnQa9KGIgm6prIgOrdUsu9Mao/uk Qwm0UsotK0srLzowKDvddjfLbdXWaEjUckqzVdx1/j3jTkkEDfyZYdj39z7vsGGKec1/GKmEhU9VevRS lLCeitLDqus5PPQuzLyHf1cyh5zuWiMXYD0teKS6GuB/5VZAVHYHAzY1Zv4LLCpTa79DRSO4BXor98ov 4P0KVU1QrUNuucGYFIMl9gADN+tdSPcEUS/Uhp8CvCjFcSUFZ85eXDkpeF6V4vsGHwW/8dyg37IQEn01 @@ -385,8 +385,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASbgAA - Em4BzAbEXgAAAmVJREFUOE+lU1tsi2EY5u7//57Wrqtu7dodulI7VDY26RRzmLDZuLFgF+wCcdNLFxJ1 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASbQAA + Em0BYb/lMwAAAmVJREFUOE+lU1tsi2EY5u7//57Wrqtu7dodulI7VDY26RRzmLDZuLFgF+wCcdNLFxJ1 oavMeQkSMaeNYKMTyw5dpqWMOWQuiFo6P0NCikZiC0Me3/dVk7ZzIXzJ8+fL+/7v872H550OYNp/nRjB Dp4zEhzaI3C+GFwS3tdI4Iqz7eS50+S/RfRRFks/xKBwClykRcbhjJzHeZUMVzJScd2oRVeWFp2ZGlzS pOCcQmD+RoEDJYkncJwgwWeJs0OrQp85EwGrGUPz8nG/tACDJRb48nMYYZtKykh28ZwnnsBJje1aJQYs @@ -405,8 +405,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAghJREFUOE+lk9tLk2Ecx+u/6SJC6qbsACkRkUKUB7KxuVGapB1M8iKLlo1dlGHHQVrY + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAghJREFUOE+lk9tLk2Ecx+u/6SJC6qbsACkRkUKUB7KxuVGapB1M8iKLlo1dlGHHQVrY ykPmheTmYW2NuSydx3awZUg0DKqli9mmNbdPe15h8XaAjV743rw8n+/v9/3yPGuBNf/1CYN0ND3uOPJ+ xsOMx8WrEVsSWeXSgr2j9vJZ3xjR+TfEwz4SoZHMDPxTQ0SCXgK+fq6cr0B3RpWZwYTTTOKrC+2pkhSY UYRB0wMI9lOj3v13A6fJmGXvvovl0S162xrpMTbQbbxMV5OezmYd7YaLPLx9AeP1c7Q0nhXKkm1gfWxg @@ -421,8 +421,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASbgAA - Em4BzAbEXgAAAm5JREFUOE/V1N9PklEYB3D7j5oX4kYujUSwCeTCMBnzZy5/IqYU+PKC/MjUV0HBH6kY + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASbQAA + Em0BYb/lMwAAAm5JREFUOE/V1N9PklEYB3D7j5oX4kYujUSwCeTCMBnzZy5/IqYU+PKC/MjUV0HBH6kY hgqJFWWOdM1y1hxUyua8SC9aF82buugmHB6/Hd/WRbr2XuRN5+y5OtvnPM95zp4zADJOdR2BpxknsQx6 wV+2rKAAR/HH+bGE/kPQ631P3O446e1ZIw/DOyQY3CKBQJJMTn4g4+MJMjq6Try+14jFNsje3jdy/P1P lNzdvUJGRzbhsMcQjf7A2PgXDHo/oYf7CLtzG2Z2E7V1r6gD6HQjwqDLtUwGBtZhZZ9ibu47BnwU69uB @@ -438,8 +438,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASbgAA - Em4BzAbEXgAAAqJJREFUOE+11Nsz1GEcx3H9B/0j3XTRRTNNE2MoCjnFThMbOUeOG4vdikJb2ZyKqW21 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASbQAA + Em0BYb/lMwAAAqJJREFUOE+11Nsz1GEcx3H9B/0j3XTRRTNNE2MoCjnFThMbOUeOG4vdikJb2ZyKqW21 hUZc2MHKMK0I01iHQgwt5Vg5LbvsmHfLjFXTr67W75lnnovfzGs+n+eZ+R4CnBz67YCO3A7Fdtva0znZ kv5nnXZ3JyoiYqfP3+u3lgcPylUfeVg7hrrpyx9p9hKqtOMUVhlIVXbt/xdK+LRhlIyyXmSqIcybVqYX N6jvmNndOyX3wKHJdXQ9P5CVtHK7SIM4qcB2a/sPa6+saRxBqx9FUtKDZWubqtZpalrH6eifR1rylj1w @@ -456,8 +456,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDgAA - Cw4BQL7hQQAAAlRJREFUOE+lk+lLVFEYxuu/6UOE5IfKFkiJkJSiXMjEUUtN0solxTLJrflghq1TaWbj + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA + Cw0B7QfALAAAAlRJREFUOE+lk+lLVFEYxuu/6UOE5IfKFkiJkJSiXMjEUUtN0solxTLJrflghq1TaWbj mg4hOeNuw7iUe+bMuIVEYpBNaoy51Dj315wbqXeSCLrwfjmc5/c8z8u5W4Et//UJwMYZGTBFfZgwM2Hu 5W1PG10tz2nQFVFTnBfgflc233ho6TPGTFr7WZodx2m3Is33INlamB0t5UnBZQrzkg+7QxSAsaEuFm0W pqyN3MiIJTdFRVbiKaa7c5jpyyAnKcSlVyZWAAY7DEhfe8lMCCElym+XuHzptK9n2cPrSONppMUc/Tug @@ -473,8 +473,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAghJREFUOE+lk9tLk2Ecx+u/6SJC6qbsACkRkUKUB7KxuVGapB1M8iKLlo1dlGHHQVrY + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAghJREFUOE+lk9tLk2Ecx+u/6SJC6qbsACkRkUKUB7KxuVGapB1M8iKLlo1dlGHHQVrY ykPmheTmYW2NuSydx3awZUg0DKqli9mmNbdPe15h8XaAjV743rw8n+/v9/3yPGuBNf/1CYN0ND3uOPJ+ xsOMx8WrEVsSWeXSgr2j9vJZ3xjR+TfEwz4SoZHMDPxTQ0SCXgK+fq6cr0B3RpWZwYTTTOKrC+2pkhSY UYRB0wMI9lOj3v13A6fJmGXvvovl0S162xrpMTbQbbxMV5OezmYd7YaLPLx9AeP1c7Q0nhXKkm1gfWxg @@ -489,8 +489,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAkFJREFUOE9j/P//PwNFAGQAKTgvL48RWT1ezQ0NDVKFhYUC+CzAakBrS4t2Y2Pjkqam + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAkFJREFUOE9j/P//PwNFAGQAKTgvL48RWT1ezQ0NDVKFhYUC+CzAakBrS4t2Y2Pjkqam pjmTJ08uALI7QIZ0dXVxJyUlqYLY3d3dgmDvw0zv6OoFO621tVWytLR05Y4dO/7fvHnzzdevX38vWbLk f3FxsUFkZGRAXV1d7+nTp+uAhu8sKiriY2jv7OavqWvSamnrYu/qmSBRWV0dOm/+/A+/f/8Gmvf//67d u//fvHXrf2NT04KWlpZT58+f/wISP3bs2H+g94oZauvrw1evXT9ry9bty9vau47WNTQuW7Fy5f8XL178 @@ -506,8 +506,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAnlJREFUOE9j/P//PwMMVFZWsv/69StSQUEhWkVFxfnz58+Mz58//3j06NGL58+fX8rN + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAnlJREFUOE9j/P//PwMMVFZWsv/69StSQUEhWkVFxfnz58+Mz58//3j06NGL58+fX8rN zb34woUL3+EaQAyQAch4zZo1M1++fPkTKPb/y5cv/8+cOfO/ra3tv4GBwU5NTU1DR0dHZmT1KJqnT5/O unTp0kygAW8+fPjw/8qVK/9Xr179v7y84r+zs/NmXV1dfS1NTdwG5Ofn88bFxYVOnTr15Nq1a/+0tLT8 z83N++/r6/fS1NSs2tjEmA/dxRheSEtL401JSalesXLlG6Br/ufnF/wHar6lp29Q7eDkpIjXgNLSUuXq @@ -559,8 +559,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASbgAA - Em4BzAbEXgAAAKRJREFUOE/NlNEOgCAIRcv55P//ay8u61owJE03aavGJgInuC7XlNJi+gBoaaawPK1l + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASbQAA + Em0BYb/lMwAAAKRJREFUOE/NlNEOgCAIRcv55P//ay8u61owJE03aavGJgInuC7XlNJi+gBoaaawPK1l dwUwuLBpO8XgtxbHHmfc0nGH3vkU98hGACqAL+NYFzk9YP5AvIoArQGLnBEgCuSoukPEyegsmiPXivUe +YB2gVrTN38YKCF6rf1mh1IXWmM0Aug4xYZGNulQCi0PYVrD6VNu/Vqj+w8NrS6J726b33Z4AFzeFLS3 F5viAAAAAElFTkSuQmCC