Compare commits
No commits in common. "master" and "B2025-031" have entirely different histories.
@ -276,10 +276,8 @@ namespace ctlXMLEditLib
|
|||||||
bool imagechild; //whether this field is a subchild of an image
|
bool imagechild; //whether this field is a subchild of an image
|
||||||
string imagename; //if subchild of image, name of image parent (for save)
|
string imagename; //if subchild of image, name of image parent (for save)
|
||||||
string imagedate; //if this was filename, save the date/time stamp
|
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,
|
public TextBoxAttrTag(bool reqd, string ptn, RadioButton rd, bool img,
|
||||||
string imgname, string imgdate, string elemname)
|
string imgname, string imgdate)
|
||||||
{
|
{
|
||||||
this.req_msg = null;
|
this.req_msg = null;
|
||||||
this.required = reqd;
|
this.required = reqd;
|
||||||
@ -288,12 +286,6 @@ namespace ctlXMLEditLib
|
|||||||
this.imagechild = img;
|
this.imagechild = img;
|
||||||
this.imagename = imgname;
|
this.imagename = imgname;
|
||||||
this.imagedate = imgdate;
|
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 SetPattern(string pattern) {this.pattern = pattern;}
|
||||||
public void SetRequired(bool req) {this.required = req;}
|
public void SetRequired(bool req) {this.required = req;}
|
||||||
@ -306,10 +298,6 @@ namespace ctlXMLEditLib
|
|||||||
public string GetImageName { get {return imagename;}}
|
public string GetImageName { get {return imagename;}}
|
||||||
public string GetImageDate { get {return imagedate;}}
|
public string GetImageDate { get {return imagedate;}}
|
||||||
public void SetImageDate(string imgdate) {this.imagedate = imgdate;}
|
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)
|
public ctlXMLEdit(VlnXmlElement myelem, XmlSchema myschema, ArrayList reqfields, ArrayList fldsWithApplic, string [] pckids)
|
||||||
@ -940,7 +928,7 @@ namespace ctlXMLEditLib
|
|||||||
// initialization.
|
// initialization.
|
||||||
if (mytextbox.Tag == null)
|
if (mytextbox.Tag == null)
|
||||||
{
|
{
|
||||||
TextBoxAttrTag tag = new TextBoxAttrTag(false, pattern, radio, img, (img?imgname:null), null, mytextbox.Name);
|
TextBoxAttrTag tag = new TextBoxAttrTag(false, pattern, radio, img, (img?imgname:null), null);
|
||||||
mytextbox.Tag = (object) tag;
|
mytextbox.Tag = (object) tag;
|
||||||
}
|
}
|
||||||
return getannot;
|
return getannot;
|
||||||
@ -1148,7 +1136,6 @@ namespace ctlXMLEditLib
|
|||||||
mytextbox = new TextBox();
|
mytextbox = new TextBox();
|
||||||
mytextbox.Location = new Point(screenx+indent, screeny);
|
mytextbox.Location = new Point(screenx+indent, screeny);
|
||||||
string tFieldName = (pcChildIdx == 0) ? CvtUserFldToFld(element.Name) : CvtUserFldToFld(pcChildFldName);
|
string tFieldName = (pcChildIdx == 0) ? CvtUserFldToFld(element.Name) : CvtUserFldToFld(pcChildFldName);
|
||||||
mytextbox.Name = tFieldName;
|
|
||||||
myHT.Add(tFieldName, mytextbox);
|
myHT.Add(tFieldName, mytextbox);
|
||||||
tabindx++;
|
tabindx++;
|
||||||
Controls.Add(mytextbox);
|
Controls.Add(mytextbox);
|
||||||
@ -1214,21 +1201,9 @@ namespace ctlXMLEditLib
|
|||||||
string dfTxt = "";
|
string dfTxt = "";
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
string parentid = ((TextBoxAttrTag)tb.Tag).GetParentHTId;
|
ctlXMLEdit tmp = (ctlXMLEdit)tb?.Parent;
|
||||||
if (!string.IsNullOrEmpty(parentid))
|
if (!string.IsNullOrEmpty(tmp?.ActiveControl.Text))
|
||||||
{
|
dfTxt = tmp.ActiveControl.Text;
|
||||||
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
|
catch
|
||||||
{
|
{
|
||||||
|
@ -2167,12 +2167,11 @@ namespace VEPROMS
|
|||||||
btnAdministrativeTools.Click += new EventHandler(btnAdministrativeTools_Click);
|
btnAdministrativeTools.Click += new EventHandler(btnAdministrativeTools_Click);
|
||||||
btnAdmin.SubItems.Add(btnAdministrativeTools);
|
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));
|
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
|
// 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(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(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 Adminstration Tools Window", 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));
|
this.superTooltip1.SetSuperTooltip(btnUpdateFormats, new SuperTooltipInfo("Update Formats", "", "Install New Formats \n or Re-Install Formats", null, null, eTooltipColor.Gray));
|
||||||
|
|
||||||
try
|
try
|
||||||
|
Loading…
x
Reference in New Issue
Block a user