Compare commits

..

No commits in common. "79f66e964179c0b7da5def81c8c8afd6ea6d855d" and "2c1476b74c0c61df5e7d8db914cff23b5011a0e3" have entirely different histories.

3 changed files with 7 additions and 23 deletions

View File

@ -1192,27 +1192,14 @@ namespace ctlXMLEditLib
// C2021-026 Event handler for Parent/Child child textbox // C2021-026 Event handler for Parent/Child child textbox
// if the textbox text is same as parent, then or nothing is entered in the textbox // if the textbox text is same as parent, then or nothing is entered in the textbox
// then use the parent value and set the text color to gray // then use the parent value and set the text color to gray
// B2025-028 RO Editor - Parent Child Applicability - Default Values
// Were always setting to the Group parent value instead of individual parent values
// When leaving the textbox
private void txtBox_Leave(object sender, EventArgs e) private void txtBox_Leave(object sender, EventArgs e)
{ {
TextBox tb = sender as TextBox; TextBox tb = sender as TextBox;
string dfTxt = ""; string dfTxt = "";
try string parName = pcGrpBox.Name.Substring(5);
{ object o = myHT[parName];
ctlXMLEdit tmp = (ctlXMLEdit)tb?.Parent; if (o != null)
if (!string.IsNullOrEmpty(tmp?.ActiveControl.Text)) dfTxt = (o as TextBox).Text; // set to use the parent's value (default)
dfTxt = tmp.ActiveControl.Text;
}
catch
{
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)
}
if (dosaveflag) mysavexml = true; if (dosaveflag) mysavexml = true;
if (tb.Text.Length == 0 || tb.Text == dfTxt) if (tb.Text.Length == 0 || tb.Text == dfTxt)
{ {

View File

@ -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

View File

@ -3588,9 +3588,7 @@ namespace Volian.Controls.Library
if (tmp.MyDisplayTabControl.MyCopyStep != null && if (tmp.MyDisplayTabControl.MyCopyStep != null &&
tmp.MyDisplayTabControl.MyCopyStep.ItemID == MyEditItem.MyItemInfo.ItemID) tmp.MyDisplayTabControl.MyCopyStep.ItemID == MyEditItem.MyItemInfo.ItemID)
{ {
//B2025-031 - Improve wording for if attempting to delete copied section 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;
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;
clearCopyStep = true; clearCopyStep = true;
} }