diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index d4229291..2f676ab3 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -78,10 +78,8 @@ namespace VEPROMS this.labelItem9 = new DevComponents.DotNetBar.LabelItem(); this.lblEditView = new DevComponents.DotNetBar.LabelItem(); this.labelItem11 = new DevComponents.DotNetBar.LabelItem(); - this.btnMarkPrevPos = new DevComponents.DotNetBar.ButtonItem(); + this.btnBookMark = new DevComponents.DotNetBar.ButtonItem(); this.labelItem2 = new DevComponents.DotNetBar.LabelItem(); - this.btnPrevPos = new DevComponents.DotNetBar.ButtonItem(); - this.labelItem14 = new DevComponents.DotNetBar.LabelItem(); this.btnGetRoVals = new DevComponents.DotNetBar.ButtonItem(); this.labelItem1 = new DevComponents.DotNetBar.LabelItem(); this.btnItemInfo = new DevComponents.DotNetBar.ButtonItem(); @@ -116,11 +114,8 @@ namespace VEPROMS this.toolstabResults = 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); + this.displayBookMarks = new Volian.Controls.Library.DisplayBookMarks(); + this.toolsTabBookMarks = new DevComponents.DotNetBar.TabItem(this.components); this.tabControlPanelLD = new DevComponents.DotNetBar.TabControlPanel(); this.displayLibDocs = new Volian.Controls.Library.DisplayLibDocs(); this.tabItemLibDocs = new DevComponents.DotNetBar.TabItem(this.components); @@ -438,10 +433,8 @@ namespace VEPROMS this.labelItem9, this.lblEditView, this.labelItem11, - this.btnMarkPrevPos, + this.btnBookMark, this.labelItem2, - this.btnPrevPos, - this.labelItem14, this.btnGetRoVals, this.labelItem1, this.btnItemInfo}); @@ -561,6 +554,7 @@ namespace VEPROMS this.btnOverstrikeMode}); this.superTooltip1.SetSuperTooltip(this.btnInsOvr, new DevComponents.DotNetBar.SuperTooltipInfo("Insert / Overstrke Modes", "", "Select Insert or Overstrike Text Editing Modes", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.btnInsOvr.Text = "INS"; + this.btnInsOvr.Visible = false; // // btnInsertMode // @@ -593,19 +587,19 @@ namespace VEPROMS this.labelItem11.BorderType = DevComponents.DotNetBar.eBorderType.Bump; this.labelItem11.Name = "labelItem11"; // - // btnMarkPrevPos + // btnBookMark // - this.btnMarkPrevPos.AutoExpandOnClick = true; - this.btnMarkPrevPos.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btnMarkPrevPos.ForeColor = System.Drawing.Color.Black; - this.btnMarkPrevPos.GlobalName = "SetBookMark"; - this.btnMarkPrevPos.Image = ((System.Drawing.Image)(resources.GetObject("btnMarkPrevPos.Image"))); - 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)); - this.btnMarkPrevPos.Text = "BookMark"; - this.btnMarkPrevPos.Click += new System.EventHandler(this.btnMarkPrevPos_Click); + this.btnBookMark.AutoExpandOnClick = true; + this.btnBookMark.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btnBookMark.ForeColor = System.Drawing.Color.Black; + this.btnBookMark.GlobalName = "SetBookMark"; + this.btnBookMark.Image = ((System.Drawing.Image)(resources.GetObject("btnBookMark.Image"))); + this.btnBookMark.Name = "btnBookMark"; + this.btnBookMark.PopupSide = DevComponents.DotNetBar.ePopupSide.Top; + this.superTooltip1.SetSuperTooltip(this.btnBookMark, new DevComponents.DotNetBar.SuperTooltipInfo("Bookmark", "", "Adds the the current position to the list of bookmarks and displays the bookmark " + + "list if it is not currently displayed.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); + this.btnBookMark.Text = "BookMark"; + this.btnBookMark.Click += new System.EventHandler(this.btnBookMark_Click); // // labelItem2 // @@ -613,26 +607,6 @@ namespace VEPROMS this.labelItem2.BorderType = DevComponents.DotNetBar.eBorderType.Bump; this.labelItem2.Name = "labelItem2"; // - // btnPrevPos - // - this.btnPrevPos.AutoExpandOnClick = true; - this.btnPrevPos.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btnPrevPos.Enabled = false; - this.btnPrevPos.ForeColor = System.Drawing.Color.Black; - this.btnPrevPos.Image = ((System.Drawing.Image)(resources.GetObject("btnPrevPos.Image"))); - 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)); - this.btnPrevPos.Text = "Previous Positon"; - this.btnPrevPos.Click += new System.EventHandler(this.btnPrevPos_Click); - // - // labelItem14 - // - this.labelItem14.BorderSide = DevComponents.DotNetBar.eBorderSide.Left; - this.labelItem14.BorderType = DevComponents.DotNetBar.eBorderType.Bump; - this.labelItem14.Name = "labelItem14"; - // // btnGetRoVals // this.btnGetRoVals.Enabled = false; @@ -931,7 +905,7 @@ namespace VEPROMS 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, 4, 4, 4); + this.displayRO.Margin = new System.Windows.Forms.Padding(4); this.displayRO.Mydvi = null; this.displayRO.MyROFST = null; this.displayRO.MyRTB = null; @@ -1116,7 +1090,7 @@ namespace VEPROMS this.toolsTabs.TabIndex = 1; this.toolsTabs.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; this.toolsTabs.Tabs.Add(this.toolstabResults); - this.toolsTabs.Tabs.Add(this.infotabBookMarks); + this.toolsTabs.Tabs.Add(this.toolsTabBookMarks); this.toolsTabs.Tabs.Add(this.tabItemLibDocs); this.toolsTabs.Text = "tabControl1"; this.toolsTabs.ThemeAware = true; @@ -1174,7 +1148,7 @@ namespace VEPROMS | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tabControlPanel2.Style.GradientAngle = 180; this.tabControlPanel2.TabIndex = 2; - this.tabControlPanel2.TabItem = this.infotabBookMarks; + this.tabControlPanel2.TabItem = this.toolsTabBookMarks; this.tabControlPanel2.ThemeAware = true; // // panelEx3 @@ -1182,10 +1156,7 @@ namespace VEPROMS 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.Controls.Add(this.displayBookMarks); this.panelEx3.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx3.Location = new System.Drawing.Point(1, 1); this.panelEx3.Name = "panelEx3"; @@ -1198,59 +1169,21 @@ namespace VEPROMS this.panelEx3.Style.ForeColor.Color = System.Drawing.Color.Transparent; this.panelEx3.TabIndex = 3; // - // lbxBookMarks + // displayBookMarks // - 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(314, 548); - this.lbxBookMarks.TabIndex = 3; - this.lbxBookMarks.Click += new System.EventHandler(this.lbxBookMarks_Click); + this.displayBookMarks.Dock = System.Windows.Forms.DockStyle.Fill; + this.displayBookMarks.Location = new System.Drawing.Point(0, 0); + this.displayBookMarks.MyDisplayTabControl = null; + this.displayBookMarks.MyRTB = null; + this.displayBookMarks.Name = "displayBookMarks"; + this.displayBookMarks.Size = new System.Drawing.Size(314, 635); + this.displayBookMarks.TabIndex = 0; // - // btnClrBookMrks + // toolsTabBookMarks // - 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(314, 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(314, 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(314, 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"; + this.toolsTabBookMarks.AttachedControl = this.tabControlPanel2; + this.toolsTabBookMarks.Name = "toolsTabBookMarks"; + this.toolsTabBookMarks.Text = "BookMarks"; // // tabControlPanelLD // @@ -1438,14 +1371,12 @@ namespace VEPROMS private DevComponents.DotNetBar.LabelItem labelItem10; private DevComponents.DotNetBar.LabelItem labelItem11; private DevComponents.DotNetBar.SuperTooltip superTooltip1; - private DevComponents.DotNetBar.ButtonItem btnMarkPrevPos; - private DevComponents.DotNetBar.ButtonItem btnPrevPos; + private DevComponents.DotNetBar.ButtonItem btnBookMark; private DevComponents.DotNetBar.LabelItem labelItem2; private DevComponents.DotNetBar.LabelItem labelItem13; private DevComponents.DotNetBar.ButtonItem btnLckUlck; private DevComponents.DotNetBar.ButtonItem btnSetLock; private DevComponents.DotNetBar.ButtonItem btnReleaseLck; - private DevComponents.DotNetBar.LabelItem labelItem14; private DevComponents.DotNetBar.ButtonItem btnGetRoVals; private System.Windows.Forms.BindingSource itemAnnotationsBindingSource; @@ -1506,11 +1437,7 @@ namespace VEPROMS private DevComponents.DotNetBar.TabItem toolstabResults; private DevComponents.DotNetBar.TabControlPanel tabControlPanel2; private DevComponents.DotNetBar.PanelEx panelEx3; - private System.Windows.Forms.ListBox lbxBookMarks; - private DevComponents.DotNetBar.ButtonX btnClrBookMrks; - private DevComponents.DotNetBar.ButtonX btnRmvCurBookMrk; - private DevComponents.DotNetBar.ButtonX btnSetBookMrk; - private DevComponents.DotNetBar.TabItem infotabBookMarks; + private DevComponents.DotNetBar.TabItem toolsTabBookMarks; private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter4; private DevComponents.DotNetBar.TabControlPanel tabControlPanelLD; private Volian.Controls.Library.DisplayLibDocs displayLibDocs; @@ -1520,6 +1447,7 @@ namespace VEPROMS private DevComponents.DotNetBar.LabelItem lblEditView; private DevComponents.DotNetBar.LabelItem labelItem1; private DevComponents.DotNetBar.ButtonItem btnItemInfo; + private Volian.Controls.Library.DisplayBookMarks displayBookMarks; } } diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 6124bf3f..52325d9f 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -28,7 +28,6 @@ namespace VEPROMS private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); #endregion Color _CommentTitleBckColor; - VETreeNode _PrevBookMark = null; DocVersionInfo _SelectedDVI = null; StepTabPanel _SelectedStepTabPanel=null; public StepTabPanel SelectedStepTabPanel @@ -109,7 +108,6 @@ namespace VEPROMS toolsPanel.Expanded = false; ribbonControl1.ExpandedChanged +=new EventHandler(ribbonControl1_ExpandedChanged); } - private void frmVEPROMS_FormClosing(object sender, FormClosingEventArgs e) { @@ -130,12 +128,11 @@ namespace VEPROMS if (Settings.Default["Size"] != null) this.Size = Settings.Default.Size; if (Settings.Default["WindowState"] != null) this.WindowState = Settings.Default.WindowState; _MyMRIList = MostRecentItemList.GetMRILst((System.Collections.Specialized.StringCollection)(Properties.Settings.Default["MRIList"])); - _MyBookMarks = MostRecentItemList.GetMRILst((System.Collections.Specialized.StringCollection)(Properties.Settings.Default["BookMarks"])); SetupMRU(); - SetupBookMarks(); displaySearch1.SetupAnnotationSearch(ctrlAnnotationDetails, tc); ctrlAnnotationDetails.SetupAnnotations(displaySearch1); SetupButtons(); + displayBookMarks.MyDisplayTabControl = tc; // allows bookmark selection to bring up steps/docs } private void SetupButtons() { @@ -146,20 +143,6 @@ namespace VEPROMS } #region MRU private MostRecentItemList _MyMRIList; - private MostRecentItemList _MyBookMarks; - private void SetupBookMarks() - { - lbxBookMarks.SelectedValueChanged += new EventHandler(lbxBookMarks_SelectedValueChanged); - RefreshBookMarkData(); - btnPrevPos.Enabled = false; - //lbxBookMarks.Enabled = false; - _PrevBookMark = null; - } - - void lbxBookMarks_SelectedValueChanged(object sender, EventArgs e) - { - btnRmvCurBookMrk.Enabled = (lbxBookMarks.SelectedIndex >= 0); - } private void SetupMRU() { icRecentDocs.SubItems.Clear(); @@ -202,7 +185,6 @@ namespace VEPROMS private void SaveMRU() { Properties.Settings.Default.MRIList = _MyMRIList.ToSettings(); - Properties.Settings.Default.BookMarks = _MyBookMarks.ToSettings(); Properties.Settings.Default.Save(); } #endregion @@ -589,56 +571,14 @@ namespace VEPROMS /// /// /// - private void btnMarkPrevPos_Click(object sender, EventArgs e) + private void btnBookMark_Click(object sender, EventArgs e) { - btnSetBookMrk_Click(sender, e); + if (SelectedStepTabPanel == null||SelectedStepTabPanel.MyStepPanel==null||SelectedStepTabPanel.MyStepPanel.SelectedStepItem==null) return; + displayBookMarks.AddBookMark(SelectedStepTabPanel.MyStepPanel.SelectedStepItem.MyStepRTB.MyItemInfo); + if (toolsPanel.Expanded == false) toolsPanel.Expanded = true; + toolsTabs.SelectedTab = toolsTabBookMarks; } - - /// - /// Previous button on bottom tool bar - /// - /// - /// - private void btnPrevPos_Click(object sender, EventArgs e) - { - //if (_PrevBookMark != null) - //{ - // VETreeNode jumpToHere = _PrevBookMark; // save current previous - // btnSetBookMrk_Click(sender, e); // save current as the new previous - // tv.SelectedNode = jumpToHere; // jump to the saved previous - //} - } - - /// - /// Clear Bookmarks button on Information pannel - /// - /// - /// - private void btnClrBookMrks_Click(object sender, EventArgs e) - { - _MyBookMarks.Clear(); - RefreshBookMarkData(); - } - - private void RefreshBookMarkData() - { - lbxBookMarks.DataSource = null; - lbxBookMarks.DisplayMember = "MenuTitle"; - lbxBookMarks.DataSource = _MyBookMarks; - btnClrBookMrks.Enabled = (lbxBookMarks.Items.Count > 0); - } - - /// - /// Remove Bookmark button on Information pannel - /// - /// - /// - private void btnRmvCurBookMrk_Click(object sender, EventArgs e) - { - _MyBookMarks.RemoveAt(lbxBookMarks.SelectedIndex); - RefreshBookMarkData(); - } - + /// /// Adds the given tree node to the list of bookmarks /// TODO: Add a menu item to tree view context menu for adding to book mark list. @@ -649,22 +589,6 @@ namespace VEPROMS // if (!(lbxBookMarks.Items.Contains(bkmrk))) // lbxBookMarks.Items.Add(bkmrk); //} - - /// - /// Set Bookmark button on the Information pannel - /// - /// - /// - private void btnSetBookMrk_Click(object sender, EventArgs e) - { - _MyBookMarks.Add(SelectedStepTabPanel.SelectedStepItem.MyItemInfo); - RefreshBookMarkData(); - } - private void lbxBookMarks_Click(object sender, EventArgs e) - { - MostRecentItem itm = lbxBookMarks.SelectedValue as MostRecentItem; - tc.OpenItem(itm.MyItemInfo); - } #endregion #region Find/Replace and Search @@ -878,6 +802,14 @@ namespace VEPROMS displayTags.MyRTB = (SelectedStepTabPanel == null) ? null : SelectedStepTabPanel.MyStepPanel.SelectedStepItem.MyStepRTB; } #endregion + #region InfoTabBookMarks + private void infotabBookMarks_Click(object sender, EventArgs e) + { + infoPanel.Expanded = true; + infoTabs.SelectedTab = infotabTags; + displayTags.MyRTB = (SelectedStepTabPanel == null) ? null : SelectedStepTabPanel.MyStepPanel.SelectedStepItem.MyStepRTB; + } + #endregion private void tc_StepPanelModeChange(object sender, StepRTBModeChangeEventArgs args) { this.lblEditView.Text = args.ViewMode == E_ViewMode.Edit ? "Edit" : "View"; @@ -885,6 +817,7 @@ namespace VEPROMS private ItemInfo _CurrentItem = null; private void tc_ItemSelectedChanged(object sender, ItemSelectedChangedEventArgs args) { + lblEditView.Text = " "; if (args == null) { @@ -908,19 +841,20 @@ namespace VEPROMS infotabRO.Visible = true; displayRO.MyRTB = null; infotabTags.Visible = true; + displayBookMarks.MyRTB = null; //vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem); } else { if (args.MyStepItem.MyItemInfo.IsSection || args.MyStepItem.MyItemInfo.IsProcedure) { - infotabRO.Visible = infotabTransition.Visible = false; + infotabRO.Visible = infotabTransition.Visible = false; infotabTags.Visible = true; } else infotabRO.Visible = infotabTransition.Visible = infotabTags.Visible = true; - - //vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem); + + //vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem); // When infotabTags is set to Visible, the matching panel also needs to be set to visible // the other panels will appear as they are selected by the user. infotabControlPanelTags.Visible = true; @@ -929,6 +863,7 @@ namespace VEPROMS displayTransition.MyRTB = args.MyStepItem.MyStepRTB; displayRO.MyRTB = args.MyStepItem.MyStepRTB; displayTags.MyRTB = args.MyStepItem.MyStepRTB; + displayBookMarks.MyRTB = args.MyStepItem.MyStepRTB; displayRO.ProgressBar = bottomProgBar; lblEditView.Text = args.MyStepItem.MyStepRTB.ViewRTB ? "View" : "Edit"; } diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.resx b/PROMS/VEPROMS User Interface/frmVEPROMS.resx index 2c211bcd..a5b525aa 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.resx +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.resx @@ -399,6 +399,9 @@ bCVV/V4Ishh0HwgcBM6/gDFhmSjTv+IXqagSRZEQ5zgAAAAASUVORK5CYII= + + 17, 17 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -413,6 +416,26 @@ Qz2xORPhp3tZMO3km+MAHTcLUCu30KTfJU0WcMicw9SdjVSW7JAbtBq0BMaMuO9txnt/O+8samb7FFJh IrNYW0wWsFm3gYqi7D8MNjXUlaOvVUm6VH0I7cliqW1RmMgs1haTBZyU/B6k8xr/deYna7rBU0DWSCIA AAAASUVORK5CYII= + + + + 17, 17 + + + + iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASawAA + EmsB4byhqAAAAm5JREFUOE/V1N9PklEYB3D7j5oX4kYujUSwCeTCMBnzZy5/IqYU+PKC/MjUV0HBH6kY + hgqJFWWOdM1y1hxUyua8SC9aF82buugmHB6/Hd/WRbr2XuRN5+y5OtvnPM95zp4zADJOdR2BpxknsQx6 + wV+2rKAAR/HH+bGE/kPQ631P3O446e1ZIw/DOyQY3CKBQJJMTn4g4+MJMjq6Try+14jFNsje3jdy/P1P + lNzdvUJGRzbhsMcQjf7A2PgXDHo/oYf7CLtzG2Z2E7V1r6gD6HQjwqDLtUwGBtZhZZ9ibu47BnwU69uB + 484WOqybuGmMo7x6iQfLrvmEwU7bIuF6V2E2zSM4/ZVmtgu7axsd7AbabifQqF+DRvucB0s1HmHQwjwh + LucS2ttDmPDvwUExhmbGY4Y3qK5bgUr9iAdL1JwwyDDzxGZbgEE/Bd/QZ77MNlOcx2oopq16AbkixIPF + l+8KgywboWAUzU1+9Pbvot30Dk2Gt7hOG6GrWoK67Bkk8gdIp9NQKbuEQQsTJlZrBIYWP5xd22hupVj9 + L6xEuwCF+jHEEj/29/ehKHIJg2bTNGE6Zik4AYstidoGitGu/sZkyjCycu7xYGFhpzB4yzhFjMYAGhuG + YbIkUV7zEhrdIlRXo5ApI5BcCuGsaAipVAoyqSUt+LGrK93pqgo31MV2FF+ZhLTwPvLyxyA+PwyReBCZ + Ig8ys4ZxeEiQLzEJg522MKms6IfNMwOWmwbTNwOGOxZ9s1hNbOFCnlG45IMDQgwtgygrdUOj4aBU2VFU + xEIuN0NaYMRFSStyc/XIOVeP7OwbwuC/DttTndZHyfwEqUAcJPrJM0kAAAAASUVORK5CYII= @@ -446,44 +469,6 @@ Qz2xORPhp3tZMO3km+MAHTcLUCu30KTfJU0WcMicw9SdjVSW7JAbtBq0BMaMuO9txnt/O+8samb7FFJh IrNYW0wWsFm3gYqi7D8MNjXUlaOvVUm6VH0I7cliqW1RmMgs1haTBZyU/B6k8xr/deYna7rBU0DWSCIA AAAASUVORK5CYII= - - - - 17, 17 - - - - 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 @@ -521,6 +506,9 @@ rkJggg== + + 17, 17 + 402, 17 @@ -530,6 +518,9 @@ True + + True + R0lGODlhFAAUAPEAAAAAAP///////wAAACH5BAEAAAIALAAAAAAUABQAAAIjlI+py20AoUOxThFPdpKC