Compare commits
1 Commits
C2025_031_
...
B2025-028
Author | SHA1 | Date | |
---|---|---|---|
2970c0d7d4 |
@@ -276,8 +276,10 @@ namespace ctlXMLEditLib
|
||||
bool imagechild; //whether this field is a subchild of an image
|
||||
string imagename; //if subchild of image, name of image parent (for save)
|
||||
string imagedate; //if this was filename, save the date/time stamp
|
||||
string name; //name of element
|
||||
string parenthtid; //name of parent element in hashtable for PC items
|
||||
public TextBoxAttrTag(bool reqd, string ptn, RadioButton rd, bool img,
|
||||
string imgname, string imgdate)
|
||||
string imgname, string imgdate, string elemname)
|
||||
{
|
||||
this.req_msg = null;
|
||||
this.required = reqd;
|
||||
@@ -286,6 +288,12 @@ namespace ctlXMLEditLib
|
||||
this.imagechild = img;
|
||||
this.imagename = imgname;
|
||||
this.imagedate = imgdate;
|
||||
this.name = elemname;
|
||||
|
||||
if (name.Contains("_PCCHILD"))
|
||||
this.parenthtid = name.Substring(0, name.IndexOf("_PCCHILD"));
|
||||
else
|
||||
this.parenthtid = null;
|
||||
}
|
||||
public void SetPattern(string pattern) {this.pattern = pattern;}
|
||||
public void SetRequired(bool req) {this.required = req;}
|
||||
@@ -298,6 +306,10 @@ namespace ctlXMLEditLib
|
||||
public string GetImageName { get {return imagename;}}
|
||||
public string GetImageDate { get {return imagedate;}}
|
||||
public void SetImageDate(string imgdate) {this.imagedate = imgdate;}
|
||||
public string GetName { get { return name; } }
|
||||
public void SetName(string elemname) { this.name = elemname; }
|
||||
public string GetParentHTId { get { return parenthtid; } }
|
||||
public void SetParentHTId(string id) { this.parenthtid = id; }
|
||||
}
|
||||
|
||||
public ctlXMLEdit(VlnXmlElement myelem, XmlSchema myschema, ArrayList reqfields, ArrayList fldsWithApplic, string [] pckids)
|
||||
@@ -928,7 +940,7 @@ namespace ctlXMLEditLib
|
||||
// initialization.
|
||||
if (mytextbox.Tag == null)
|
||||
{
|
||||
TextBoxAttrTag tag = new TextBoxAttrTag(false, pattern, radio, img, (img?imgname:null), null);
|
||||
TextBoxAttrTag tag = new TextBoxAttrTag(false, pattern, radio, img, (img?imgname:null), null, mytextbox.Name);
|
||||
mytextbox.Tag = (object) tag;
|
||||
}
|
||||
return getannot;
|
||||
@@ -1136,6 +1148,7 @@ namespace ctlXMLEditLib
|
||||
mytextbox = new TextBox();
|
||||
mytextbox.Location = new Point(screenx+indent, screeny);
|
||||
string tFieldName = (pcChildIdx == 0) ? CvtUserFldToFld(element.Name) : CvtUserFldToFld(pcChildFldName);
|
||||
mytextbox.Name = tFieldName;
|
||||
myHT.Add(tFieldName, mytextbox);
|
||||
tabindx++;
|
||||
Controls.Add(mytextbox);
|
||||
@@ -1201,9 +1214,21 @@ namespace ctlXMLEditLib
|
||||
string dfTxt = "";
|
||||
try
|
||||
{
|
||||
ctlXMLEdit tmp = (ctlXMLEdit)tb?.Parent;
|
||||
if (!string.IsNullOrEmpty(tmp?.ActiveControl.Text))
|
||||
dfTxt = tmp.ActiveControl.Text;
|
||||
string parentid = ((TextBoxAttrTag)tb.Tag).GetParentHTId;
|
||||
if (!string.IsNullOrEmpty(parentid))
|
||||
{
|
||||
object o = myHT[parentid];
|
||||
if (o != null)
|
||||
dfTxt = (o as TextBox).Text; // set to use the parent's value (default)
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
string parName = pcGrpBox.Name.Substring(5);
|
||||
object o = myHT[parName];
|
||||
if (o != null)
|
||||
dfTxt = (o as TextBox).Text; // set to use the parent's value (default)
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
|
@@ -2167,12 +2167,11 @@ namespace VEPROMS
|
||||
btnAdministrativeTools.Click += new EventHandler(btnAdministrativeTools_Click);
|
||||
btnAdmin.SubItems.Add(btnAdministrativeTools);
|
||||
|
||||
// C2025-031 added tool tip messages
|
||||
this.superTooltip1.SetSuperTooltip(btnManageSecurity, new SuperTooltipInfo("Manage Security", "", "Add, Modify, and Delete PROMS User Access", null, null, eTooltipColor.Gray));
|
||||
// remove commented out line below when User Control of Formats code is deleted
|
||||
//this.superTooltip1.SetSuperTooltip(btnUserControlOfFormats, new SuperTooltipInfo("User Control Of Formats", null, null, null, null, eTooltipColor.Gray));
|
||||
this.superTooltip1.SetSuperTooltip(btnResetSecurity, new SuperTooltipInfo("Reset Security", "", "WARNING this will \nREMOVE ALL PROMS USERS and Reset to the\nOriginal Volian Defaults", null, null, eTooltipColor.Gray));
|
||||
this.superTooltip1.SetSuperTooltip(btnAdministrativeTools, new SuperTooltipInfo("Administrative Tools", "", "Open the PROMS Adminstration Tools Window", null, null, eTooltipColor.Gray));
|
||||
this.superTooltip1.SetSuperTooltip(btnResetSecurity, new SuperTooltipInfo("Reset Security", "", "WARNING this will \nREMOVE ALL PROMS USERS and Reset to\nthe Oringal Volian Defaults", null, null, eTooltipColor.Gray));
|
||||
this.superTooltip1.SetSuperTooltip(btnAdministrativeTools, new SuperTooltipInfo("Administrative Tools", "", "Open the PROMS Adminstation Tools Window", null, null, eTooltipColor.Gray));
|
||||
this.superTooltip1.SetSuperTooltip(btnUpdateFormats, new SuperTooltipInfo("Update Formats", "", "Install New Formats \n or Re-Install Formats", null, null, eTooltipColor.Gray));
|
||||
|
||||
try
|
||||
|
@@ -3588,9 +3588,7 @@ namespace Volian.Controls.Library
|
||||
if (tmp.MyDisplayTabControl.MyCopyStep != null &&
|
||||
tmp.MyDisplayTabControl.MyCopyStep.ItemID == MyEditItem.MyItemInfo.ItemID)
|
||||
{
|
||||
//B2025-031 - Improve wording for if attempting to delete copied section
|
||||
string stype = MyEditItem.MyItemInfo.IsSection ? "section" : "step";
|
||||
if (FlexibleMessageBox.Show($"Are you sure?\n\nIf you delete this {stype} you will not able to paste it.\nYou should paste it before you delete it.", $"Attempting to delete copied {stype}.", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) return;
|
||||
if (FlexibleMessageBox.Show("Are you sure?\n\nIf you delete this step you will not able to paste it.\nYou should paste it before you delete it.", "Attempting to delete copied step.", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) return;
|
||||
clearCopyStep = true;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user