From b42b8ddfa3842794c26640c58e8bd798ef75ab4e Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Thu, 1 Aug 2024 10:42:53 -0400 Subject: [PATCH 01/19] B2024-054_Update_Tool_tip_text_for_delete_annotations --- PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs | 2 +- PROMS/VEPROMS User Interface/frmBatchRefresh.resx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs b/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs index a57d9fd7..e245dde7 100644 --- a/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs @@ -591,7 +591,7 @@ this.labelX14.Location = new System.Drawing.Point(85, 14); this.labelX14.Name = "labelX14"; this.labelX14.Size = new System.Drawing.Size(186, 22); - this.superTooltip1.SetSuperTooltip(this.labelX14, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Transitions", "", resources.GetString("labelX14.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(256, 175))); + this.superTooltip1.SetSuperTooltip(this.labelX14, new DevComponents.DotNetBar.SuperTooltipInfo("Process Deletions", "", resources.GetString("labelX14.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 175))); this.labelX14.TabIndex = 36; this.labelX14.Text = "Delete Annotations"; // diff --git a/PROMS/VEPROMS User Interface/frmBatchRefresh.resx b/PROMS/VEPROMS User Interface/frmBatchRefresh.resx index 6f97b4fc..5f6986c5 100644 --- a/PROMS/VEPROMS User Interface/frmBatchRefresh.resx +++ b/PROMS/VEPROMS User Interface/frmBatchRefresh.resx @@ -149,11 +149,11 @@ Be sure a current backup of the database exists prior to running this function. If more than one procedure is selected, it is recommended that this be performed during off hours. - This function will refresh transitions in all procedures selected below, whether they were selected individually or as a group via a procedure set. + This will allow for the deletion of groups of annotations and allow for deleting entire folders within PROMS. Use the tree nodes to select which items to delete. -Be sure a current backup of the database exists prior to running this function. +Click on the on/off switches to turn on/off each tool. -If more than one procedure is selected, it is recommended that this be performed during off hours. +Note that only one of these tools can be run at a time. This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode. -- 2.47.2 From c81f527cb8a8a064643aab0404578b9050b2bb58 Mon Sep 17 00:00:00 2001 From: Kevin Laskey Date: Thu, 1 Aug 2024 15:05:42 -0400 Subject: [PATCH 02/19] C2021-059 - Update Proms Fixes --- PROMS/VEPROMS User Interface/PROMSFixes.Sql | 88 ++++++++++++++++++++- 1 file changed, 86 insertions(+), 2 deletions(-) diff --git a/PROMS/VEPROMS User Interface/PROMSFixes.Sql b/PROMS/VEPROMS User Interface/PROMSFixes.Sql index c557604d..b8e92a44 100644 --- a/PROMS/VEPROMS User Interface/PROMSFixes.Sql +++ b/PROMS/VEPROMS User Interface/PROMSFixes.Sql @@ -23519,6 +23519,90 @@ GO ========================================================================================================== */ + + +/* +========================================================================================================== + Start: C2021-059: SQL to delete folders using admin tool +========================================================================================================== +*/ + +IF EXISTS (SELECT * FROM sys.objects WHERE type = 'P' AND name = 'deleteFolderAdmin') +DROP PROCEDURE [dbo].[deleteFolderAdmin] +GO + +SET ANSI_NULLS ON +GO +SET QUOTED_IDENTIFIER ON +GO + +/***************************************************************************** + Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE + Copyright 2012 - Volian Enterprises, Inc. All rights reserved. +*****************************************************************************/ +CREATE PROCEDURE [dbo].[deleteFolderAdmin] + +( + @FolderID int +) +WITH EXECUTE AS OWNER +AS +BEGIN TRY -- Try Block + BEGIN TRANSACTION + DELETE From Assignments WHERE [FolderID]=@FolderID + DELETE From Associations where VersionID in (select versionid from DocVersions where folderid = @FolderID) + DELETE From DocVersions where VersionID in (select versionid from DocVersions where folderid= @FolderID) + DELETE From DocVersions where [FolderID]=@FolderID + + -- Delete from items where ItemID matches + DELETE FROM tblitems + WHERE ItemID IN ( + SELECT DISTINCT ItemID + FROM docversions + WHERE folderID = @folderID + ); + + + -- Delete from items where ItemID matches + DELETE FROM tblitems + WHERE ItemID IN ( + SELECT DISTINCT ItemID + FROM docversions + WHERE folderID = @folderID + ); + + -- Delete from tblContents where ContentID matches + DELETE FROM tblContents + WHERE ContentID IN ( + SELECT DISTINCT c.ContentID + FROM tblContents c + JOIN items i ON c.ContentID = i.ItemID + WHERE i.ItemID IN ( + SELECT DISTINCT ItemID + FROM docversions + WHERE folderID = @folderID + ) + ); + + DELETE From Folders WHERE [ParentID] = @FolderID + DELETE From Folders WHERE [FolderID] = @FolderID + + + IF( @@TRANCOUNT > 0 ) COMMIT +END TRY +BEGIN CATCH -- Catch Block + IF( @@TRANCOUNT = 1 ) ROLLBACK -- Only rollback if top level + ELSE IF( @@TRANCOUNT > 1 ) COMMIT -- Otherwise commit. Top level will rollback + EXEC vlnErrorHandler +END CATCH + +GO +/* +========================================================================================================== + End: C2021-059: SQL to delete folders using admin tool +========================================================================================================== +*/ + /* --------------------------------------------------------------------------- | ADD New Code Before this Block | @@ -23552,8 +23636,8 @@ BEGIN TRY -- Try Block DECLARE @RevDate varchar(255) DECLARE @RevDescription varchar(255) - set @RevDate = '07/18/2024 11:24' - set @RevDescription = 'C2024-005 Add an Admin tool that can delete a group of annotations.' + set @RevDate = '07/29/2024 11:24' + set @RevDescription = 'C2021-059 Add SQL for Admin tool delete folders.' Select cast(@RevDate as datetime) RevDate, @RevDescription RevDescription PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription -- 2.47.2 From df2be585a184bc9d683f4a01e0d529cfaf700be7 Mon Sep 17 00:00:00 2001 From: Kevin Laskey Date: Thu, 1 Aug 2024 15:54:28 -0400 Subject: [PATCH 03/19] C2021-059 - Moved updates to branch --- .../VEPROMS User Interface/frmBatchRefresh.cs | 311 ++++++++++++------ PROMS/VEPROMS User Interface/frmVEPROMS.cs | 18 +- .../VEPROMS.CSLA.Library/Generated/Folder.cs | 25 ++ .../vlnTreeView.Designer.cs | 58 ++-- PROMS/Volian.Controls.Library/vlnTreeView.cs | 49 +++ 5 files changed, 323 insertions(+), 138 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmBatchRefresh.cs b/PROMS/VEPROMS User Interface/frmBatchRefresh.cs index 429c1244..c1027b1c 100644 --- a/PROMS/VEPROMS User Interface/frmBatchRefresh.cs +++ b/PROMS/VEPROMS User Interface/frmBatchRefresh.cs @@ -24,7 +24,10 @@ namespace VEPROMS private bool IsAdministratorUser = false; //C2020-035 used to control what Set Amins can do // C2017-030 - new Admin Tools user interface // pass in session info to constructor - public frmBatchRefresh(SessionInfo sessionInfo) + + private frmVEPROMS _veProms; + + public frmBatchRefresh(SessionInfo sessionInfo, frmVEPROMS veProms) { InitializeComponent(); _MySessionInfo = sessionInfo; @@ -36,7 +39,10 @@ namespace VEPROMS { AdminToolType = (E_AdminToolType)4; if (swDeleteFolder.Value) + { ResetDelTV(true); + setupProgessSteps1(); + } else ResetDelTV(false); } @@ -101,6 +107,8 @@ namespace VEPROMS private Dictionary myProcedures = new Dictionary(); private Dictionary myDocVersions = new Dictionary(); + private Dictionary myFolders = new Dictionary(); + private void frmBatchRefresh_Load(object sender, EventArgs e) { IsClosing = false;//B2017-221 Allow the batch dialog to close when waiting to process. @@ -143,6 +151,7 @@ namespace VEPROMS //myTreeNodePath = new List(); myTV.Nodes.Clear(); myDocVersions.Clear(); + myFolders.Clear(); FolderInfo fi = FolderInfo.GetTop(); TreeNode tn = myTV.Nodes.Add(fi.Name); tn.Tag = fi; @@ -166,44 +175,21 @@ namespace VEPROMS if (fi.ChildFolderCount > 0) { - if (noProcs) - { - LoadBottomLevelFolders(fi, myTVdel); - } - else - { - TreeNode tn = new TreeNode(fi.Name); - tn.Tag = fi; - tn.StateImageIndex = -1; // Hide the checkbox for the root node - LoadChildFolders(fi, tn, noProcs); - myTVdel.Nodes.Add(tn); - } + TreeNode tn = new TreeNode(fi.Name); + tn.Tag = fi; + tn.StateImageIndex = -1; // Hide the checkbox for the root node + LoadChildFolders(fi, tn, noProcs); + myTVdel.Nodes.Add(tn); } if (myTVdel.SelectedNode != null) myTVdel.SelectedNode.Expand(); - this.Cursor = Cursors.Default; - //btnFixLinks.Enabled = false; - //this.Cursor = Cursors.WaitCursor; - ////myTreeNodePath = new List(); - //myTVdel.Nodes.Clear(); - //myDocVersions.Clear(); - //FolderInfo fi = FolderInfo.GetTop(); - //TreeNode tn = myTVdel.Nodes.Add(fi.Name ); - //tn.Tag = fi; - //if (fi.ChildFolderCount > 0) - //{ - // if (noProcs) - // { - // LoadBottomLevelFolders(fi, myTVdel); - // } - // else - // LoadChildFolders(fi, tn, noProcs); - //} - //if (myTVdel.SelectedNode != null) - // myTVdel.SelectedNode.Expand(); - //this.Cursor = Cursors.Default; + //Expand if folders + if (noProcs) + myTVdel.ExpandAll(); + + this.Cursor = Cursors.Default; } // B2021-060 Higher level folders where being removed from the tree even if there was a child folder that containe a working draft set @@ -215,10 +201,13 @@ namespace VEPROMS { TreeNode tnc = tn.Nodes.Add(fic.Name); tnc.Tag = fic; + if (fic.ChildFolderCount > 0) + { if (LoadChildFolders(fic, tnc, noProcs)) loadedChildWorkingDraft = true; - // B2020-114 and C2020-035 only show folders the Set Admin can access + } + if (fic.FolderDocVersionCount > 0) { if (!LoadDocVersions(fic, tnc, noProcs)) @@ -226,40 +215,27 @@ namespace VEPROMS else loadedWorkingDraft = true; } - } - if (loadedChildWorkingDraft) loadedWorkingDraft = true; // B2021-060 if child folder working draft loaded set loadedWorkingDraft - if (tn.Parent != null && !loadedWorkingDraft) - tn.Remove(); - return loadedWorkingDraft; - } - /// - /// Load only bottom layer of folders into treenode. - /// - /// - /// - private void LoadBottomLevelFolders(FolderInfo fi, TreeView treeView) - { - foreach (FolderInfo fic in fi.SortedChildFolders) - { - if (fic.ChildFolderCount > 0) - { - // Recursively call for child folders - LoadBottomLevelFolders(fic, treeView); - } else { - if (fic.Name != "PROMS") - { - - - - // If the folder is a bottom-level folder (no child folders), add it directly to the TreeView - TreeNode tnc = treeView.Nodes.Add(fic.Name); - tnc.Tag = fic; - } + // Add the folder to the dictionary + if (!myFolders.ContainsKey(tnc)) + myFolders.Add(tnc, fic); } } + + if (loadedChildWorkingDraft) + { + loadedWorkingDraft = true; + } + + if (tn.Parent != null && !loadedWorkingDraft) + { + tn.Remove(); + } + + return loadedWorkingDraft; } + private bool LoadDocVersions(FolderInfo fic, TreeNode tnc, bool noProcs) { bool rtnval = false; @@ -1276,6 +1252,76 @@ namespace VEPROMS } } } + //After check model to select and deselect nodes on the delete and annotation tree. + private void myTV_AfterCheck_DelAnn(object sender, TreeViewEventArgs e) + { + if (e.Action != TreeViewAction.Unknown) + { + if (e.Node.Nodes.Count > 0) + { + CheckChildNodes_DelAnn(e.Node, e.Node.Checked); + } + } + + if (e.Node.Checked) + { + // Ensure child nodes follow the parent node's state + CheckChildNodes_DelAnn(e.Node, e.Node.Checked); + } + else + { + // Automatically deselect parent nodes if current node is unchecked + if (swDeleteFolder.Value) + DiselectParentNodes_DelAnn(e.Node); + } + + btnFixLinks.Enabled = AtLeastOneNodeChecked_DelAnn(); // Ensure button is enabled based on custom logic + } + private void DiselectParentNodes_DelAnn(TreeNode node) + { + TreeNode parent = node.Parent; + while (parent != null) + { + parent.Checked = false; + parent = parent.Parent; + } + } + private void DiselectChildNodes_DelAnn(TreeNodeCollection children) + { + foreach (TreeNode child in children) + { + child.Checked = false; + DiselectChildNodes_DelAnn(child.Nodes); + } + } + private void CheckChildNodes_DelAnn(TreeNode treeNode, bool isChecked) + { + foreach (TreeNode tn in treeNode.Nodes) + { + tn.Checked = isChecked; + + if (tn.Nodes.Count > 0) + CheckChildNodes_DelAnn(tn, isChecked); + } + } + private bool AtLeastOneNodeChecked_DelAnn() + { + foreach (TreeNode node in myTV.Nodes) + { + if (node.Checked || AnyChildNodeChecked_DelAnn(node)) + return true; + } + return false; + } + private bool AnyChildNodeChecked_DelAnn(TreeNode node) + { + foreach (TreeNode childNode in node.Nodes) + { + if (childNode.Checked || AnyChildNodeChecked_DelAnn(childNode)) + return true; + } + return false; + } private ProgressBarItem _ProgressBar = null; @@ -1466,8 +1512,20 @@ namespace VEPROMS break; case E_AdminToolType.Delete: - splitContainer3.Panel2Collapsed = true; - progressSteps1.Visible = false; + if (swDeleteFolder.Value) + { + splitContainer3.Panel2Collapsed = false; + progressSteps1.Items.Add(siOrphDatRecs); + lblAdmToolProgressType.Text = "Repairing: "; + progressSteps1.Visible = true; + progressSteps1.Refresh(); + } + else + { + lblAdmToolProgressType.Text = ""; + splitContainer3.Panel2Collapsed = true; + progressSteps1.Visible = false; + } break; } } @@ -1669,6 +1727,7 @@ namespace VEPROMS //C2024-005 Delete Annotations, Delete Folders private void swDeleteAnnotations_ValueChanged(object sender, EventArgs e) { + setupProgessSteps1(); swDeleteFolder.Value = !swDeleteAnnotations.Value; if (swDeleteFolder.Value) ResetDelTV(true); @@ -1678,6 +1737,7 @@ namespace VEPROMS private void swDeleteFolder_ValueChanged(object sender, EventArgs e) { + setupProgessSteps1(); swDeleteAnnotations.Value = !swDeleteFolder.Value; if (swDeleteFolder.Value) ResetDelTV(true); @@ -1691,67 +1751,54 @@ namespace VEPROMS txtResults.Clear(); txtProcess.Clear(); - if (swDeleteFolder.Value) { - //TODO process deletions of folders - txtProcess.AppendText("Deleting Folders..."); + if (FlexibleMessageBox.Show(this, "You sure you want to remove the selected folders and their contents?", "Confirm Folder Deletion", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + txtProcess.AppendText("Deleting Folders..."); - //List pil = new List(); - //foreach (TreeNode tn in myProcedures.Keys) - // if (tn.Checked) - // pil.Add(myProcedures[tn]); + //Load Selected Folders with docversions + List dvil = new List(); + foreach (TreeNode tn in myDocVersions.Keys) + if (tn.Checked) + dvil.Add(myDocVersions[tn]); - ////Load Selected Folders - Dictionary folderData = new Dictionary(); + //Load Selected Folders with docversions + List ef = new List(); + foreach (TreeNode tn in myFolders.Keys) - //List Flist = new List(); - //foreach (TreeNode tn in myDocVersions.Keys) - // if (tn.Checked) - // Flist.Add(); + if (tn.Checked) + ef.Add(myFolders[tn]); - //List dvil = new List(); - //foreach (TreeNode tn in myDocVersions.Keys) - // if (tn.Checked) - // dvil.Add(myDocVersions[tn]); - - //foreach (TreeNode tn in myTVdel.Nodes) - //{ - // if (tn.Checked) - // { - // var itemInfo = myProcedures[tn]; - // folderData.Add(itemInfo.ItemID, itemInfo.DisplayText); - // } - //} - - //ProcessDelete(dvil); + ProcessDelete(dvil, ef); + } } else { - // Write progress status - txtProcess.AppendText("Deleting Annotations..." + Environment.NewLine); + // Write progress status + txtProcess.AppendText("Deleting Annotations..."); - // Create a list of procedures the user selected + // Create a list of procedures the user selected List pil = new List(); foreach (TreeNode tn in myProcedures.Keys) if (tn.Checked) pil.Add(myProcedures[tn]); - // Create a list of doc versions the user selected + // Create a list of doc versions the user selected List dvil = new List(); foreach (TreeNode tn in myDocVersions.Keys) if (tn.Checked) dvil.Add(myDocVersions[tn]); frmAnnotationsCleanup frmAnnoDel = new frmAnnotationsCleanup(this, pil, dvil); - + frmAnnoDel.ShowDialog(); } } - private void ProcessDelete(List foldersToDelete) + private void ProcessDelete(List foldersToDelete, List emptyFoldersToDelete) { DateTime pStart = DateTime.Now; txtProcess.AppendText(Environment.NewLine); @@ -1760,11 +1807,12 @@ namespace VEPROMS foreach (var kvp in foldersToDelete) { - int itemID = (int)kvp.ItemID; - string folderName = kvp.Name; + //Gather folder information + FolderInfo fi = (FolderInfo)kvp.ActiveParent; + int itemID = (int)fi.FolderID; + string folderName = fi.Name; // Perform the deletion operation - // Assume DeleteFolderByID is a method that deletes the folder by its ItemID bool deletionSuccessful = DeleteFolderByID(itemID); // Update txtProcess with the progress @@ -1778,13 +1826,60 @@ namespace VEPROMS } txtProcess.AppendText(Environment.NewLine); } + + + //Delete non working info folders. + foreach (var kvp in emptyFoldersToDelete) + { + //Gather folder information + FolderInfo fi = (FolderInfo)kvp; + int itemID = (int)fi.FolderID; + string folderName = fi.Name; + + // Perform the deletion operation + bool deletionSuccessful = DeleteFolderByID(itemID); + + // Update txtProcess with the progress + if (deletionSuccessful) + { + txtProcess.AppendText($"Successfully deleted folder: {folderName} (ID: {itemID})"); + } + else + { + txtProcess.AppendText($"Failed to delete folder: {folderName} (ID: {itemID})"); + } + txtProcess.AppendText(Environment.NewLine); + } + + //Run Repair + int prgStpIdx = -1; + StepProgress(++prgStpIdx, 50); + PurgeDisconnectedItems(); // Orphan Items + StepProgress(prgStpIdx, 100); + + //rebuild + ResetDelTV(true); + + MessageBox.Show("Folder Deletion Completed", "Delete Folders"); + ClearStepProgress(); } - // Example deletion method - private bool DeleteFolderByID(int itemID) + + private bool DeleteFolderByID(int folderID) { - // Implement your folder deletion logic here - // Return true if deletion was successful, false otherwise - return true; // Placeholder + try + { + //Delete + Folder.DeleteFolderAdmin(folderID); + + //update treeview UI via veProms + _veProms.tv_FolderDelete(folderID); + + return true; + } + catch + { + return false; + } } public List RetrieveChkAnnotations() diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 3290cd6c..e6861d29 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -254,6 +254,21 @@ namespace VEPROMS tc.RefreshItem(myItemInfo); } + public void tv_FolderDelete(int folderId) + { + // Create an instance of the event args if needed + var args = new vlnTreeFolderDeleteEventArgs(folderId); + + // Trigger the deletion using the event arguments + tv.RemoveFolder(args.FolderId); + + } + private bool Tv_DeleteFolder(object sender, vlnTreeFolderDeleteEventArgs args) + { + tv.RemoveFolder(args.FolderId); + return true; + } + private E_UCFImportOptions _UCFImportOptionsFromSettings; public frmVEPROMS() @@ -474,6 +489,7 @@ namespace VEPROMS tv.NodeNew += new vlnTreeViewEvent(tv_NodeNew); tv.OpenItem += new vlnTreeViewItemInfoEvent(tv_OpenItem); tv.TabDisplay += new StepPanelTabDisplayEvent(tc_PanelTabDisplay); + tv.DeleteFolder += new vlnTreeViewItemInfoDeleteFolderEvent(Tv_DeleteFolder); tv.DeleteItemInfo += new vlnTreeViewItemInfoDeleteEvent(tv_DeleteItemInfo); tv.InsertItemInfo += new vlnTreeViewItemInfoInsertEvent(tv_InsertItemInfo); tv.NodeInsert += new vlnTreeViewEvent(tv_NodeInsert); @@ -2741,7 +2757,7 @@ namespace VEPROMS void btnAdministrativeTools_Click(object sender, EventArgs e) { - frmBatchRefresh frm = new frmBatchRefresh(MySessionInfo); + frmBatchRefresh frm = new frmBatchRefresh(MySessionInfo, this); frm.ProgressBar = bottomProgBar; frm.ShowDialog(this); } diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Folder.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Folder.cs index e6f8fdbd..e2b73a00 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Folder.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Folder.cs @@ -1433,6 +1433,31 @@ namespace VEPROMS.CSLA.Library throw new DbCslaException("Folder.Remove", ex); } } + + [Transactional(TransactionalTypes.TransactionScope)] + public static void DeleteFolderAdmin(int folderID) + { + if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] Folder.Remove", 0); + try + { + using (SqlConnection cn = Database.VEPROMS_SqlConnection) + { + using (SqlCommand cm = cn.CreateCommand()) + { + cm.CommandType = CommandType.StoredProcedure; + cm.CommandTimeout = Database.SQLTimeout; + cm.CommandText = "deleteFolderAdmin"; + cm.Parameters.AddWithValue("@FolderID", folderID); + cm.ExecuteNonQuery(); + } + } + } + catch (Exception ex) + { + if (_MyLog.IsErrorEnabled) _MyLog.Error("Folder.Remove", ex); + throw new DbCslaException("Folder.Remove", ex); + } + } #endregion #region Exists public static bool Exists(int folderID) diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.Designer.cs b/PROMS/Volian.Controls.Library/vlnTreeView.Designer.cs index 605c0232..203fb267 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.Designer.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.Designer.cs @@ -1,36 +1,36 @@ namespace Volian.Controls.Library { - partial class vlnTreeView - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; + partial class vlnTreeSectionInfoEventArgs + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } - #region Component Designer generated code + #region Component Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - components = new System.ComponentModel.Container(); - } + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + components = new System.ComponentModel.Container(); + } - #endregion - } + #endregion + } } diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs index dff305ce..ec520546 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs @@ -27,6 +27,7 @@ namespace Volian.Controls.Library public delegate bool vlnTreeViewBoolEvent(object sender, vlnTreeEventArgs args); public delegate bool vlnTreeViewItemInfoDeleteEvent(object sender, vlnTreeItemInfoEventArgs args); public delegate bool vlnTreeViewItemInfoInsertEvent(object sender, vlnTreeItemInfoInsertEventArgs args); + public delegate bool vlnTreeViewItemInfoDeleteFolderEvent(object sender, vlnTreeFolderDeleteEventArgs args); public delegate bool vlnTreeViewItemInfoPasteEvent(object sender, vlnTreeItemInfoPasteEventArgs args); public delegate TreeNode vlnTreeViewTreeNodeEvent(object sender, vlnTreeEventArgs args); public delegate DialogResult vlnTreeViewPropertyEvent(object sender, vlnTreePropertyEventArgs args); @@ -220,6 +221,15 @@ namespace Volian.Controls.Library } #endregion } + public class vlnTreeFolderDeleteEventArgs : EventArgs + { + public int FolderId { get; } + + public vlnTreeFolderDeleteEventArgs(int folderId) + { + FolderId = folderId; + } + } public enum E_InsertType {Before, After, Child}; public partial class vlnTreeItemInfoInsertEventArgs { @@ -427,6 +437,12 @@ namespace Volian.Controls.Library if (DeleteItemInfo != null) return DeleteItemInfo(sender, args); return false; } + public event vlnTreeViewItemInfoDeleteFolderEvent DeleteFolder; + private bool OnDeleteFolder(object sender, vlnTreeFolderDeleteEventArgs args) + { + if (DeleteItemInfo != null) return DeleteFolder(sender, args); + return false; + } public event vlnTreeViewItemInfoInsertEvent InsertItemInfo; private bool OnInsertItemInfo(object sender, vlnTreeItemInfoInsertEventArgs args) { @@ -3582,6 +3598,39 @@ namespace Volian.Controls.Library } return false; } + public void RemoveFolder(int folderId) + { + TreeNode nodeToRemove = FindNodeById(folderId, this.Nodes); + if (nodeToRemove != null) + { + // Perform the removal logic + nodeToRemove.Remove(); // This removes the node from its parent + } + } + private TreeNode FindNodeById(int folderId, TreeNodeCollection nodes) + { + foreach (TreeNode node in nodes) + { + VETreeNode vetNode = node as VETreeNode; + if (vetNode != null) + { + FolderInfo folderInfo = vetNode.VEObject as FolderInfo; + if (folderInfo != null && folderInfo.FolderID == folderId) + { + return node; + } + else + { + TreeNode foundNode = FindNodeById(folderId, node.Nodes); + if (foundNode != null) + { + return foundNode; + } + } + } + } + return null; + } private bool DeleteItemInfoAndChildren(ItemInfo ii) { DateTime dtStart = DateTime.Now; -- 2.47.2 From afbf6f360d3edafbff38427b83f4227663b8662e Mon Sep 17 00:00:00 2001 From: Kevin Laskey Date: Fri, 2 Aug 2024 10:13:05 -0400 Subject: [PATCH 04/19] C2021-059 - Updates to get build moving after custom merging --- .../frmBatchRefresh.Designer.cs | 82 ++++++++----------- .../VEPROMS User Interface/frmBatchRefresh.cs | 3 +- .../frmBatchRefresh.resx | 7 ++ .../vlnTreeView.Designer.cs | 2 +- PROMS/Volian.Controls.Library/vlnTreeView.cs | 26 ++++++ 5 files changed, 72 insertions(+), 48 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs b/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs index e245dde7..f09ede59 100644 --- a/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs @@ -105,7 +105,6 @@ this.sideNavItmRepair = new DevComponents.DotNetBar.Controls.SideNavItem(); this.sideNavItmLinks = new DevComponents.DotNetBar.Controls.SideNavItem(); this.sideNavItmUsers = new DevComponents.DotNetBar.Controls.SideNavItem(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); this.sideNavItmDelete = new DevComponents.DotNetBar.Controls.SideNavItem(); this.sideNavItmExit = new DevComponents.DotNetBar.Controls.SideNavItem(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); @@ -115,6 +114,7 @@ this.stepItem3 = new DevComponents.DotNetBar.StepItem(); this.stepItem4 = new DevComponents.DotNetBar.StepItem(); this.lblAdmToolProgressType = new DevComponents.DotNetBar.LabelX(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit(); this.splitContainer3.Panel1.SuspendLayout(); @@ -137,9 +137,6 @@ // // myTV // - this.myTV.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); this.myTV.CheckBoxes = true; this.myTV.Dock = System.Windows.Forms.DockStyle.Bottom; this.myTV.Location = new System.Drawing.Point(0, 184); @@ -501,35 +498,10 @@ this.sideNavPanel4.Controls.Add(this.myTVdel); this.sideNavPanel4.Controls.Add(this.btnDeleteItems); this.sideNavPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.sideNavPanel4.Location = new System.Drawing.Point(89, 31); + this.sideNavPanel4.Location = new System.Drawing.Point(80, 31); this.sideNavPanel4.Name = "sideNavPanel4"; - this.sideNavPanel4.Size = new System.Drawing.Size(291, 494); + this.sideNavPanel4.Size = new System.Drawing.Size(300, 494); this.sideNavPanel4.TabIndex = 27; - // - // sideNavPanel5 - // - this.sideNavPanel5.Controls.Add(this.btn_ShowUsers); - this.sideNavPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.sideNavPanel5.Location = new System.Drawing.Point(81, 31); - this.sideNavPanel5.Name = "sideNavPanel5"; - this.sideNavPanel5.Size = new System.Drawing.Size(299, 494); - this.sideNavPanel5.TabIndex = 14; - this.sideNavPanel5.Visible = false; - // - // btn_ShowUsers - // - this.btn_ShowUsers.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btn_ShowUsers.Checked = true; - this.btn_ShowUsers.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btn_ShowUsers.Location = new System.Drawing.Point(57, 37); - this.btn_ShowUsers.Name = "btn_ShowUsers"; - this.btn_ShowUsers.Size = new System.Drawing.Size(171, 23); - this.btn_ShowUsers.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.superTooltip1.SetSuperTooltip(this.btn_ShowUsers, new DevComponents.DotNetBar.SuperTooltipInfo("Show Users", "", "This will return all of the users currently with open sessions in the database an" + - "d the details of any items they have checked out.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 80))); - this.btn_ShowUsers.TabIndex = 0; - this.btn_ShowUsers.Text = "Show Users"; - this.btn_ShowUsers.Click += new System.EventHandler(this.btn_ShowUsers_Click); // // swDeleteFolder // @@ -544,7 +516,6 @@ this.superTooltip1.SetSuperTooltip(this.swDeleteFolder, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("swDeleteFolder.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150))); this.swDeleteFolder.SwitchClickTogglesValue = true; this.swDeleteFolder.TabIndex = 39; - this.swDeleteFolder.Visible = false; this.swDeleteFolder.ValueChanged += new System.EventHandler(this.swDeleteFolder_ValueChanged); // // labelX13 @@ -561,7 +532,6 @@ this.superTooltip1.SetSuperTooltip(this.labelX13, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("labelX13.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(350, 175))); this.labelX13.TabIndex = 38; this.labelX13.Text = "Delete Folders"; - this.labelX13.Visible = false; // // swDeleteAnnotations // @@ -597,14 +567,11 @@ // // myTVdel // - this.myTVdel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); this.myTVdel.CheckBoxes = true; this.myTVdel.Dock = System.Windows.Forms.DockStyle.Bottom; this.myTVdel.Location = new System.Drawing.Point(0, 127); this.myTVdel.Name = "myTVdel"; - this.myTVdel.Size = new System.Drawing.Size(291, 367); + this.myTVdel.Size = new System.Drawing.Size(300, 367); this.myTVdel.TabIndex = 34; // // btnDeleteItems @@ -616,11 +583,9 @@ this.btnDeleteItems.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnDeleteItems.Location = new System.Drawing.Point(39, 98); this.btnDeleteItems.Name = "btnDeleteItems"; - this.btnDeleteItems.Size = new System.Drawing.Size(212, 23); + this.btnDeleteItems.Size = new System.Drawing.Size(221, 23); this.btnDeleteItems.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.superTooltip1.SetSuperTooltip(this.btnDeleteItems, new DevComponents.DotNetBar.SuperTooltipInfo("Process Deletions", "", "This will allow for the deletion of groups of annotations and allow for deleting entire folders within PROMS. Use the tree nodes to select which items to delete.\r\n\r\nClick on the on" + - "/off switches to turn on/off each tool.\r\n\r\nNote that only one of these tools can" + - " be run at a time.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 175))); + this.superTooltip1.SetSuperTooltip(this.btnDeleteItems, new DevComponents.DotNetBar.SuperTooltipInfo("Process Deletions", "", resources.GetString("btnDeleteItems.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 175))); this.btnDeleteItems.TabIndex = 35; this.btnDeleteItems.Text = "Process Deletions"; this.btnDeleteItems.Click += new System.EventHandler(this.btnDeleteItems_Click); @@ -1206,6 +1171,31 @@ this.btnRunRepair.Text = "Run Repair"; this.btnRunRepair.Click += new System.EventHandler(this.btnRunRepair_Click); // + // sideNavPanel5 + // + this.sideNavPanel5.Controls.Add(this.btn_ShowUsers); + this.sideNavPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.sideNavPanel5.Location = new System.Drawing.Point(81, 31); + this.sideNavPanel5.Name = "sideNavPanel5"; + this.sideNavPanel5.Size = new System.Drawing.Size(299, 494); + this.sideNavPanel5.TabIndex = 14; + this.sideNavPanel5.Visible = false; + // + // btn_ShowUsers + // + this.btn_ShowUsers.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btn_ShowUsers.Checked = true; + this.btn_ShowUsers.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btn_ShowUsers.Location = new System.Drawing.Point(57, 37); + this.btn_ShowUsers.Name = "btn_ShowUsers"; + this.btn_ShowUsers.Size = new System.Drawing.Size(171, 23); + this.btn_ShowUsers.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.superTooltip1.SetSuperTooltip(this.btn_ShowUsers, new DevComponents.DotNetBar.SuperTooltipInfo("Show Users", "", "This will return all of the users currently with open sessions in the database an" + + "d the details of any items they have checked out.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 80))); + this.btn_ShowUsers.TabIndex = 0; + this.btn_ShowUsers.Text = "Show Users"; + this.btn_ShowUsers.Click += new System.EventHandler(this.btn_ShowUsers_Click); + // // sideNavItem1 // this.sideNavItem1.IsSystemMenu = true; @@ -1255,11 +1245,6 @@ this.sideNavItmUsers.Text = "Users"; this.sideNavItmUsers.Click += new System.EventHandler(this.sideNavItmUsers_Click); // - // buttonItem1 - // - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.Text = "buttonItem1"; - // // sideNavItmDelete // this.sideNavItmDelete.Checked = true; @@ -1361,6 +1346,11 @@ this.lblAdmToolProgressType.TabIndex = 19; this.lblAdmToolProgressType.Text = "Checking:"; // + // buttonItem1 + // + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.Text = "buttonItem1"; + // // superTooltip1 // this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray); diff --git a/PROMS/VEPROMS User Interface/frmBatchRefresh.cs b/PROMS/VEPROMS User Interface/frmBatchRefresh.cs index c1027b1c..440fa10a 100644 --- a/PROMS/VEPROMS User Interface/frmBatchRefresh.cs +++ b/PROMS/VEPROMS User Interface/frmBatchRefresh.cs @@ -1876,8 +1876,9 @@ namespace VEPROMS return true; } - catch + catch (Exception ex) { + string err = ex.ToString(); return false; } } diff --git a/PROMS/VEPROMS User Interface/frmBatchRefresh.resx b/PROMS/VEPROMS User Interface/frmBatchRefresh.resx index 5f6986c5..c140c84f 100644 --- a/PROMS/VEPROMS User Interface/frmBatchRefresh.resx +++ b/PROMS/VEPROMS User Interface/frmBatchRefresh.resx @@ -153,6 +153,13 @@ If more than one procedure is selected, it is recommended that this be performed Click on the on/off switches to turn on/off each tool. +Note that only one of these tools can be run at a time. + + + This will allow for the deletion of groups of annotations and allow for deleting entire folders within PROMS. Use the tree nodes to select which items to delete. + +Click on the on/off switches to turn on/off each tool. + Note that only one of these tools can be run at a time. diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.Designer.cs b/PROMS/Volian.Controls.Library/vlnTreeView.Designer.cs index 203fb267..98e486b8 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.Designer.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.Designer.cs @@ -1,6 +1,6 @@ namespace Volian.Controls.Library { - partial class vlnTreeSectionInfoEventArgs + partial class vlnTreeView { /// /// Required designer variable. diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs index ec520546..78554d1b 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs @@ -26,6 +26,7 @@ namespace Volian.Controls.Library public delegate void vlnTreeViewItemInfoEvent(object sender, vlnTreeItemInfoEventArgs args); public delegate bool vlnTreeViewBoolEvent(object sender, vlnTreeEventArgs args); public delegate bool vlnTreeViewItemInfoDeleteEvent(object sender, vlnTreeItemInfoEventArgs args); + public delegate bool vlnTreeViewItemInfoInsertEvent(object sender, vlnTreeItemInfoInsertEventArgs args); public delegate bool vlnTreeViewItemInfoDeleteFolderEvent(object sender, vlnTreeFolderDeleteEventArgs args); public delegate bool vlnTreeViewItemInfoPasteEvent(object sender, vlnTreeItemInfoPasteEventArgs args); @@ -567,6 +568,11 @@ namespace Volian.Controls.Library { if (ProcedureCheckedOutTo != null) ProcedureCheckedOutTo(sender, args); } + + + + + public event vlnTreeViewEvent ExportImportProcedureSets; private void OnExportImportProcedureSets(object sender, vlnTreeEventArgs args) { @@ -1075,6 +1081,11 @@ namespace Volian.Controls.Library #region Menu_Delete if (ok) + + + + + { // Add delete to the menu unless at the very 'top' node, on a grouping (partinfo) // node (RNOs, Steps, Cautions, Notes) or Folder/DocVersion that contains any items. @@ -1098,6 +1109,7 @@ namespace Volian.Controls.Library } } } + #endregion //_MyLog.WarnFormat("Context Menu 6 - {0}", GC.GetTotalMemory(true)); #region Menu_ExternalTransitions @@ -1956,6 +1968,16 @@ namespace Volian.Controls.Library OnPrintTransitionReport(this, new vlnTreeEventArgs(SelectedNode as VETreeNode)); return; } + + + + + + + + + + if (mi.Text == "Export Procedure Set" || mi.Text == "Export Procedure") { OnExportImportProcedureSets(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0)); @@ -2424,6 +2446,7 @@ namespace Volian.Controls.Library } } VETreeNode tn = SelectedNode as VETreeNode; + DocVersionInfo dvi = tn.VEObject as DocVersionInfo; // Check for paste into a docversion - queries/code is different than paste related to an item (into a proc or section) if (dvi != null) @@ -2595,6 +2618,7 @@ namespace Volian.Controls.Library // B2018-047: was crashing on the following line (before change it was casting the result to a VETreeNote when the partn.FirstNode was just a TreeNode) SelectedNode = prevtn != null ? prevtn.NextNode : partn.FirstNode; return replItemInfo; + } public void PasteRepalceEmpty(VETreeNode tn, int copyStartID) { @@ -3598,6 +3622,7 @@ namespace Volian.Controls.Library } return false; } + public void RemoveFolder(int folderId) { TreeNode nodeToRemove = FindNodeById(folderId, this.Nodes); @@ -3631,6 +3656,7 @@ namespace Volian.Controls.Library } return null; } + private bool DeleteItemInfoAndChildren(ItemInfo ii) { DateTime dtStart = DateTime.Now; -- 2.47.2 From 33cced07c6b25188688ccb870dc8699de4f14b65 Mon Sep 17 00:00:00 2001 From: Kevin Laskey Date: Fri, 2 Aug 2024 10:31:50 -0400 Subject: [PATCH 05/19] C2021-059 Added veProms connection to remove the node in the main tree --- PROMS/VEPROMS User Interface/frmBatchRefresh.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/PROMS/VEPROMS User Interface/frmBatchRefresh.cs b/PROMS/VEPROMS User Interface/frmBatchRefresh.cs index 440fa10a..7f14c8f2 100644 --- a/PROMS/VEPROMS User Interface/frmBatchRefresh.cs +++ b/PROMS/VEPROMS User Interface/frmBatchRefresh.cs @@ -10,6 +10,7 @@ using System.IO; using Volian.Controls.Library; using DevComponents.DotNetBar; using JR.Utils.GUI.Forms; +using Volian.Controls.Library; namespace VEPROMS { @@ -32,6 +33,9 @@ namespace VEPROMS InitializeComponent(); _MySessionInfo = sessionInfo; + _veProms = veProms; + + // When opening Admin tools Check tab will be default. this.sideNavItmCheck.Checked = true; -- 2.47.2 From 954186265eac1c54ee319f9062990feb76f63c2c Mon Sep 17 00:00:00 2001 From: Kevin Laskey Date: Fri, 2 Aug 2024 12:56:12 -0400 Subject: [PATCH 06/19] C2021-059 - Patch in auto checkbox filling for delete tree. --- PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs b/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs index f09ede59..dfaac506 100644 --- a/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs @@ -573,6 +573,7 @@ this.myTVdel.Name = "myTVdel"; this.myTVdel.Size = new System.Drawing.Size(300, 367); this.myTVdel.TabIndex = 34; + this.myTVdel.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.myTV_AfterCheck); // // btnDeleteItems // -- 2.47.2 From 41aa195785f6218f3db8f1053f7a4d8881f18704 Mon Sep 17 00:00:00 2001 From: Kevin Laskey Date: Fri, 2 Aug 2024 13:08:19 -0400 Subject: [PATCH 07/19] C2021-059 - Added extra code to ensure delect sets parent tree items deslected --- PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs b/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs index dfaac506..0ec4e750 100644 --- a/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs @@ -573,7 +573,7 @@ this.myTVdel.Name = "myTVdel"; this.myTVdel.Size = new System.Drawing.Size(300, 367); this.myTVdel.TabIndex = 34; - this.myTVdel.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.myTV_AfterCheck); + this.myTVdel.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.myTV_AfterCheck_DelAnn); // // btnDeleteItems // -- 2.47.2 From 0db98e41826b472888959e17cf94cd15608e8b6d Mon Sep 17 00:00:00 2001 From: Kevin Laskey Date: Mon, 5 Aug 2024 11:12:21 -0400 Subject: [PATCH 08/19] C2024-018 - Updated fixes per Michelle testing. Added some confirmation messages --- PROMS/VEPROMS User Interface/frmBatchRefresh.cs | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmBatchRefresh.cs b/PROMS/VEPROMS User Interface/frmBatchRefresh.cs index 7f14c8f2..fcc90c5b 100644 --- a/PROMS/VEPROMS User Interface/frmBatchRefresh.cs +++ b/PROMS/VEPROMS User Interface/frmBatchRefresh.cs @@ -1520,7 +1520,7 @@ namespace VEPROMS { splitContainer3.Panel2Collapsed = false; progressSteps1.Items.Add(siOrphDatRecs); - lblAdmToolProgressType.Text = "Repairing: "; + lblAdmToolProgressType.Text = "Deleting: "; progressSteps1.Visible = true; progressSteps1.Refresh(); } @@ -1757,7 +1757,7 @@ namespace VEPROMS if (swDeleteFolder.Value) { - if (FlexibleMessageBox.Show(this, "You sure you want to remove the selected folders and their contents?", "Confirm Folder Deletion", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + if (FlexibleMessageBox.Show(this, "Are you sure you want to remove the selected folders and their contents?", "Confirm Folder Deletion", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { txtProcess.AppendText("Deleting Folders..."); @@ -1804,6 +1804,8 @@ namespace VEPROMS private void ProcessDelete(List foldersToDelete, List emptyFoldersToDelete) { + int foldersDeleted = 0; + DateTime pStart = DateTime.Now; txtProcess.AppendText(Environment.NewLine); txtProcess.AppendText(pStart.ToString("MM/dd/yyyy @ HH:mm")); @@ -1823,6 +1825,7 @@ namespace VEPROMS if (deletionSuccessful) { txtProcess.AppendText($"Successfully deleted folder: {folderName} (ID: {itemID})"); + foldersDeleted += 1; } else { @@ -1847,14 +1850,20 @@ namespace VEPROMS if (deletionSuccessful) { txtProcess.AppendText($"Successfully deleted folder: {folderName} (ID: {itemID})"); + foldersDeleted += 1; } else { txtProcess.AppendText($"Failed to delete folder: {folderName} (ID: {itemID})"); } txtProcess.AppendText(Environment.NewLine); + } + + txtProcess.AppendText($"Folder deletion process completed, {foldersDeleted} folders have been deleted. "); + txtProcess.AppendText(Environment.NewLine); + //Run Repair int prgStpIdx = -1; StepProgress(++prgStpIdx, 50); @@ -1864,7 +1873,7 @@ namespace VEPROMS //rebuild ResetDelTV(true); - MessageBox.Show("Folder Deletion Completed", "Delete Folders"); + MessageBox.Show($"Folder deletion completed, {foldersDeleted} folders have been deleted.", "Delete Folders"); ClearStepProgress(); } -- 2.47.2 From 055be66421dc0b78d6a2692e2b6d287c0dd449b8 Mon Sep 17 00:00:00 2001 From: Kevin Laskey Date: Mon, 5 Aug 2024 15:24:43 -0400 Subject: [PATCH 09/19] C2024-018 - Update to use results pane --- PROMS/VEPROMS User Interface/frmBatchRefresh.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmBatchRefresh.cs b/PROMS/VEPROMS User Interface/frmBatchRefresh.cs index fcc90c5b..1ae0f399 100644 --- a/PROMS/VEPROMS User Interface/frmBatchRefresh.cs +++ b/PROMS/VEPROMS User Interface/frmBatchRefresh.cs @@ -1860,9 +1860,8 @@ namespace VEPROMS } - - txtProcess.AppendText($"Folder deletion process completed, {foldersDeleted} folders have been deleted. "); - txtProcess.AppendText(Environment.NewLine); + txtResults.AppendText($"Folder deletion process completed, {foldersDeleted} folder(s) have been deleted. "); + txtResults.AppendText(Environment.NewLine); //Run Repair int prgStpIdx = -1; -- 2.47.2 From 189b78d7d301429b47a70099591a9f7fffd497dc Mon Sep 17 00:00:00 2001 From: Kevin Laskey Date: Tue, 6 Aug 2024 09:14:36 -0400 Subject: [PATCH 10/19] B2024-057 - Added check to see if anything is checked out for annotations and folder delete from admin area. --- .../VEPROMS User Interface/frmBatchRefresh.cs | 93 ++++++++++++++----- 1 file changed, 71 insertions(+), 22 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmBatchRefresh.cs b/PROMS/VEPROMS User Interface/frmBatchRefresh.cs index 1ae0f399..cc3a6eb1 100644 --- a/PROMS/VEPROMS User Interface/frmBatchRefresh.cs +++ b/PROMS/VEPROMS User Interface/frmBatchRefresh.cs @@ -239,7 +239,7 @@ namespace VEPROMS return loadedWorkingDraft; } - + private bool LoadDocVersions(FolderInfo fic, TreeNode tnc, bool noProcs) { bool rtnval = false; @@ -1755,19 +1755,77 @@ namespace VEPROMS txtResults.Clear(); txtProcess.Clear(); + this.Cursor = Cursors.WaitCursor; + + //Create checked proce and doc info lists. + List pil = new List(); + List dvil = new List(); + + // Create a list of procedures the user selected + foreach (TreeNode tn in myProcedures.Keys) + if (tn.Checked) + pil.Add(myProcedures[tn]); + + // Create a list of doc versions the user selected + foreach (TreeNode tn in myDocVersions.Keys) + if (tn.Checked) + dvil.Add(myDocVersions[tn]); + + bool cancelledOut = false; // Flag to indicate if the process should be cancelled + StringBuilder sbDocVersions = new StringBuilder(); + + foreach (DocVersionInfo dq in dvil) + { + string msg = string.Empty; + if (!MySessionInfo.CanCheckOutItem(dq.VersionID, CheckOutType.DocVersion, ref msg)) + { + string msgp = string.Empty; + foreach (ProcedureInfo pi in dq.Procedures) + { + if (!MySessionInfo.CanCheckOutItem(pi.ItemID, CheckOutType.Procedure, ref msgp)) + { + FolderInfo fi = (FolderInfo)dq.ActiveParent; + int itemID = (int)fi.FolderID; + string folderName = fi.Name; + + if (swDeleteFolder.Value) + sbDocVersions.AppendLine($"{folderName} - {msgp}"); + else + sbDocVersions.AppendLine(msgp); + + cancelledOut = true; + } + } + } + } + + if (cancelledOut) + { + StringBuilder sb = new StringBuilder(); + sb.AppendLine("The batch update process was not successful for all working drafts selected."); + sb.AppendLine("The following procedures are currently checked out..."); + sb.AppendLine(); + sb.AppendLine(sbDocVersions.ToString()); + sb.AppendLine(); + if (swDeleteFolder.Value) + sb.AppendLine("If you want to delete these folders, please contact the respective users and have them close any procedures in the working draft."); + else + sb.AppendLine("If you want to delete annotations from these working drafts, please contact the respective users and have them close any procedures in the working draft."); + sb.AppendLine(); + txtProcess.AppendText(sb.ToString()); + return; + } + + + + if (swDeleteFolder.Value) { if (FlexibleMessageBox.Show(this, "Are you sure you want to remove the selected folders and their contents?", "Confirm Folder Deletion", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { txtProcess.AppendText("Deleting Folders..."); - //Load Selected Folders with docversions - List dvil = new List(); - foreach (TreeNode tn in myDocVersions.Keys) - if (tn.Checked) - dvil.Add(myDocVersions[tn]); - - //Load Selected Folders with docversions + //Load Selected Folders List ef = new List(); foreach (TreeNode tn in myFolders.Keys) @@ -1782,18 +1840,6 @@ namespace VEPROMS // Write progress status txtProcess.AppendText("Deleting Annotations..."); - // Create a list of procedures the user selected - List pil = new List(); - foreach (TreeNode tn in myProcedures.Keys) - if (tn.Checked) - pil.Add(myProcedures[tn]); - - // Create a list of doc versions the user selected - List dvil = new List(); - foreach (TreeNode tn in myDocVersions.Keys) - if (tn.Checked) - dvil.Add(myDocVersions[tn]); - frmAnnotationsCleanup frmAnnoDel = new frmAnnotationsCleanup(this, pil, dvil); frmAnnoDel.ShowDialog(); @@ -1860,8 +1906,8 @@ namespace VEPROMS } - txtResults.AppendText($"Folder deletion process completed, {foldersDeleted} folder(s) have been deleted. "); - txtResults.AppendText(Environment.NewLine); + + //Run Repair int prgStpIdx = -1; @@ -1874,6 +1920,9 @@ namespace VEPROMS MessageBox.Show($"Folder deletion completed, {foldersDeleted} folders have been deleted.", "Delete Folders"); ClearStepProgress(); + + txtResults.AppendText($"Folder deletion process completed, {foldersDeleted} folders have been deleted."); + txtResults.AppendText(Environment.NewLine); } private bool DeleteFolderByID(int folderID) -- 2.47.2 From d091a37171fb3ce7fc700562d4db2a51d9d50111 Mon Sep 17 00:00:00 2001 From: Kevin Laskey Date: Tue, 6 Aug 2024 10:29:06 -0400 Subject: [PATCH 11/19] B2024-055 - Update tooltips on admin delete functions --- PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs | 6 +++--- PROMS/VEPROMS User Interface/frmBatchRefresh.resx | 8 +++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs b/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs index 0ec4e750..c6086457 100644 --- a/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs @@ -513,7 +513,7 @@ this.swDeleteFolder.Name = "swDeleteFolder"; this.swDeleteFolder.Size = new System.Drawing.Size(69, 22); this.swDeleteFolder.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.superTooltip1.SetSuperTooltip(this.swDeleteFolder, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("swDeleteFolder.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150))); + this.superTooltip1.SetSuperTooltip(this.swDeleteFolder, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Folders", "", resources.GetString("swDeleteFolder.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150))); this.swDeleteFolder.SwitchClickTogglesValue = true; this.swDeleteFolder.TabIndex = 39; this.swDeleteFolder.ValueChanged += new System.EventHandler(this.swDeleteFolder_ValueChanged); @@ -529,7 +529,7 @@ this.labelX13.Location = new System.Drawing.Point(85, 42); this.labelX13.Name = "labelX13"; this.labelX13.Size = new System.Drawing.Size(168, 22); - this.superTooltip1.SetSuperTooltip(this.labelX13, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("labelX13.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(350, 175))); + this.superTooltip1.SetSuperTooltip(this.labelX13, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Folders", "", resources.GetString("labelX13.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(350, 175))); this.labelX13.TabIndex = 38; this.labelX13.Text = "Delete Folders"; // @@ -543,7 +543,7 @@ this.swDeleteAnnotations.Name = "swDeleteAnnotations"; this.swDeleteAnnotations.Size = new System.Drawing.Size(69, 22); this.swDeleteAnnotations.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.superTooltip1.SetSuperTooltip(this.swDeleteAnnotations, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Transitions", "", resources.GetString("swDeleteAnnotations.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(265, 175))); + this.superTooltip1.SetSuperTooltip(this.swDeleteAnnotations, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Annotations", "", resources.GetString("swDeleteAnnotations.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(265, 175))); this.swDeleteAnnotations.SwitchClickTogglesValue = true; this.swDeleteAnnotations.TabIndex = 37; this.swDeleteAnnotations.Value = true; diff --git a/PROMS/VEPROMS User Interface/frmBatchRefresh.resx b/PROMS/VEPROMS User Interface/frmBatchRefresh.resx index c140c84f..d743cefb 100644 --- a/PROMS/VEPROMS User Interface/frmBatchRefresh.resx +++ b/PROMS/VEPROMS User Interface/frmBatchRefresh.resx @@ -121,9 +121,7 @@ 17, 17 - This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode. - -Bad referenced bject links will be identified with an Bad RO Link annotation. Use the PROMS Search tool to list all of the steps that have this annotation. + This allows the user to remove folders and sub folders as well as their contents. Be sure a current backup of the database exists prior performing this function. @@ -142,11 +140,11 @@ It is recommended that this be done during off hours. - This function will refresh transitions in all procedures selected below, whether they were selected individually or as a group via a procedure set. + This function will allow the user to remove annotations from the selected working drafts. Be sure a current backup of the database exists prior to running this function. -If more than one procedure is selected, it is recommended that this be performed during off hours. +If more than one working draft is selected, it is recommended that this be performed during off hours. This will allow for the deletion of groups of annotations and allow for deleting entire folders within PROMS. Use the tree nodes to select which items to delete. -- 2.47.2 From 4b61495960e06f84e482b62105d288f6b5ef5648 Mon Sep 17 00:00:00 2001 From: Kevin Laskey Date: Tue, 6 Aug 2024 10:48:05 -0400 Subject: [PATCH 12/19] B2024-057 - updated curors --- PROMS/VEPROMS User Interface/frmBatchRefresh.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PROMS/VEPROMS User Interface/frmBatchRefresh.cs b/PROMS/VEPROMS User Interface/frmBatchRefresh.cs index cc3a6eb1..e5c85cb9 100644 --- a/PROMS/VEPROMS User Interface/frmBatchRefresh.cs +++ b/PROMS/VEPROMS User Interface/frmBatchRefresh.cs @@ -1813,6 +1813,7 @@ namespace VEPROMS sb.AppendLine("If you want to delete annotations from these working drafts, please contact the respective users and have them close any procedures in the working draft."); sb.AppendLine(); txtProcess.AppendText(sb.ToString()); + this.Cursor = Cursors.Default; return; } @@ -1846,6 +1847,7 @@ namespace VEPROMS } + this.Cursor = Cursors.Default; } private void ProcessDelete(List foldersToDelete, List emptyFoldersToDelete) -- 2.47.2 From 1f3a1dabbc8ea8b1d0ba1e8e86ee996fe75a8cb8 Mon Sep 17 00:00:00 2001 From: Kevin Laskey Date: Tue, 6 Aug 2024 10:58:04 -0400 Subject: [PATCH 13/19] B2024-055 - Update tooltips for the labels on delete annotations and delete folders --- PROMS/VEPROMS User Interface/frmBatchRefresh.resx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmBatchRefresh.resx b/PROMS/VEPROMS User Interface/frmBatchRefresh.resx index d743cefb..ceac1979 100644 --- a/PROMS/VEPROMS User Interface/frmBatchRefresh.resx +++ b/PROMS/VEPROMS User Interface/frmBatchRefresh.resx @@ -130,13 +130,12 @@ It is recommended that this be done during off hours. - This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode. - -Bad referenced bject links will be identified with an Bad RO Link annotation. Use the PROMS Search tool to list all of the steps that have this annotation. + This allows the user to remove folders and sub folders as well as their contents. Be sure a current backup of the database exists prior performing this function. It is recommended that this be done during off hours. + @@ -147,11 +146,11 @@ Be sure a current backup of the database exists prior to running this function. If more than one working draft is selected, it is recommended that this be performed during off hours. - This will allow for the deletion of groups of annotations and allow for deleting entire folders within PROMS. Use the tree nodes to select which items to delete. + This function will allow the user to remove annotations from the selected working drafts. -Click on the on/off switches to turn on/off each tool. +Be sure a current backup of the database exists prior to running this function. -Note that only one of these tools can be run at a time. +If more than one working draft is selected, it is recommended that this be performed during off hours. This will allow for the deletion of groups of annotations and allow for deleting entire folders within PROMS. Use the tree nodes to select which items to delete. -- 2.47.2 From 5f7af3309d1aaa4bc6b59dfc36e58e0c1e5bc505 Mon Sep 17 00:00:00 2001 From: Kevin Laskey Date: Tue, 6 Aug 2024 11:17:17 -0400 Subject: [PATCH 14/19] B2024-054 - Update Annotation tooltip --- PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs b/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs index c6086457..9eef5ffc 100644 --- a/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs @@ -561,7 +561,7 @@ this.labelX14.Location = new System.Drawing.Point(85, 14); this.labelX14.Name = "labelX14"; this.labelX14.Size = new System.Drawing.Size(186, 22); - this.superTooltip1.SetSuperTooltip(this.labelX14, new DevComponents.DotNetBar.SuperTooltipInfo("Process Deletions", "", resources.GetString("labelX14.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 175))); + this.superTooltip1.SetSuperTooltip(this.labelX14, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Annotations", "", resources.GetString("labelX14.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 175))); this.labelX14.TabIndex = 36; this.labelX14.Text = "Delete Annotations"; // -- 2.47.2 From a891a62ffa462ed2ce78b4c00420abe89b22d08f Mon Sep 17 00:00:00 2001 From: Kevin Laskey Date: Wed, 7 Aug 2024 14:15:57 -0400 Subject: [PATCH 15/19] F2024-067 - Updates to VCSummer for time sensitive stes (clock) --- PROMS/Formats/fmtall/SUMall.xml | Bin 128180 -> 128934 bytes PROMS/Formats/genmacall/sum.svg | Bin 3660 -> 3918 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/SUMall.xml b/PROMS/Formats/fmtall/SUMall.xml index 6b2516f8d744bc187f035518aea7ed7342b2f286..3873bf8bb1e966484400c70b021bc43b0ec8cd52 100644 GIT binary patch delta 376 zcmdn;l6~2G_6=h5rysk?$T#^(oCLEOgTZ9~>7wGf45d0rvWe5T4!C?Z>ykMZ}Tm}UO zTOd{f>H(Qu4AiZ}V8_7Azy%aVfs+pwD^52mVHBAhP^cjfGg<+|c?w_$+Lws(qiAPP zn0&BM8AD7zLzBOnK@n(54$#TT4A~5|lh;obpM0o92&=eCipXT23?4?s$rCdqCnd0G zDuP|91SEZdK1c@p+!YuKpb!fIilhVmrv$V>Y5LxqjN+4vibR^F=5Lpp&p0a-0BNXJ Aga7~l delta 22 ecmZ4Xo_)(p_6=h5Cx1v~Y35n9oo5l_tWW@c>k1eE diff --git a/PROMS/Formats/genmacall/sum.svg b/PROMS/Formats/genmacall/sum.svg index dc6c24df9bdb2a0c7760e365c2895d6ca2fd5403..61523c24856cd0433410ccdb656082095119805d 100644 GIT binary patch delta 147 zcmX>jb53r91K(sXUJ>>jhJ1!(hV03W+`^N8um}k2GMF>yF&Ho?F(@!pGS~uXgUJWk zncSdG|10RnKgFZtsLm5LlgB=3^Khy-+ -- 2.47.2 From 4b915b78b62a1b72ed02c4cc03af3d12fafcdde8 Mon Sep 17 00:00:00 2001 From: Kevin Laskey Date: Wed, 7 Aug 2024 14:37:31 -0400 Subject: [PATCH 16/19] B2024-057 - Updated sizes of tooltips in delete area of admin --- .../frmBatchRefresh.Designer.cs | 378 +++++++++++------- 1 file changed, 224 insertions(+), 154 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs b/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs index 9eef5ffc..d1d4a7e4 100644 --- a/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs @@ -139,9 +139,10 @@ // this.myTV.CheckBoxes = true; this.myTV.Dock = System.Windows.Forms.DockStyle.Bottom; - this.myTV.Location = new System.Drawing.Point(0, 184); + this.myTV.Location = new System.Drawing.Point(0, 285); + this.myTV.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.myTV.Name = "myTV"; - this.myTV.Size = new System.Drawing.Size(291, 310); + this.myTV.Size = new System.Drawing.Size(436, 475); this.myTV.TabIndex = 4; this.myTV.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.myTV_AfterCheck); // @@ -149,6 +150,7 @@ // this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill; this.splitContainer3.Location = new System.Drawing.Point(0, 0); + this.splitContainer3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.splitContainer3.Name = "splitContainer3"; this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal; // @@ -164,8 +166,9 @@ // this.splitContainer3.Panel2.BackColor = System.Drawing.SystemColors.Control; this.splitContainer3.Panel2.Controls.Add(this.panelEx4); - this.splitContainer3.Size = new System.Drawing.Size(1177, 586); - this.splitContainer3.SplitterDistance = 526; + this.splitContainer3.Size = new System.Drawing.Size(1766, 902); + this.splitContainer3.SplitterDistance = 809; + this.splitContainer3.SplitterWidth = 6; this.splitContainer3.TabIndex = 2; // // panelEx3 @@ -177,9 +180,10 @@ this.panelEx3.Controls.Add(this.label3); this.panelEx3.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panelEx3.Location = new System.Drawing.Point(688, 0); + this.panelEx3.Location = new System.Drawing.Point(1032, 0); + this.panelEx3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.panelEx3.Name = "panelEx3"; - this.panelEx3.Size = new System.Drawing.Size(489, 526); + this.panelEx3.Size = new System.Drawing.Size(734, 809); this.panelEx3.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx3.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx3.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -194,11 +198,12 @@ // this.txtResults.Dock = System.Windows.Forms.DockStyle.Fill; this.txtResults.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtResults.Location = new System.Drawing.Point(0, 52); + this.txtResults.Location = new System.Drawing.Point(0, 79); + this.txtResults.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtResults.Multiline = true; this.txtResults.Name = "txtResults"; this.txtResults.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.txtResults.Size = new System.Drawing.Size(489, 474); + this.txtResults.Size = new System.Drawing.Size(734, 730); this.txtResults.TabIndex = 4; // // panel1 @@ -206,17 +211,19 @@ this.panel1.Controls.Add(this.btnSave); this.panel1.Controls.Add(this.btnClear); this.panel1.Dock = System.Windows.Forms.DockStyle.Top; - this.panel1.Location = new System.Drawing.Point(0, 23); + this.panel1.Location = new System.Drawing.Point(0, 34); + this.panel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(489, 29); + this.panel1.Size = new System.Drawing.Size(734, 45); this.panel1.TabIndex = 3; // // btnSave // this.btnSave.Dock = System.Windows.Forms.DockStyle.Left; - this.btnSave.Location = new System.Drawing.Point(95, 0); + this.btnSave.Location = new System.Drawing.Point(142, 0); + this.btnSave.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btnSave.Name = "btnSave"; - this.btnSave.Size = new System.Drawing.Size(95, 29); + this.btnSave.Size = new System.Drawing.Size(142, 45); this.btnSave.TabIndex = 3; this.btnSave.Text = "Save Results"; this.btnSave.UseVisualStyleBackColor = true; @@ -226,8 +233,9 @@ // this.btnClear.Dock = System.Windows.Forms.DockStyle.Left; this.btnClear.Location = new System.Drawing.Point(0, 0); + this.btnClear.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btnClear.Name = "btnClear"; - this.btnClear.Size = new System.Drawing.Size(95, 29); + this.btnClear.Size = new System.Drawing.Size(142, 45); this.btnClear.TabIndex = 2; this.btnClear.Text = "Clear Results"; this.btnClear.UseVisualStyleBackColor = true; @@ -239,8 +247,9 @@ this.label3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label3.Dock = System.Windows.Forms.DockStyle.Top; this.label3.Location = new System.Drawing.Point(0, 0); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(489, 23); + this.label3.Size = new System.Drawing.Size(734, 34); this.label3.TabIndex = 2; this.label3.Text = "Results"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -270,9 +279,10 @@ this.expandableSplitter2.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255))))); this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter2.Location = new System.Drawing.Point(682, 0); + this.expandableSplitter2.Location = new System.Drawing.Point(1023, 0); + this.expandableSplitter2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.expandableSplitter2.Name = "expandableSplitter2"; - this.expandableSplitter2.Size = new System.Drawing.Size(6, 526); + this.expandableSplitter2.Size = new System.Drawing.Size(9, 809); this.expandableSplitter2.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter2.TabIndex = 38; this.expandableSplitter2.TabStop = false; @@ -288,9 +298,10 @@ this.panelEx2.Controls.Add(this.label4); this.panelEx2.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx2.Dock = System.Windows.Forms.DockStyle.Left; - this.panelEx2.Location = new System.Drawing.Point(391, 0); + this.panelEx2.Location = new System.Drawing.Point(587, 0); + this.panelEx2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.panelEx2.Name = "panelEx2"; - this.panelEx2.Size = new System.Drawing.Size(291, 526); + this.panelEx2.Size = new System.Drawing.Size(436, 809); this.panelEx2.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx2.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx2.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -306,19 +317,21 @@ this.txtProcess.AcceptsReturn = true; this.txtProcess.Dock = System.Windows.Forms.DockStyle.Fill; this.txtProcess.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtProcess.Location = new System.Drawing.Point(0, 150); + this.txtProcess.Location = new System.Drawing.Point(0, 228); + this.txtProcess.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtProcess.Multiline = true; this.txtProcess.Name = "txtProcess"; this.txtProcess.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.txtProcess.Size = new System.Drawing.Size(291, 376); + this.txtProcess.Size = new System.Drawing.Size(436, 581); this.txtProcess.TabIndex = 5; // // pbProcess // this.pbProcess.Dock = System.Windows.Forms.DockStyle.Top; - this.pbProcess.Location = new System.Drawing.Point(0, 125); + this.pbProcess.Location = new System.Drawing.Point(0, 190); + this.pbProcess.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.pbProcess.Name = "pbProcess"; - this.pbProcess.Size = new System.Drawing.Size(291, 25); + this.pbProcess.Size = new System.Drawing.Size(436, 38); this.pbProcess.TabIndex = 6; // // label6 @@ -326,9 +339,10 @@ this.label6.BackColor = System.Drawing.SystemColors.ActiveCaption; this.label6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label6.Dock = System.Windows.Forms.DockStyle.Top; - this.label6.Location = new System.Drawing.Point(0, 102); + this.label6.Location = new System.Drawing.Point(0, 156); + this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(291, 23); + this.label6.Size = new System.Drawing.Size(436, 34); this.label6.TabIndex = 3; this.label6.Text = "Process Status"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -338,10 +352,11 @@ this.panel3.Controls.Add(this.pnlLater); this.panel3.Controls.Add(this.chkLater); this.panel3.Dock = System.Windows.Forms.DockStyle.Top; - this.panel3.Location = new System.Drawing.Point(0, 23); + this.panel3.Location = new System.Drawing.Point(0, 34); + this.panel3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.panel3.Name = "panel3"; - this.panel3.Padding = new System.Windows.Forms.Padding(6); - this.panel3.Size = new System.Drawing.Size(291, 79); + this.panel3.Padding = new System.Windows.Forms.Padding(9, 9, 9, 9); + this.panel3.Size = new System.Drawing.Size(436, 122); this.panel3.TabIndex = 2; // // pnlLater @@ -351,18 +366,20 @@ this.pnlLater.Controls.Add(this.dtpDate); this.pnlLater.Dock = System.Windows.Forms.DockStyle.Top; this.pnlLater.Enabled = false; - this.pnlLater.Location = new System.Drawing.Point(6, 23); + this.pnlLater.Location = new System.Drawing.Point(9, 33); + this.pnlLater.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.pnlLater.Name = "pnlLater"; - this.pnlLater.Padding = new System.Windows.Forms.Padding(6); - this.pnlLater.Size = new System.Drawing.Size(279, 37); + this.pnlLater.Padding = new System.Windows.Forms.Padding(9, 9, 9, 9); + this.pnlLater.Size = new System.Drawing.Size(418, 57); this.pnlLater.TabIndex = 3; // // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(105, 15); + this.label5.Location = new System.Drawing.Point(158, 23); + this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(18, 13); + this.label5.Size = new System.Drawing.Size(25, 20); this.label5.TabIndex = 5; this.label5.Text = "@"; // @@ -372,27 +389,30 @@ | System.Windows.Forms.AnchorStyles.Right))); this.dtpTime.CustomFormat = "HH:mm"; this.dtpTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpTime.Location = new System.Drawing.Point(129, 9); + this.dtpTime.Location = new System.Drawing.Point(194, 14); + this.dtpTime.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.dtpTime.Name = "dtpTime"; this.dtpTime.ShowUpDown = true; - this.dtpTime.Size = new System.Drawing.Size(133, 20); + this.dtpTime.Size = new System.Drawing.Size(198, 26); this.dtpTime.TabIndex = 4; // // dtpDate // this.dtpDate.Format = System.Windows.Forms.DateTimePickerFormat.Short; - this.dtpDate.Location = new System.Drawing.Point(9, 9); + this.dtpDate.Location = new System.Drawing.Point(14, 14); + this.dtpDate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.dtpDate.Name = "dtpDate"; - this.dtpDate.Size = new System.Drawing.Size(90, 20); + this.dtpDate.Size = new System.Drawing.Size(133, 26); this.dtpDate.TabIndex = 3; // // chkLater // this.chkLater.AutoSize = true; this.chkLater.Dock = System.Windows.Forms.DockStyle.Top; - this.chkLater.Location = new System.Drawing.Point(6, 6); + this.chkLater.Location = new System.Drawing.Point(9, 9); + this.chkLater.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.chkLater.Name = "chkLater"; - this.chkLater.Size = new System.Drawing.Size(279, 17); + this.chkLater.Size = new System.Drawing.Size(418, 24); this.chkLater.TabIndex = 4; this.chkLater.Text = "Process Later"; this.chkLater.UseVisualStyleBackColor = true; @@ -404,8 +424,9 @@ this.label4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label4.Dock = System.Windows.Forms.DockStyle.Top; this.label4.Location = new System.Drawing.Point(0, 0); + this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(291, 23); + this.label4.Size = new System.Drawing.Size(436, 34); this.label4.TabIndex = 3; this.label4.Text = "Process"; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -435,9 +456,10 @@ this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255))))); this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(385, 0); + this.expandableSplitter1.Location = new System.Drawing.Point(578, 0); + this.expandableSplitter1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(6, 526); + this.expandableSplitter1.Size = new System.Drawing.Size(9, 809); this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter1.TabIndex = 4; this.expandableSplitter1.TabStop = false; @@ -450,8 +472,9 @@ this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx1.Dock = System.Windows.Forms.DockStyle.Left; this.panelEx1.Location = new System.Drawing.Point(0, 0); + this.panelEx1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(385, 526); + this.panelEx1.Size = new System.Drawing.Size(578, 809); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -483,9 +506,10 @@ this.sideNavItmDelete, this.sideNavItmExit}); this.sideNav1.Location = new System.Drawing.Point(0, 0); + this.sideNav1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.sideNav1.Name = "sideNav1"; - this.sideNav1.Padding = new System.Windows.Forms.Padding(1); - this.sideNav1.Size = new System.Drawing.Size(385, 526); + this.sideNav1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.sideNav1.Size = new System.Drawing.Size(578, 809); this.sideNav1.TabIndex = 3; this.sideNav1.Text = "sideNav1"; // @@ -498,9 +522,10 @@ this.sideNavPanel4.Controls.Add(this.myTVdel); this.sideNavPanel4.Controls.Add(this.btnDeleteItems); this.sideNavPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.sideNavPanel4.Location = new System.Drawing.Point(80, 31); + this.sideNavPanel4.Location = new System.Drawing.Point(109, 40); + this.sideNavPanel4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.sideNavPanel4.Name = "sideNavPanel4"; - this.sideNavPanel4.Size = new System.Drawing.Size(300, 494); + this.sideNavPanel4.Size = new System.Drawing.Size(461, 767); this.sideNavPanel4.TabIndex = 27; // // swDeleteFolder @@ -509,11 +534,12 @@ // // this.swDeleteFolder.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.swDeleteFolder.Location = new System.Drawing.Point(10, 43); + this.swDeleteFolder.Location = new System.Drawing.Point(15, 66); + this.swDeleteFolder.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.swDeleteFolder.Name = "swDeleteFolder"; - this.swDeleteFolder.Size = new System.Drawing.Size(69, 22); + this.swDeleteFolder.Size = new System.Drawing.Size(104, 34); this.swDeleteFolder.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.superTooltip1.SetSuperTooltip(this.swDeleteFolder, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Folders", "", resources.GetString("swDeleteFolder.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150))); + this.superTooltip1.SetSuperTooltip(this.swDeleteFolder, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Folders", "", resources.GetString("swDeleteFolder.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 140))); this.swDeleteFolder.SwitchClickTogglesValue = true; this.swDeleteFolder.TabIndex = 39; this.swDeleteFolder.ValueChanged += new System.EventHandler(this.swDeleteFolder_ValueChanged); @@ -526,10 +552,11 @@ // this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX13.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelX13.Location = new System.Drawing.Point(85, 42); + this.labelX13.Location = new System.Drawing.Point(128, 65); + this.labelX13.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.labelX13.Name = "labelX13"; - this.labelX13.Size = new System.Drawing.Size(168, 22); - this.superTooltip1.SetSuperTooltip(this.labelX13, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Folders", "", resources.GetString("labelX13.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(350, 175))); + this.labelX13.Size = new System.Drawing.Size(252, 34); + this.superTooltip1.SetSuperTooltip(this.labelX13, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Folders", "", resources.GetString("labelX13.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 140))); this.labelX13.TabIndex = 38; this.labelX13.Text = "Delete Folders"; // @@ -539,11 +566,12 @@ // // this.swDeleteAnnotations.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.swDeleteAnnotations.Location = new System.Drawing.Point(10, 15); + this.swDeleteAnnotations.Location = new System.Drawing.Point(15, 23); + this.swDeleteAnnotations.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.swDeleteAnnotations.Name = "swDeleteAnnotations"; - this.swDeleteAnnotations.Size = new System.Drawing.Size(69, 22); + this.swDeleteAnnotations.Size = new System.Drawing.Size(104, 34); this.swDeleteAnnotations.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.superTooltip1.SetSuperTooltip(this.swDeleteAnnotations, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Annotations", "", resources.GetString("swDeleteAnnotations.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(265, 175))); + this.superTooltip1.SetSuperTooltip(this.swDeleteAnnotations, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Annotations", "", resources.GetString("swDeleteAnnotations.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 155))); this.swDeleteAnnotations.SwitchClickTogglesValue = true; this.swDeleteAnnotations.TabIndex = 37; this.swDeleteAnnotations.Value = true; @@ -558,10 +586,11 @@ // this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX14.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelX14.Location = new System.Drawing.Point(85, 14); + this.labelX14.Location = new System.Drawing.Point(128, 22); + this.labelX14.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.labelX14.Name = "labelX14"; - this.labelX14.Size = new System.Drawing.Size(186, 22); - this.superTooltip1.SetSuperTooltip(this.labelX14, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Annotations", "", resources.GetString("labelX14.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 175))); + this.labelX14.Size = new System.Drawing.Size(279, 34); + this.superTooltip1.SetSuperTooltip(this.labelX14, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Annotations", "", resources.GetString("labelX14.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 155))); this.labelX14.TabIndex = 36; this.labelX14.Text = "Delete Annotations"; // @@ -569,9 +598,10 @@ // this.myTVdel.CheckBoxes = true; this.myTVdel.Dock = System.Windows.Forms.DockStyle.Bottom; - this.myTVdel.Location = new System.Drawing.Point(0, 127); + this.myTVdel.Location = new System.Drawing.Point(0, 205); + this.myTVdel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.myTVdel.Name = "myTVdel"; - this.myTVdel.Size = new System.Drawing.Size(300, 367); + this.myTVdel.Size = new System.Drawing.Size(461, 562); this.myTVdel.TabIndex = 34; this.myTVdel.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.myTV_AfterCheck_DelAnn); // @@ -582,9 +612,10 @@ | System.Windows.Forms.AnchorStyles.Right))); this.btnDeleteItems.Checked = true; this.btnDeleteItems.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDeleteItems.Location = new System.Drawing.Point(39, 98); + this.btnDeleteItems.Location = new System.Drawing.Point(58, 151); + this.btnDeleteItems.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btnDeleteItems.Name = "btnDeleteItems"; - this.btnDeleteItems.Size = new System.Drawing.Size(221, 23); + this.btnDeleteItems.Size = new System.Drawing.Size(343, 35); this.btnDeleteItems.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.superTooltip1.SetSuperTooltip(this.btnDeleteItems, new DevComponents.DotNetBar.SuperTooltipInfo("Process Deletions", "", resources.GetString("btnDeleteItems.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 175))); this.btnDeleteItems.TabIndex = 35; @@ -605,9 +636,10 @@ this.sideNavPanel3.Controls.Add(this.myTV); this.sideNavPanel3.Controls.Add(this.btnFixLinks); this.sideNavPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.sideNavPanel3.Location = new System.Drawing.Point(89, 31); + this.sideNavPanel3.Location = new System.Drawing.Point(134, 48); + this.sideNavPanel3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.sideNavPanel3.Name = "sideNavPanel3"; - this.sideNavPanel3.Size = new System.Drawing.Size(291, 494); + this.sideNavPanel3.Size = new System.Drawing.Size(436, 760); this.sideNavPanel3.TabIndex = 10; this.sideNavPanel3.Visible = false; // @@ -617,9 +649,10 @@ // // this.swCheckROLinks.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.swCheckROLinks.Location = new System.Drawing.Point(10, 66); + this.swCheckROLinks.Location = new System.Drawing.Point(15, 102); + this.swCheckROLinks.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.swCheckROLinks.Name = "swCheckROLinks"; - this.swCheckROLinks.Size = new System.Drawing.Size(91, 22); + this.swCheckROLinks.Size = new System.Drawing.Size(136, 34); this.swCheckROLinks.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.superTooltip1.SetSuperTooltip(this.swCheckROLinks, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("swCheckROLinks.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150))); this.swCheckROLinks.SwitchClickTogglesValue = true; @@ -634,9 +667,10 @@ // this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX12.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelX12.Location = new System.Drawing.Point(107, 66); + this.labelX12.Location = new System.Drawing.Point(160, 102); + this.labelX12.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.labelX12.Name = "labelX12"; - this.labelX12.Size = new System.Drawing.Size(186, 22); + this.labelX12.Size = new System.Drawing.Size(279, 34); this.superTooltip1.SetSuperTooltip(this.labelX12, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("labelX12.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(350, 175))); this.labelX12.TabIndex = 32; this.labelX12.Text = "Check RO Links"; @@ -646,20 +680,21 @@ this.warningBox5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249))))); this.warningBox5.CloseButtonVisible = false; this.warningBox5.Image = ((System.Drawing.Image)(resources.GetObject("warningBox5.Image"))); - this.warningBox5.Location = new System.Drawing.Point(17, 145); - this.warningBox5.Margin = new System.Windows.Forms.Padding(4); + this.warningBox5.Location = new System.Drawing.Point(26, 223); + this.warningBox5.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.warningBox5.Name = "warningBox5"; this.warningBox5.OptionsButtonVisible = false; - this.warningBox5.Size = new System.Drawing.Size(262, 32); + this.warningBox5.Size = new System.Drawing.Size(393, 49); this.warningBox5.TabIndex = 31; this.warningBox5.Text = "NOTE These tools can take a long time to run"; // // line3 // this.line3.BackColor = System.Drawing.Color.Transparent; - this.line3.Location = new System.Drawing.Point(6, 127); + this.line3.Location = new System.Drawing.Point(9, 195); + this.line3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.line3.Name = "line3"; - this.line3.Size = new System.Drawing.Size(285, 12); + this.line3.Size = new System.Drawing.Size(428, 18); this.line3.TabIndex = 30; this.line3.Text = "line3"; // @@ -669,9 +704,10 @@ // // this.swUpdateROVals.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.swUpdateROVals.Location = new System.Drawing.Point(10, 10); + this.swUpdateROVals.Location = new System.Drawing.Point(15, 15); + this.swUpdateROVals.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.swUpdateROVals.Name = "swUpdateROVals"; - this.swUpdateROVals.Size = new System.Drawing.Size(91, 22); + this.swUpdateROVals.Size = new System.Drawing.Size(136, 34); this.swUpdateROVals.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.superTooltip1.SetSuperTooltip(this.swUpdateROVals, new DevComponents.DotNetBar.SuperTooltipInfo("Update RO Values", "", resources.GetString("swUpdateROVals.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150))); this.swUpdateROVals.SwitchClickTogglesValue = true; @@ -686,9 +722,10 @@ // // this.swRefreshTrans.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.swRefreshTrans.Location = new System.Drawing.Point(10, 38); + this.swRefreshTrans.Location = new System.Drawing.Point(15, 58); + this.swRefreshTrans.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.swRefreshTrans.Name = "swRefreshTrans"; - this.swRefreshTrans.Size = new System.Drawing.Size(91, 22); + this.swRefreshTrans.Size = new System.Drawing.Size(136, 34); this.swRefreshTrans.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.superTooltip1.SetSuperTooltip(this.swRefreshTrans, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Transitions", "", resources.GetString("swRefreshTrans.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(265, 175))); this.swRefreshTrans.SwitchClickTogglesValue = true; @@ -703,9 +740,10 @@ // this.labelX11.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX11.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelX11.Location = new System.Drawing.Point(107, 10); + this.labelX11.Location = new System.Drawing.Point(160, 15); + this.labelX11.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.labelX11.Name = "labelX11"; - this.labelX11.Size = new System.Drawing.Size(186, 22); + this.labelX11.Size = new System.Drawing.Size(279, 34); this.superTooltip1.SetSuperTooltip(this.labelX11, new DevComponents.DotNetBar.SuperTooltipInfo("Update RO Values", "", resources.GetString("labelX11.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150))); this.labelX11.TabIndex = 28; this.labelX11.Text = "Update RO Values"; @@ -718,9 +756,10 @@ // this.labelX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX6.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelX6.Location = new System.Drawing.Point(107, 38); + this.labelX6.Location = new System.Drawing.Point(160, 58); + this.labelX6.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.labelX6.Name = "labelX6"; - this.labelX6.Size = new System.Drawing.Size(186, 22); + this.labelX6.Size = new System.Drawing.Size(279, 34); this.superTooltip1.SetSuperTooltip(this.labelX6, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Transitions", "", resources.GetString("labelX6.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(256, 175))); this.labelX6.TabIndex = 28; this.labelX6.Text = "Refresh Transitions"; @@ -730,11 +769,11 @@ this.warningBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249))))); this.warningBox1.CloseButtonVisible = false; this.warningBox1.Image = ((System.Drawing.Image)(resources.GetObject("warningBox1.Image"))); - this.warningBox1.Location = new System.Drawing.Point(17, 181); - this.warningBox1.Margin = new System.Windows.Forms.Padding(4); + this.warningBox1.Location = new System.Drawing.Point(26, 278); + this.warningBox1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.warningBox1.Name = "warningBox1"; this.warningBox1.OptionsButtonVisible = false; - this.warningBox1.Size = new System.Drawing.Size(262, 43); + this.warningBox1.Size = new System.Drawing.Size(393, 66); this.warningBox1.TabIndex = 7; this.warningBox1.Text = " Be sure there is a current backup of the \r\n database prior to running these func" + "tions"; @@ -744,9 +783,10 @@ this.btnFixLinks.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnFixLinks.Checked = true; this.btnFixLinks.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnFixLinks.Location = new System.Drawing.Point(10, 98); + this.btnFixLinks.Location = new System.Drawing.Point(15, 151); + this.btnFixLinks.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btnFixLinks.Name = "btnFixLinks"; - this.btnFixLinks.Size = new System.Drawing.Size(280, 23); + this.btnFixLinks.Size = new System.Drawing.Size(420, 35); this.btnFixLinks.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.superTooltip1.SetSuperTooltip(this.btnFixLinks, new DevComponents.DotNetBar.SuperTooltipInfo("Process Links", "", "This will run the selected RO Links or Transitions Links tool.\r\n\r\nClick on the on" + "/off switches to turn on/off each tool.\r\n\r\nNote that only one of these tools can" + @@ -768,9 +808,10 @@ this.sideNavPanel1.Controls.Add(this.labelX1); this.sideNavPanel1.Controls.Add(this.btnRunCheck); this.sideNavPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.sideNavPanel1.Location = new System.Drawing.Point(89, 31); + this.sideNavPanel1.Location = new System.Drawing.Point(134, 48); + this.sideNavPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.sideNavPanel1.Name = "sideNavPanel1"; - this.sideNavPanel1.Size = new System.Drawing.Size(291, 494); + this.sideNavPanel1.Size = new System.Drawing.Size(436, 760); this.sideNavPanel1.TabIndex = 2; this.sideNavPanel1.Visible = false; // @@ -779,11 +820,11 @@ this.warningBox3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249))))); this.warningBox3.CloseButtonVisible = false; this.warningBox3.Image = ((System.Drawing.Image)(resources.GetObject("warningBox3.Image"))); - this.warningBox3.Location = new System.Drawing.Point(17, 207); - this.warningBox3.Margin = new System.Windows.Forms.Padding(4); + this.warningBox3.Location = new System.Drawing.Point(26, 318); + this.warningBox3.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.warningBox3.Name = "warningBox3"; this.warningBox3.OptionsButtonVisible = false; - this.warningBox3.Size = new System.Drawing.Size(264, 32); + this.warningBox3.Size = new System.Drawing.Size(396, 49); this.warningBox3.TabIndex = 29; this.warningBox3.Text = "NOTE These tools can take a long time to run"; // @@ -795,18 +836,20 @@ // this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX7.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelX7.Location = new System.Drawing.Point(5, 3); + this.labelX7.Location = new System.Drawing.Point(8, 5); + this.labelX7.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.labelX7.Name = "labelX7"; - this.labelX7.Size = new System.Drawing.Size(251, 22); + this.labelX7.Size = new System.Drawing.Size(376, 34); this.labelX7.TabIndex = 19; this.labelX7.Text = "Check for these Data Issues:"; // // line1 // this.line1.BackColor = System.Drawing.Color.Transparent; - this.line1.Location = new System.Drawing.Point(8, 179); + this.line1.Location = new System.Drawing.Point(12, 275); + this.line1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.line1.Name = "line1"; - this.line1.Size = new System.Drawing.Size(285, 12); + this.line1.Size = new System.Drawing.Size(428, 18); this.line1.TabIndex = 18; this.line1.Text = "line1"; // @@ -816,9 +859,10 @@ // // this.swCkObsoleteROData.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.swCkObsoleteROData.Location = new System.Drawing.Point(10, 99); + this.swCkObsoleteROData.Location = new System.Drawing.Point(15, 152); + this.swCkObsoleteROData.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.swCkObsoleteROData.Name = "swCkObsoleteROData"; - this.swCkObsoleteROData.Size = new System.Drawing.Size(91, 22); + this.swCkObsoleteROData.Size = new System.Drawing.Size(136, 34); this.swCkObsoleteROData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.superTooltip1.SetSuperTooltip(this.swCkObsoleteROData, new DevComponents.DotNetBar.SuperTooltipInfo("Obsolete RO Data", "", resources.GetString("swCkObsoleteROData.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 135))); this.swCkObsoleteROData.SwitchClickTogglesValue = true; @@ -833,9 +877,10 @@ // // this.swHiddenDataLocs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.swHiddenDataLocs.Location = new System.Drawing.Point(10, 71); + this.swHiddenDataLocs.Location = new System.Drawing.Point(15, 109); + this.swHiddenDataLocs.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.swHiddenDataLocs.Name = "swHiddenDataLocs"; - this.swHiddenDataLocs.Size = new System.Drawing.Size(91, 22); + this.swHiddenDataLocs.Size = new System.Drawing.Size(136, 34); this.swHiddenDataLocs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.superTooltip1.SetSuperTooltip(this.swHiddenDataLocs, new DevComponents.DotNetBar.SuperTooltipInfo("Hidden Data Locations", "", resources.GetString("swHiddenDataLocs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.swHiddenDataLocs.SwitchClickTogglesValue = true; @@ -852,9 +897,10 @@ // this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelX3.Location = new System.Drawing.Point(107, 99); + this.labelX3.Location = new System.Drawing.Point(160, 152); + this.labelX3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(154, 22); + this.labelX3.Size = new System.Drawing.Size(231, 34); this.superTooltip1.SetSuperTooltip(this.labelX3, new DevComponents.DotNetBar.SuperTooltipInfo("Obsolete RO Data", "", resources.GetString("labelX3.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 135))); this.labelX3.TabIndex = 11; this.labelX3.Text = "Obsolete RO Data"; @@ -867,9 +913,10 @@ // this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelX2.Location = new System.Drawing.Point(107, 71); + this.labelX2.Location = new System.Drawing.Point(160, 109); + this.labelX2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(140, 22); + this.labelX2.Size = new System.Drawing.Size(210, 34); this.superTooltip1.SetSuperTooltip(this.labelX2, new DevComponents.DotNetBar.SuperTooltipInfo("Hidden Data Locations", "", resources.GetString("labelX2.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.labelX2.TabIndex = 12; this.labelX2.Text = "Hidden Data Locations"; @@ -880,9 +927,10 @@ // // this.swCkOrphanDataRecs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.swCkOrphanDataRecs.Location = new System.Drawing.Point(10, 43); + this.swCkOrphanDataRecs.Location = new System.Drawing.Point(15, 66); + this.swCkOrphanDataRecs.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.swCkOrphanDataRecs.Name = "swCkOrphanDataRecs"; - this.swCkOrphanDataRecs.Size = new System.Drawing.Size(91, 22); + this.swCkOrphanDataRecs.Size = new System.Drawing.Size(136, 34); this.swCkOrphanDataRecs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.superTooltip1.SetSuperTooltip(this.swCkOrphanDataRecs, new DevComponents.DotNetBar.SuperTooltipInfo("Orphan Data Records", "", resources.GetString("swCkOrphanDataRecs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(275, 193))); this.swCkOrphanDataRecs.SwitchClickTogglesValue = true; @@ -899,9 +947,10 @@ // this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelX1.Location = new System.Drawing.Point(107, 43); + this.labelX1.Location = new System.Drawing.Point(160, 66); + this.labelX1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(172, 22); + this.labelX1.Size = new System.Drawing.Size(258, 34); this.superTooltip1.SetSuperTooltip(this.labelX1, new DevComponents.DotNetBar.SuperTooltipInfo("Orphan Data Records", "", resources.GetString("labelX1.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(275, 190))); this.labelX1.TabIndex = 8; this.labelX1.Text = "Orphan Data Records"; @@ -912,9 +961,10 @@ this.btnRunCheck.Checked = true; this.btnRunCheck.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnRunCheck.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnRunCheck.Location = new System.Drawing.Point(5, 150); + this.btnRunCheck.Location = new System.Drawing.Point(8, 231); + this.btnRunCheck.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btnRunCheck.Name = "btnRunCheck"; - this.btnRunCheck.Size = new System.Drawing.Size(286, 23); + this.btnRunCheck.Size = new System.Drawing.Size(429, 35); this.btnRunCheck.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.superTooltip1.SetSuperTooltip(this.btnRunCheck, new DevComponents.DotNetBar.SuperTooltipInfo("Run Check", "", "This will run the database check tools selected.\r\n\r\nClick on the on/off switches " + "to turn on/off each tool.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 100))); @@ -940,9 +990,10 @@ this.sideNavPanel2.Controls.Add(this.line2); this.sideNavPanel2.Controls.Add(this.btnRunRepair); this.sideNavPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.sideNavPanel2.Location = new System.Drawing.Point(89, 31); + this.sideNavPanel2.Location = new System.Drawing.Point(134, 48); + this.sideNavPanel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.sideNavPanel2.Name = "sideNavPanel2"; - this.sideNavPanel2.Size = new System.Drawing.Size(291, 494); + this.sideNavPanel2.Size = new System.Drawing.Size(436, 760); this.sideNavPanel2.TabIndex = 6; this.sideNavPanel2.Visible = false; // @@ -952,9 +1003,10 @@ // // this.swRefreshTblsForSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.swRefreshTblsForSrch.Location = new System.Drawing.Point(10, 153); + this.swRefreshTblsForSrch.Location = new System.Drawing.Point(15, 235); + this.swRefreshTblsForSrch.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.swRefreshTblsForSrch.Name = "swRefreshTblsForSrch"; - this.swRefreshTblsForSrch.Size = new System.Drawing.Size(91, 22); + this.swRefreshTblsForSrch.Size = new System.Drawing.Size(136, 34); this.swRefreshTblsForSrch.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.superTooltip1.SetSuperTooltip(this.swRefreshTblsForSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Word Attachments", "", resources.GetString("swRefreshTblsForSrch.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 200))); this.swRefreshTblsForSrch.SwitchClickTogglesValue = true; @@ -971,9 +1023,10 @@ // this.lblRefreshTblForSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblRefreshTblForSrch.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblRefreshTblForSrch.Location = new System.Drawing.Point(107, 153); + this.lblRefreshTblForSrch.Location = new System.Drawing.Point(160, 235); + this.lblRefreshTblForSrch.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.lblRefreshTblForSrch.Name = "lblRefreshTblForSrch"; - this.lblRefreshTblForSrch.Size = new System.Drawing.Size(186, 22); + this.lblRefreshTblForSrch.Size = new System.Drawing.Size(279, 34); this.superTooltip1.SetSuperTooltip(this.lblRefreshTblForSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Word Attachments", "", resources.GetString("lblRefreshTblForSrch.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 200))); this.lblRefreshTblForSrch.TabIndex = 31; this.lblRefreshTblForSrch.Text = "Refresh Tables For Search"; @@ -983,11 +1036,11 @@ this.warningBox4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249))))); this.warningBox4.CloseButtonVisible = false; this.warningBox4.Image = ((System.Drawing.Image)(resources.GetObject("warningBox4.Image"))); - this.warningBox4.Location = new System.Drawing.Point(12, 264); - this.warningBox4.Margin = new System.Windows.Forms.Padding(4); + this.warningBox4.Location = new System.Drawing.Point(18, 406); + this.warningBox4.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.warningBox4.Name = "warningBox4"; this.warningBox4.OptionsButtonVisible = false; - this.warningBox4.Size = new System.Drawing.Size(264, 32); + this.warningBox4.Size = new System.Drawing.Size(396, 49); this.warningBox4.TabIndex = 30; this.warningBox4.Text = "NOTE These tools can take a long time to run"; // @@ -996,11 +1049,11 @@ this.warningBox2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249))))); this.warningBox2.CloseButtonVisible = false; this.warningBox2.Image = ((System.Drawing.Image)(resources.GetObject("warningBox2.Image"))); - this.warningBox2.Location = new System.Drawing.Point(12, 302); - this.warningBox2.Margin = new System.Windows.Forms.Padding(4); + this.warningBox2.Location = new System.Drawing.Point(18, 465); + this.warningBox2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.warningBox2.Name = "warningBox2"; this.warningBox2.OptionsButtonVisible = false; - this.warningBox2.Size = new System.Drawing.Size(264, 43); + this.warningBox2.Size = new System.Drawing.Size(396, 66); this.warningBox2.TabIndex = 28; this.warningBox2.Text = " Be sure there is a current backup of the \r\n database prior to running these func" + "tions"; @@ -1011,9 +1064,10 @@ // // this.swRmObsoleteROData.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.swRmObsoleteROData.Location = new System.Drawing.Point(10, 66); + this.swRmObsoleteROData.Location = new System.Drawing.Point(15, 102); + this.swRmObsoleteROData.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.swRmObsoleteROData.Name = "swRmObsoleteROData"; - this.swRmObsoleteROData.Size = new System.Drawing.Size(91, 22); + this.swRmObsoleteROData.Size = new System.Drawing.Size(136, 34); this.swRmObsoleteROData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.superTooltip1.SetSuperTooltip(this.swRmObsoleteROData, new DevComponents.DotNetBar.SuperTooltipInfo("Remove Obsolete RO Data", "", resources.GetString("swRmObsoleteROData.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(230, 205))); this.swRmObsoleteROData.SwitchClickTogglesValue = true; @@ -1028,9 +1082,10 @@ // // this.swRefreshWordAttmts.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.swRefreshWordAttmts.Location = new System.Drawing.Point(10, 122); + this.swRefreshWordAttmts.Location = new System.Drawing.Point(15, 188); + this.swRefreshWordAttmts.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.swRefreshWordAttmts.Name = "swRefreshWordAttmts"; - this.swRefreshWordAttmts.Size = new System.Drawing.Size(91, 22); + this.swRefreshWordAttmts.Size = new System.Drawing.Size(136, 34); this.swRefreshWordAttmts.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.superTooltip1.SetSuperTooltip(this.swRefreshWordAttmts, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Word Attachments", "", resources.GetString("swRefreshWordAttmts.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 200))); this.swRefreshWordAttmts.SwitchClickTogglesValue = true; @@ -1045,9 +1100,10 @@ // // this.swStandardHypenChars.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.swStandardHypenChars.Location = new System.Drawing.Point(10, 94); + this.swStandardHypenChars.Location = new System.Drawing.Point(15, 145); + this.swStandardHypenChars.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.swStandardHypenChars.Name = "swStandardHypenChars"; - this.swStandardHypenChars.Size = new System.Drawing.Size(91, 22); + this.swStandardHypenChars.Size = new System.Drawing.Size(136, 34); this.swStandardHypenChars.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.superTooltip1.SetSuperTooltip(this.swStandardHypenChars, new DevComponents.DotNetBar.SuperTooltipInfo("Standardize Hyphen Characters", "", resources.GetString("swStandardHypenChars.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(225, 129))); this.swStandardHypenChars.SwitchClickTogglesValue = true; @@ -1064,9 +1120,10 @@ // this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelX4.Location = new System.Drawing.Point(107, 66); + this.labelX4.Location = new System.Drawing.Point(160, 102); + this.labelX4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(167, 22); + this.labelX4.Size = new System.Drawing.Size(250, 34); this.superTooltip1.SetSuperTooltip(this.labelX4, new DevComponents.DotNetBar.SuperTooltipInfo("Remove Obsolete RO Data", "", resources.GetString("labelX4.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(230, 205))); this.labelX4.TabIndex = 24; this.labelX4.Text = "Remove Obsolete RO Data"; @@ -1079,9 +1136,10 @@ // this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelX5.Location = new System.Drawing.Point(107, 122); + this.labelX5.Location = new System.Drawing.Point(160, 188); + this.labelX5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(186, 22); + this.labelX5.Size = new System.Drawing.Size(279, 34); this.superTooltip1.SetSuperTooltip(this.labelX5, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Word Attachments", "", resources.GetString("labelX5.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 200))); this.labelX5.TabIndex = 25; this.labelX5.Text = "Refresh Word Attachments"; @@ -1094,9 +1152,10 @@ // this.labelX9.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX9.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelX9.Location = new System.Drawing.Point(107, 94); + this.labelX9.Location = new System.Drawing.Point(160, 145); + this.labelX9.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.labelX9.Name = "labelX9"; - this.labelX9.Size = new System.Drawing.Size(186, 22); + this.labelX9.Size = new System.Drawing.Size(279, 34); this.superTooltip1.SetSuperTooltip(this.labelX9, new DevComponents.DotNetBar.SuperTooltipInfo("Standardize Hyphen Characters", "", resources.GetString("labelX9.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(225, 129))); this.labelX9.TabIndex = 25; this.labelX9.Text = "Standardize Hyphen Characters"; @@ -1107,9 +1166,10 @@ // // this.swRmOrphanDataRecs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.swRmOrphanDataRecs.Location = new System.Drawing.Point(10, 38); + this.swRmOrphanDataRecs.Location = new System.Drawing.Point(15, 58); + this.swRmOrphanDataRecs.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.swRmOrphanDataRecs.Name = "swRmOrphanDataRecs"; - this.swRmOrphanDataRecs.Size = new System.Drawing.Size(91, 22); + this.swRmOrphanDataRecs.Size = new System.Drawing.Size(136, 34); this.swRmOrphanDataRecs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.superTooltip1.SetSuperTooltip(this.swRmOrphanDataRecs, new DevComponents.DotNetBar.SuperTooltipInfo("Remove Orphan Data Records", "", resources.GetString("swRmOrphanDataRecs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(325, 140))); this.swRmOrphanDataRecs.SwitchClickTogglesValue = true; @@ -1126,9 +1186,10 @@ // this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX10.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelX10.Location = new System.Drawing.Point(107, 38); + this.labelX10.Location = new System.Drawing.Point(160, 58); + this.labelX10.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.labelX10.Name = "labelX10"; - this.labelX10.Size = new System.Drawing.Size(184, 22); + this.labelX10.Size = new System.Drawing.Size(276, 34); this.superTooltip1.SetSuperTooltip(this.labelX10, new DevComponents.DotNetBar.SuperTooltipInfo("Remove Orphan Data Records", "", resources.GetString("labelX10.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(325, 140))); this.labelX10.TabIndex = 22; this.labelX10.Text = "Remove Orphan Data Records"; @@ -1141,18 +1202,20 @@ // this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX8.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelX8.Location = new System.Drawing.Point(5, 3); + this.labelX8.Location = new System.Drawing.Point(8, 5); + this.labelX8.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.labelX8.Name = "labelX8"; - this.labelX8.Size = new System.Drawing.Size(251, 22); + this.labelX8.Size = new System.Drawing.Size(376, 34); this.labelX8.TabIndex = 21; this.labelX8.Text = "Repair these Data Issues:"; // // line2 // this.line2.BackColor = System.Drawing.Color.Transparent; - this.line2.Location = new System.Drawing.Point(4, 237); + this.line2.Location = new System.Drawing.Point(6, 365); + this.line2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.line2.Name = "line2"; - this.line2.Size = new System.Drawing.Size(281, 12); + this.line2.Size = new System.Drawing.Size(422, 18); this.line2.TabIndex = 20; this.line2.Text = "line2"; // @@ -1162,9 +1225,10 @@ this.btnRunRepair.Checked = true; this.btnRunRepair.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnRunRepair.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnRunRepair.Location = new System.Drawing.Point(5, 198); + this.btnRunRepair.Location = new System.Drawing.Point(8, 305); + this.btnRunRepair.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btnRunRepair.Name = "btnRunRepair"; - this.btnRunRepair.Size = new System.Drawing.Size(280, 23); + this.btnRunRepair.Size = new System.Drawing.Size(420, 35); this.btnRunRepair.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.superTooltip1.SetSuperTooltip(this.btnRunRepair, new DevComponents.DotNetBar.SuperTooltipInfo("Run Repair", "", "This will run the database repair tools selected.\r\n\r\nClick on the on/off switches" + " to turn on/off each tool.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 103))); @@ -1176,9 +1240,10 @@ // this.sideNavPanel5.Controls.Add(this.btn_ShowUsers); this.sideNavPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.sideNavPanel5.Location = new System.Drawing.Point(81, 31); + this.sideNavPanel5.Location = new System.Drawing.Point(122, 48); + this.sideNavPanel5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.sideNavPanel5.Name = "sideNavPanel5"; - this.sideNavPanel5.Size = new System.Drawing.Size(299, 494); + this.sideNavPanel5.Size = new System.Drawing.Size(448, 760); this.sideNavPanel5.TabIndex = 14; this.sideNavPanel5.Visible = false; // @@ -1187,9 +1252,10 @@ this.btn_ShowUsers.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btn_ShowUsers.Checked = true; this.btn_ShowUsers.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btn_ShowUsers.Location = new System.Drawing.Point(57, 37); + this.btn_ShowUsers.Location = new System.Drawing.Point(86, 57); + this.btn_ShowUsers.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btn_ShowUsers.Name = "btn_ShowUsers"; - this.btn_ShowUsers.Size = new System.Drawing.Size(171, 23); + this.btn_ShowUsers.Size = new System.Drawing.Size(256, 35); this.btn_ShowUsers.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.superTooltip1.SetSuperTooltip(this.btn_ShowUsers, new DevComponents.DotNetBar.SuperTooltipInfo("Show Users", "", "This will return all of the users currently with open sessions in the database an" + "d the details of any items they have checked out.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 80))); @@ -1272,8 +1338,9 @@ this.panelEx4.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx4.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx4.Location = new System.Drawing.Point(0, 0); + this.panelEx4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.panelEx4.Name = "panelEx4"; - this.panelEx4.Size = new System.Drawing.Size(1177, 56); + this.panelEx4.Size = new System.Drawing.Size(1766, 87); this.panelEx4.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx4.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx4.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -1300,9 +1367,10 @@ this.stepItem3, this.stepItem4}); this.progressSteps1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; - this.progressSteps1.Location = new System.Drawing.Point(123, 18); + this.progressSteps1.Location = new System.Drawing.Point(184, 28); + this.progressSteps1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.progressSteps1.Name = "progressSteps1"; - this.progressSteps1.Size = new System.Drawing.Size(1032, 26); + this.progressSteps1.Size = new System.Drawing.Size(1548, 40); this.progressSteps1.TabIndex = 18; // // stepItem1 @@ -1341,9 +1409,10 @@ // this.lblAdmToolProgressType.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblAdmToolProgressType.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblAdmToolProgressType.Location = new System.Drawing.Point(19, 10); + this.lblAdmToolProgressType.Location = new System.Drawing.Point(28, 15); + this.lblAdmToolProgressType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.lblAdmToolProgressType.Name = "lblAdmToolProgressType"; - this.lblAdmToolProgressType.Size = new System.Drawing.Size(98, 34); + this.lblAdmToolProgressType.Size = new System.Drawing.Size(147, 52); this.lblAdmToolProgressType.TabIndex = 19; this.lblAdmToolProgressType.Text = "Checking:"; // @@ -1359,10 +1428,11 @@ // // frmBatchRefresh // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1177, 586); + this.ClientSize = new System.Drawing.Size(1766, 902); this.Controls.Add(this.splitContainer3); + this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "frmBatchRefresh"; -- 2.47.2 From 6de13b12f9ba2faaa3d3a2c6e874d8aa5ed2e217 Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Wed, 7 Aug 2024 21:59:59 -0400 Subject: [PATCH 17/19] F2024-068-VCS-Deviation-Format --- PROMS/Formats/fmtall/VCSDEVall.xml | Bin 26240 -> 27986 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/VCSDEVall.xml b/PROMS/Formats/fmtall/VCSDEVall.xml index 99edf9c6f848f96f5f77ab97d1162f7edae8b8d3..d1c7ad025807cd1e6a0e4c0ad02d82847631c163 100644 GIT binary patch delta 1758 zcmchY-AV#M6vzL28$?7zM1-4BccFbL#A-+=1omZJbZcrQq=jx@gxCuR!M;ZbK0y!A zO_$yD5Zy=rnc1mzHCQM^cAYtM=A8fe&Bxw98!xX$`@v|M*vAD*D4>jEJ_T%|%GNm& z2;%@XTyivwB!)2r)BRbTwaNC4^jbt5tMoB(EBi6Gw}Cuk+l+e7m?GXjJ?gZSP@#7U z#T*-D4w_$S{i#Gs3t5Ib;Y1^jEiu9;CMtq`~MH(5(7oxOCuf#<} z<=8c|7a8l+EhOsNPnn~P6WUdtC9FvQh!2EPm!YrFR%Es+l~$VUe#=whgcO_g3)+fp z8i%e#Z%M*0OP?y!Yhg;dDkSDgRIK|KGPc}XhclBM-_r{y{=EwtjB<*CY}QvGmx`2V z2coUj448JlSDsw7zo*_^(3D;#ZT9RQK|TFD>boRI#TtN*jFFO;MK(d}P^fIA`% zhmY>o@95^ZkFR)s>wI`k1)?1PAIi0EX#=9&Tg-&Go_^TNAx+ytM1BN(9|mV9Hr{C) zwKcF&H9AkpkTI#venO4T I`+95s6U282-~a#s delta 118 zcmca~i?QJ>0oOTSn3|tJH44j)|IXbN-A8=RU4`y&=2w>1 Date: Thu, 8 Aug 2024 09:01:31 -0400 Subject: [PATCH 18/19] B2024-038: tree view menuing for paste/replace of sections --- .../DisplayTabControl.cs | 7 ++++-- PROMS/Volian.Controls.Library/vlnTreeView.cs | 24 ++++++++++++++----- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DisplayTabControl.cs b/PROMS/Volian.Controls.Library/DisplayTabControl.cs index faecc214..5f37d421 100644 --- a/PROMS/Volian.Controls.Library/DisplayTabControl.cs +++ b/PROMS/Volian.Controls.Library/DisplayTabControl.cs @@ -672,8 +672,10 @@ namespace Volian.Controls.Library if (_MyDisplayTabItems.ContainsKey(key) && pasteType != ItemInfo.EAddpingPart.Replace) // If procedure page open use it unless replace { DisplayTabItem pg = _MyDisplayTabItems[key]; + // B2024-038: if section, refresh the editor even if the section is not expanded. + bool isSec = myItemInfo.IsSection; if (pg.MyStepTabPanel.MyStepPanel._LookupEditItems.ContainsKey(myItemInfo.ItemID) && - pg.MyStepTabPanel.MyStepPanel._LookupEditItems[myItemInfo.ItemID].Expanded) + (pg.MyStepTabPanel.MyStepPanel._LookupEditItems[myItemInfo.ItemID].Expanded || isSec)) { EditItem edtitm = pg.MyStepTabPanel.MyStepPanel._LookupEditItems[myItemInfo.ItemID]; switch (pasteType) @@ -710,7 +712,8 @@ namespace Volian.Controls.Library } else if (_MyDisplayTabItems.ContainsKey(key) && pasteType == ItemInfo.EAddpingPart.Replace) { - CloseTabItem(_MyDisplayTabItems["Item - " + myItemInfo.ItemID.ToString()]); //Grab itemID and set to close open tab. + // B2024-038: changed tab key to procedure (was item, which caused crash if section) + CloseTabItem(_MyDisplayTabItems["Item - " + proc.ItemID.ToString()]); //Grab itemID and set to close open tab. return false; //B2017-179 PasteReplace will return null if was aborted } return false; diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs index 78554d1b..e60b358b 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs @@ -1740,10 +1740,13 @@ namespace Volian.Controls.Library // 1) 'to' & 'from' both 'non', i.e. Neither can have enhanced config data (be source or enhanced) // can do Before/After/Replace // 2) 'to' section is 'source' and 'from' section is 'non' (has no MyEnhancedDocuments) - // can do Before/After - no links exist in pasted section. - // cannot do Replace + // can do Before/After - no links exist in pasted section so cannot do Replace // 3) 'to' section is 'source' and 'from' section is same docversion 'source' - // can do Before/After/Replace + // can do Before/After (B2024-038 removes replace) + // 4) 'to' section is not 'source' and 'from' section is source + // can do Before/After but not replace - would have to manage + // links for 'from' section (B2024-038 added this case) + SectionConfig secToCfg = iiPasteHere.MyConfig as SectionConfig; SectionConfig secFromCfg = iiClipboard.MyConfig as SectionConfig; @@ -1752,13 +1755,22 @@ namespace Volian.Controls.Library bool secFromIsEnhanced = iiClipboard.IsEnhancedSection; bool secFromIsSource = secFromCfg.MyEnhancedDocuments != null && secFromCfg.MyEnhancedDocuments.Count > 0 && secFromCfg.MyEnhancedDocuments[0].Type != 0; bool secCanPaste = false; - if (!secToIsEnhanced && !secToIsSource && !secFromIsEnhanced && !secFromIsSource) secCanPaste = true; // 1) - else if (secToIsSource && !secFromIsEnhanced && !secFromIsSource) // 2) + if (!secToIsEnhanced && !secToIsSource && !secFromIsEnhanced && !secFromIsSource) secCanPaste = true; // 1) + else if (secToIsSource && !secFromIsEnhanced && !secFromIsSource) // 2) { secCanPaste = true; okToReplace = false; } - else if (secToIsSource && iiPasteHere.MyDocVersion.VersionID == iiClipboard.MyDocVersion.VersionID) secCanPaste = true; // 3) + else if (secToIsSource && iiPasteHere.MyDocVersion.VersionID == iiClipboard.MyDocVersion.VersionID) + { + secCanPaste = true; // 3) + okToReplace = false; + } + else if (!secToIsSource && secFromIsSource) + { + secCanPaste = true; // 4 + okToReplace = false; + } if (iiClipboard.IsRtfRaw) secCanPaste = okToReplace = false; // never paste an equation. if (secCanPaste) cm.MenuItems.Add("Paste Section Before", new EventHandler(mi_Click)); if (okToReplace && secCanPaste) cm.MenuItems.Add("Replace Existing Section", new EventHandler(mi_Click)); -- 2.47.2 From 7129853902f8d9c8b210c3a2ada5c7c511ed5bdb Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Thu, 8 Aug 2024 13:33:16 -0400 Subject: [PATCH 19/19] F2024-069-Procedure-Set-Specific-Information-dialog-ajustments --- PROMS/Formats/fmtall/VCSDEVall.xml | Bin 27986 -> 27986 bytes PROMS/Formats/fmtall/VCSSAMGDEVall.xml | Bin 26266 -> 28052 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/VCSDEVall.xml b/PROMS/Formats/fmtall/VCSDEVall.xml index d1c7ad025807cd1e6a0e4c0ad02d82847631c163..620aaac3c9bdb6bb61d04a3a81172d1204e079e1 100644 GIT binary patch delta 85 zcmca~i}BJe#tmi6jHZ(}GKo(%;E7ItX^nBV3i-(G@!zp I4LFoi0b{BdG5`Po delta 85 zcmca~i}BJe#tmi6jK-5UGKo(%;E7ItX^nBV3i-(G@!zp I4LFoi0b*7dDgXcg diff --git a/PROMS/Formats/fmtall/VCSSAMGDEVall.xml b/PROMS/Formats/fmtall/VCSSAMGDEVall.xml index b34fd22d755e15d23a3bc61b7f46cc1f8f61a76d..5f8942e690ba6d0243ee523d1f7d1da4623e8086 100644 GIT binary patch delta 1890 zcmcgs+e!ja6kS43MM#K9L@;!DjI^5+qcN32AZ6)8uccE8d7YMBS!}VNsjcQ1s2oot}amYJ`P2~Ai5UXx) zMT5F@qBi+`i4Z0bKoE<3Yq+w;OZI3T`{XK-r9cjeOb~I(h>0B02GV?IIj1?R5EI5Q z1{rBwI$~rxfH{R@hUM>% zjGc(zj%Ub}#S!CbojEL6_}Q-VqQsiimZp+CrRFLeHsmRB(w`FZm+s2BBqi?I5}Q+! zxEL{cF7F6a(p4f$wnXK1_e4C4oq32r$Q$|A+HajTD5AuiQuHEc$tv~a@cjQcyx%F$ z+Ni&Gx;3G(#@47xYN{CN^zzT0j??8Mm_51c>~Ejzx2Pob$V(WPz9q!j25?Kyd{ILm>8Na09U>&vgw1>7M+} VM~Km6@=G@e&%jS;vxY~GDgZuMCH(*Z -- 2.47.2