C2021-059 - Updates to get build moving after custom merging
This commit is contained in:
@@ -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);
|
||||
|
@@ -1876,8 +1876,9 @@ namespace VEPROMS
|
||||
|
||||
return true;
|
||||
}
|
||||
catch
|
||||
catch (Exception ex)
|
||||
{
|
||||
string err = ex.ToString();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
@@ -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.</value>
|
||||
</data>
|
||||
<data name="btnDeleteItems.SuperTooltip" xml:space="preserve">
|
||||
<value>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.</value>
|
||||
</data>
|
||||
<data name="swCheckROLinks.SuperTooltip" xml:space="preserve">
|
||||
|
Reference in New Issue
Block a user