Compare commits

...

5 Commits

Author SHA1 Message Date
2970c0d7d4 B2025-028 RO Editor - Parent Child Applicability - Default Values
While working with parent/child applicability with child applicability set for a setpoint group - assign the Setpoint Values and Short Description fields to have Child values.  All child values default to their parent values as expected.  However, if you click in the Parent field for the Short Description, the Child Values for the Short Description fields incorrectly defaulted to the Parent Setpoint Value instead of keeping the parent Short Description.
2025-05-15 10:28:47 -04:00
700d9656b2 B2025-028 RO Editor - Parent Child Applicability - Default Values
While working with parent/child applicability with child applicability set for a setpoint group - assign the Setpoint Values and Short Description fields to have Child values.  All child values default to their parent values as expected.  However, if you click in the Parent field for the Short Description, the Child Values for the Short Description fields incorrectly defaulted to the Parent Setpoint Value instead of keeping the parent Short Description.
2025-05-14 11:42:51 -04:00
0c17d9abc2 Merge pull request 'C2025-031 - Added Tool Tip text for button on V button. Code fix for DotNetBar Visual UI rendering' (#550) from C2025_031_OptionsTooltips_Cleanup into Development
looks good. Ready for QA.
2025-05-13 16:09:26 -04:00
2c1476b74c C2025-031 - Added Tool Tip text for button on V button. Code fix for DotNetBar Visual UI rendering 2025-05-13 16:03:44 -04:00
0fa71727ac Merge pull request 'B2025-030 Show Cannot restore wording if restoring Annotation with a deleted annotation type.' (#549) from B2025-030 into Development
good for testing phase
2025-05-13 14:27:23 -04:00
7 changed files with 132 additions and 75 deletions

View File

@@ -276,8 +276,10 @@ 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 imgname, string imgdate, string elemname)
{ {
this.req_msg = null; this.req_msg = null;
this.required = reqd; this.required = reqd;
@@ -286,6 +288,12 @@ 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;}
@@ -298,6 +306,10 @@ 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)
@@ -928,7 +940,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); TextBoxAttrTag tag = new TextBoxAttrTag(false, pattern, radio, img, (img?imgname:null), null, mytextbox.Name);
mytextbox.Tag = (object) tag; mytextbox.Tag = (object) tag;
} }
return getannot; return getannot;
@@ -1136,6 +1148,7 @@ 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);
@@ -1192,14 +1205,39 @@ 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 = "";
string parName = pcGrpBox.Name.Substring(5); try
object o = myHT[parName]; {
if (o != null) string parentid = ((TextBoxAttrTag)tb.Tag).GetParentHTId;
dfTxt = (o as TextBox).Text; // set to use the parent's value (default) 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
{
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

@@ -1099,7 +1099,7 @@ namespace VEPROMS
this.btnReset.Location = new System.Drawing.Point(194, 492); this.btnReset.Location = new System.Drawing.Point(194, 492);
this.btnReset.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnReset.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.btnReset.Name = "btnReset"; this.btnReset.Name = "btnReset";
this.btnReset.RightToLeft = System.Windows.Forms.RightToLeft.Yes; this.btnReset.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnReset.Size = new System.Drawing.Size(79, 19); this.btnReset.Size = new System.Drawing.Size(79, 19);
this.superTooltip1.SetSuperTooltip(this.btnReset, new DevComponents.DotNetBar.SuperTooltipInfo("Default Settings", "", "This will reset saved user settings back to the Proms system default.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(140, 95))); this.superTooltip1.SetSuperTooltip(this.btnReset, new DevComponents.DotNetBar.SuperTooltipInfo("Default Settings", "", "This will reset saved user settings back to the Proms system default.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(140, 95)));
this.btnReset.TabIndex = 3; this.btnReset.TabIndex = 3;

View File

@@ -47,13 +47,13 @@ namespace VEPROMS
this.btnOpen = new DevComponents.DotNetBar.ButtonItem(); this.btnOpen = new DevComponents.DotNetBar.ButtonItem();
this.btnPrepare = new DevComponents.DotNetBar.ButtonItem(); this.btnPrepare = new DevComponents.DotNetBar.ButtonItem();
this.btnAdmin = new DevComponents.DotNetBar.ButtonItem(); this.btnAdmin = new DevComponents.DotNetBar.ButtonItem();
this.btnUpdateFormats = new DevComponents.DotNetBar.ButtonItem();
this.icRecentDocs = new DevComponents.DotNetBar.ItemContainer(); this.icRecentDocs = new DevComponents.DotNetBar.ItemContainer();
this.labelItem8 = new DevComponents.DotNetBar.LabelItem(); this.labelItem8 = new DevComponents.DotNetBar.LabelItem();
this.itemContainer5 = new DevComponents.DotNetBar.ItemContainer(); this.itemContainer5 = new DevComponents.DotNetBar.ItemContainer();
this.btnOptions = new DevComponents.DotNetBar.ButtonItem(); this.btnOptions = new DevComponents.DotNetBar.ButtonItem();
this.btnExit = new DevComponents.DotNetBar.ButtonItem(); this.btnExit = new DevComponents.DotNetBar.ButtonItem();
this.qatCustomizeItem1 = new DevComponents.DotNetBar.QatCustomizeItem(); this.qatCustomizeItem1 = new DevComponents.DotNetBar.QatCustomizeItem();
this.btnUpdateFormats = new DevComponents.DotNetBar.ButtonItem();
this.galleryGroup1 = new DevComponents.DotNetBar.GalleryGroup(); this.galleryGroup1 = new DevComponents.DotNetBar.GalleryGroup();
this.galleryGroup2 = new DevComponents.DotNetBar.GalleryGroup(); this.galleryGroup2 = new DevComponents.DotNetBar.GalleryGroup();
this.galleryGroup3 = new DevComponents.DotNetBar.GalleryGroup(); this.galleryGroup3 = new DevComponents.DotNetBar.GalleryGroup();
@@ -208,13 +208,13 @@ namespace VEPROMS
this.btnHelp.KeyTips = "?"; this.btnHelp.KeyTips = "?";
this.btnHelp.Name = "btnHelp"; this.btnHelp.Name = "btnHelp";
this.btnHelp.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnHelp.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
this.btnHelpManual, this.btnHelpManual,
this.btnShortCuts, this.btnShortCuts,
this.btnHelpVWeb, this.btnHelpVWeb,
this.btnSendErrorLog, this.btnSendErrorLog,
this.btnShowErrFld, this.btnShowErrFld,
this.btnShowPrtFld, this.btnShowPrtFld,
this.btnHelpAbout}); this.btnHelpAbout});
this.btnHelp.Text = "Help"; this.btnHelp.Text = "Help";
// //
// btnHelpManual // btnHelpManual
@@ -249,23 +249,19 @@ namespace VEPROMS
this.btnSendErrorLog.Click += new System.EventHandler(this.btnSendErrorLog_Click); this.btnSendErrorLog.Click += new System.EventHandler(this.btnSendErrorLog_Click);
// //
// btnShowErrFld // btnShowErrFld
// //
//this.btnShowErrFld.Image = global::VEPROMS.Properties.Resources.GoToParentFolderHS;
this.btnShowErrFld.Image = ((System.Drawing.Image)(resources.GetObject("btnShowErrFld.Image"))); this.btnShowErrFld.Image = ((System.Drawing.Image)(resources.GetObject("btnShowErrFld.Image")));
this.btnShowErrFld.Name = "btnShowErrFld"; this.btnShowErrFld.Name = "btnShowErrFld";
this.btnShowErrFld.Text = "Open Log Folder"; this.btnShowErrFld.Text = "Open Log Folder";
this.btnShowErrFld.Click += new System.EventHandler(this.btnShowErrFld_Click); this.btnShowErrFld.Click += new System.EventHandler(this.btnShowErrFld_Click);
// //
// btnShowPrtFld // btnShowPrtFld
// //
//this.btnShowPrtFld.Image = global::VEPROMS.Properties.Resources.GoToParentFolderHS;
this.btnShowPrtFld.Image = ((System.Drawing.Image)(resources.GetObject("btnShowPrtFld.Image"))); this.btnShowPrtFld.Image = ((System.Drawing.Image)(resources.GetObject("btnShowPrtFld.Image")));
this.btnShowPrtFld.Name = "btnShowPrtFld"; this.btnShowPrtFld.Name = "btnShowPrtFld";
this.btnShowPrtFld.Text = "Open Default Print Folder"; this.btnShowPrtFld.Text = "Open Default Print Folder";
this.btnShowPrtFld.Click += new System.EventHandler(this.btnShowPrtFld_Click); this.btnShowPrtFld.Click += new System.EventHandler(this.btnShowPrtFld_Click);
// //
//
//
// btnHelpAbout // btnHelpAbout
// //
this.btnHelpAbout.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; this.btnHelpAbout.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
@@ -303,6 +299,10 @@ namespace VEPROMS
this.itemContainer1.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.itemContainer1.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
this.itemContainer2, this.itemContainer2,
this.itemContainer5}); this.itemContainer5});
//
//
//
this.itemContainer1.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
// //
// //
// //
@@ -320,6 +320,10 @@ namespace VEPROMS
this.itemContainer2.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.itemContainer2.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
this.itemContainer3, this.itemContainer3,
this.icRecentDocs}); this.icRecentDocs});
//
//
//
this.itemContainer2.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
// //
// //
// //
@@ -340,6 +344,10 @@ namespace VEPROMS
this.btnOpen, this.btnOpen,
this.btnPrepare, this.btnPrepare,
this.btnAdmin}); this.btnAdmin});
//
//
//
this.itemContainer3.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
// //
// //
// //
@@ -363,7 +371,6 @@ namespace VEPROMS
this.btnOpen.SubItemsExpandWidth = 24; this.btnOpen.SubItemsExpandWidth = 24;
this.btnOpen.Text = "&Open..."; this.btnOpen.Text = "&Open...";
this.btnOpen.Click += new System.EventHandler(this.btnOpen_Click); this.btnOpen.Click += new System.EventHandler(this.btnOpen_Click);
// //
// btnPrepare // btnPrepare
// //
@@ -382,16 +389,8 @@ namespace VEPROMS
this.btnAdmin.CanCustomize = false; this.btnAdmin.CanCustomize = false;
this.btnAdmin.Image = global::VEPROMS.Properties.Resources.Admin; this.btnAdmin.Image = global::VEPROMS.Properties.Resources.Admin;
this.btnAdmin.Name = "btnAdmin"; this.btnAdmin.Name = "btnAdmin";
//this.btnAdmin.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
//this.btnUpdateFormats});
this.btnAdmin.Text = "A&dministration"; this.btnAdmin.Text = "A&dministration";
// //
// btnUpdateFormats
//
this.btnUpdateFormats.Name = "btnUpdateFormats";
this.btnUpdateFormats.Text = "Update Formats";
this.btnUpdateFormats.Click += new System.EventHandler(this.btnUpdateFormat_Click);
//
// icRecentDocs // icRecentDocs
// //
// //
@@ -404,6 +403,10 @@ namespace VEPROMS
this.icRecentDocs.Name = "icRecentDocs"; this.icRecentDocs.Name = "icRecentDocs";
this.icRecentDocs.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.icRecentDocs.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
this.labelItem8}); this.labelItem8});
//
//
//
this.icRecentDocs.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
// //
// //
// //
@@ -432,6 +435,10 @@ namespace VEPROMS
this.itemContainer5.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.itemContainer5.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
this.btnOptions, this.btnOptions,
this.btnExit}); this.btnExit});
//
//
//
this.itemContainer5.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
// //
// //
// //
@@ -444,6 +451,7 @@ namespace VEPROMS
this.btnOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnOptions.Image"))); this.btnOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnOptions.Image")));
this.btnOptions.Name = "btnOptions"; this.btnOptions.Name = "btnOptions";
this.btnOptions.SubItemsExpandWidth = 24; this.btnOptions.SubItemsExpandWidth = 24;
this.superTooltip1.SetSuperTooltip(this.btnOptions, new DevComponents.DotNetBar.SuperTooltipInfo("Options", "", "Set User-Based PROMS Editing Preferences", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
this.btnOptions.Text = "Opt&ions"; this.btnOptions.Text = "Opt&ions";
this.btnOptions.Click += new System.EventHandler(this.btnOptions_Click); this.btnOptions.Click += new System.EventHandler(this.btnOptions_Click);
// //
@@ -454,6 +462,7 @@ namespace VEPROMS
this.btnExit.Image = ((System.Drawing.Image)(resources.GetObject("btnExit.Image"))); this.btnExit.Image = ((System.Drawing.Image)(resources.GetObject("btnExit.Image")));
this.btnExit.Name = "btnExit"; this.btnExit.Name = "btnExit";
this.btnExit.SubItemsExpandWidth = 24; this.btnExit.SubItemsExpandWidth = 24;
this.superTooltip1.SetSuperTooltip(this.btnExit, new DevComponents.DotNetBar.SuperTooltipInfo("Exit", "", "Close and Exit PROMS", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
this.btnExit.Text = "E&xit"; this.btnExit.Text = "E&xit";
this.btnExit.Click += new System.EventHandler(this.btnExit_Click); this.btnExit.Click += new System.EventHandler(this.btnExit_Click);
// //
@@ -461,6 +470,12 @@ namespace VEPROMS
// //
this.qatCustomizeItem1.Name = "qatCustomizeItem1"; this.qatCustomizeItem1.Name = "qatCustomizeItem1";
// //
// btnUpdateFormats
//
this.btnUpdateFormats.Name = "btnUpdateFormats";
this.btnUpdateFormats.Text = "Update Formats";
this.btnUpdateFormats.Click += new System.EventHandler(this.btnUpdateFormat_Click);
//
// galleryGroup1 // galleryGroup1
// //
this.galleryGroup1.Name = "galleryGroup1"; this.galleryGroup1.Name = "galleryGroup1";
@@ -535,7 +550,7 @@ namespace VEPROMS
// //
this.txtSearch.Dock = System.Windows.Forms.DockStyle.Right; this.txtSearch.Dock = System.Windows.Forms.DockStyle.Right;
this.txtSearch.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F); this.txtSearch.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
this.txtSearch.Location = new System.Drawing.Point(820, 0); this.txtSearch.Location = new System.Drawing.Point(810, 0);
this.txtSearch.Multiline = true; this.txtSearch.Multiline = true;
this.txtSearch.Name = "txtSearch"; this.txtSearch.Name = "txtSearch";
this.txtSearch.Size = new System.Drawing.Size(100, 25); this.txtSearch.Size = new System.Drawing.Size(100, 25);
@@ -544,7 +559,7 @@ namespace VEPROMS
// btnPrevious // btnPrevious
// //
this.btnPrevious.Dock = System.Windows.Forms.DockStyle.Right; this.btnPrevious.Dock = System.Windows.Forms.DockStyle.Right;
this.btnPrevious.Location = new System.Drawing.Point(920, 0); this.btnPrevious.Location = new System.Drawing.Point(910, 0);
this.btnPrevious.Name = "btnPrevious"; this.btnPrevious.Name = "btnPrevious";
this.btnPrevious.Size = new System.Drawing.Size(23, 25); this.btnPrevious.Size = new System.Drawing.Size(23, 25);
this.btnPrevious.TabIndex = 1; this.btnPrevious.TabIndex = 1;
@@ -554,7 +569,7 @@ namespace VEPROMS
// btnPrint1 // btnPrint1
// //
this.btnPrint1.Dock = System.Windows.Forms.DockStyle.Right; this.btnPrint1.Dock = System.Windows.Forms.DockStyle.Right;
this.btnPrint1.Location = new System.Drawing.Point(943, 0); this.btnPrint1.Location = new System.Drawing.Point(933, 0);
this.btnPrint1.Name = "btnPrint1"; this.btnPrint1.Name = "btnPrint1";
this.btnPrint1.Size = new System.Drawing.Size(23, 25); this.btnPrint1.Size = new System.Drawing.Size(23, 25);
this.btnPrint1.TabIndex = 2; this.btnPrint1.TabIndex = 2;
@@ -566,7 +581,7 @@ namespace VEPROMS
this.cbScrunch.Checked = true; this.cbScrunch.Checked = true;
this.cbScrunch.CheckState = System.Windows.Forms.CheckState.Checked; this.cbScrunch.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbScrunch.Dock = System.Windows.Forms.DockStyle.Right; this.cbScrunch.Dock = System.Windows.Forms.DockStyle.Right;
this.cbScrunch.Location = new System.Drawing.Point(966, 0); this.cbScrunch.Location = new System.Drawing.Point(956, 0);
this.cbScrunch.Name = "cbScrunch"; this.cbScrunch.Name = "cbScrunch";
this.cbScrunch.Size = new System.Drawing.Size(24, 25); this.cbScrunch.Size = new System.Drawing.Size(24, 25);
this.cbScrunch.TabIndex = 3; this.cbScrunch.TabIndex = 3;
@@ -575,7 +590,7 @@ namespace VEPROMS
// btnNext // btnNext
// //
this.btnNext.Dock = System.Windows.Forms.DockStyle.Right; this.btnNext.Dock = System.Windows.Forms.DockStyle.Right;
this.btnNext.Location = new System.Drawing.Point(990, 0); this.btnNext.Location = new System.Drawing.Point(980, 0);
this.btnNext.Name = "btnNext"; this.btnNext.Name = "btnNext";
this.btnNext.Size = new System.Drawing.Size(23, 25); this.btnNext.Size = new System.Drawing.Size(23, 25);
this.btnNext.TabIndex = 4; this.btnNext.TabIndex = 4;
@@ -586,7 +601,7 @@ namespace VEPROMS
// //
this.cmbFont.Dock = System.Windows.Forms.DockStyle.Right; this.cmbFont.Dock = System.Windows.Forms.DockStyle.Right;
this.cmbFont.FormattingEnabled = true; this.cmbFont.FormattingEnabled = true;
this.cmbFont.Location = new System.Drawing.Point(1013, 0); this.cmbFont.Location = new System.Drawing.Point(1003, 0);
this.cmbFont.Name = "cmbFont"; this.cmbFont.Name = "cmbFont";
this.cmbFont.Size = new System.Drawing.Size(172, 23); this.cmbFont.Size = new System.Drawing.Size(172, 23);
this.cmbFont.TabIndex = 0; this.cmbFont.TabIndex = 0;
@@ -596,9 +611,10 @@ namespace VEPROMS
// //
this.lblDummy.Dock = System.Windows.Forms.DockStyle.Right; this.lblDummy.Dock = System.Windows.Forms.DockStyle.Right;
this.lblDummy.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F); this.lblDummy.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
this.lblDummy.Location = new System.Drawing.Point(1013, 0); this.lblDummy.Location = new System.Drawing.Point(1175, 0);
this.lblDummy.Name = "lblDummy"; this.lblDummy.Name = "lblDummy";
this.lblDummy.Size = new System.Drawing.Size(10, 25); this.lblDummy.Size = new System.Drawing.Size(10, 25);
this.lblDummy.TabIndex = 5;
this.lblDummy.Visible = false; this.lblDummy.Visible = false;
// //
// labelItem10 // labelItem10
@@ -734,8 +750,9 @@ namespace VEPROMS
// ctrlAnnotationDetails // ctrlAnnotationDetails
// //
this.ctrlAnnotationDetails.AnnotationDirty = false; this.ctrlAnnotationDetails.AnnotationDirty = false;
this.ctrlAnnotationDetails.AnnotationRTFText = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang1033{\\fonttbl{\\f0\\fnil\\fcharset0 Microsoft S" + this.ctrlAnnotationDetails.AnnotationRTFText = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\nouicompat\\deflang1033{\\fonttbl{\\f0\\fnil\\fcharset0 " +
"ans Serif;}}\r\n\\viewkind4\\uc1\\pard\\f0\\fs20\\par\r\n}\r\n"; "Microsoft Sans Serif;}}\r\n{\\*\\generator Riched20 10.0.26100}\\viewkind4\\uc1 \r\n\\par" +
"d\\f0\\fs20\\par\r\n}\r\n";
this.ctrlAnnotationDetails.Annotations = null; this.ctrlAnnotationDetails.Annotations = null;
this.ctrlAnnotationDetails.AnnotationText = ""; this.ctrlAnnotationDetails.AnnotationText = "";
this.ctrlAnnotationDetails.ClientProcess = null; this.ctrlAnnotationDetails.ClientProcess = null;
@@ -806,6 +823,7 @@ namespace VEPROMS
// tv // tv
// //
this.tv.AllowDrop = true; this.tv.AllowDrop = true;
this.tv.DelProcReason = null;
this.tv.Dock = System.Windows.Forms.DockStyle.Fill; this.tv.Dock = System.Windows.Forms.DockStyle.Fill;
this.tv.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tv.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.tv.HideSelection = false; this.tv.HideSelection = false;
@@ -926,7 +944,7 @@ namespace VEPROMS
this.displayTags.Dock = System.Windows.Forms.DockStyle.Fill; this.displayTags.Dock = System.Windows.Forms.DockStyle.Fill;
this.displayTags.IsVisible = false; this.displayTags.IsVisible = false;
this.displayTags.Location = new System.Drawing.Point(0, 0); this.displayTags.Location = new System.Drawing.Point(0, 0);
this.displayTags.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.displayTags.Margin = new System.Windows.Forms.Padding(2);
this.displayTags.MinimumSize = new System.Drawing.Size(100, 630); this.displayTags.MinimumSize = new System.Drawing.Size(100, 630);
this.displayTags.MyEditItem = null; this.displayTags.MyEditItem = null;
this.displayTags.Name = "displayTags"; this.displayTags.Name = "displayTags";
@@ -1111,8 +1129,8 @@ namespace VEPROMS
this.displayRO.Dock = System.Windows.Forms.DockStyle.Fill; this.displayRO.Dock = System.Windows.Forms.DockStyle.Fill;
this.displayRO.Location = new System.Drawing.Point(1, 1); this.displayRO.Location = new System.Drawing.Point(1, 1);
this.displayRO.Margin = new System.Windows.Forms.Padding(4); this.displayRO.Margin = new System.Windows.Forms.Padding(4);
this.displayRO.MyDvi = null;
this.displayRO.MyROFST = null; this.displayRO.MyROFST = null;
//this.displayRO.MyROFSTLookup = null;
this.displayRO.MyRTB = null; this.displayRO.MyRTB = null;
this.displayRO.Name = "displayRO"; this.displayRO.Name = "displayRO";
this.displayRO.ProgressBar = null; this.displayRO.ProgressBar = null;
@@ -1126,6 +1144,7 @@ namespace VEPROMS
this.tc.ChgId = null; this.tc.ChgId = null;
this.tc.Dock = System.Windows.Forms.DockStyle.Fill; this.tc.Dock = System.Windows.Forms.DockStyle.Fill;
this.tc.ForeColor = System.Drawing.SystemColors.ControlText; this.tc.ForeColor = System.Drawing.SystemColors.ControlText;
this.tc.LastSelectedDisplayTabItem = null;
this.tc.Location = new System.Drawing.Point(334, 57); this.tc.Location = new System.Drawing.Point(334, 57);
this.tc.Margin = new System.Windows.Forms.Padding(4); this.tc.Margin = new System.Windows.Forms.Padding(4);
this.tc.MyAnnotationDetails = null; this.tc.MyAnnotationDetails = null;
@@ -1373,6 +1392,7 @@ namespace VEPROMS
// displaySearch1 // displaySearch1
// //
this.displaySearch1.Dock = System.Windows.Forms.DockStyle.Fill; this.displaySearch1.Dock = System.Windows.Forms.DockStyle.Fill;
this.displaySearch1.LastSearchWasAnnotations = false;
this.displaySearch1.LoadingList = false; this.displaySearch1.LoadingList = false;
this.displaySearch1.Location = new System.Drawing.Point(1, 1); this.displaySearch1.Location = new System.Drawing.Point(1, 1);
this.displaySearch1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.displaySearch1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
@@ -1382,6 +1402,7 @@ namespace VEPROMS
this.displaySearch1.ProgressBar = null; this.displaySearch1.ProgressBar = null;
this.displaySearch1.ReportTitle = null; this.displaySearch1.ReportTitle = null;
this.displaySearch1.RightToLeft = System.Windows.Forms.RightToLeft.Yes; this.displaySearch1.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
this.displaySearch1.SearchIncTransII = null;
this.displaySearch1.SearchResults = null; this.displaySearch1.SearchResults = null;
this.displaySearch1.SearchString = null; this.displaySearch1.SearchString = null;
this.displaySearch1.Size = new System.Drawing.Size(314, 462); this.displaySearch1.Size = new System.Drawing.Size(314, 462);

View File

@@ -2167,13 +2167,12 @@ namespace VEPROMS
btnAdministrativeTools.Click += new EventHandler(btnAdministrativeTools_Click); btnAdministrativeTools.Click += new EventHandler(btnAdministrativeTools_Click);
btnAdmin.SubItems.Add(btnAdministrativeTools); btnAdmin.SubItems.Add(btnAdministrativeTools);
this.superTooltip1.SetSuperTooltip(btnExit, new SuperTooltipInfo("Exit", null, null, null, null, eTooltipColor.Gray)); this.superTooltip1.SetSuperTooltip(btnManageSecurity, new SuperTooltipInfo("Manage Security", "", "Add, Modify, and Delete PROMS User Access", null, null, eTooltipColor.Gray));
this.superTooltip1.SetSuperTooltip(btnOptions, new SuperTooltipInfo("Options", null, null, null, null, eTooltipColor.Gray)); // remove commented out line below when User Control of Formats code is deleted
this.superTooltip1.SetSuperTooltip(btnManageSecurity, new SuperTooltipInfo("Manage Security", 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(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\nthe Oringal Volian Defaults", null, null, eTooltipColor.Gray));
this.superTooltip1.SetSuperTooltip(btnResetSecurity, new SuperTooltipInfo("Reset Security", null, null, 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(btnAdministrativeTools, new SuperTooltipInfo("Administrative Tools", null, null, 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", null, null, null, null, eTooltipColor.Gray));
try try
{ {
@@ -2196,6 +2195,9 @@ namespace VEPROMS
} }
ctrlAnnotationDetails.MyUserInfo = MyUserInfo; ctrlAnnotationDetails.MyUserInfo = MyUserInfo;
// re-set to old RTF initialization to older RFT string
ctrlAnnotationDetails.AnnotationRTFText= "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang1033{\\fonttbl{\\f0\\fnil\\fcharset0 Microsoft Sans Serif;}}\r\n\\viewkind4\\uc1\\pard\\f0\\fs20\\par\r\n}\r\n";
DisplayRO.MyUserInfo = MyUserInfo; // set the user's security information in the properties RO panel DisplayRO.MyUserInfo = MyUserInfo; // set the user's security information in the properties RO panel
StepTabRibbon.MyUserInfo = MyUserInfo; // set the user's security information in the ribbon StepTabRibbon.MyUserInfo = MyUserInfo; // set the user's security information in the ribbon
DisplayTransition.MyUserInfo = MyUserInfo; // set the user's security information in the Transition panel DisplayTransition.MyUserInfo = MyUserInfo; // set the user's security information in the Transition panel

View File

@@ -172,16 +172,16 @@
</data> </data>
<data name="btnShowErrFld.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="btnShowErrFld.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
YQUAAAAJcEhZcwAACxMAAAsTAQCanBgAAAA0SURBVDhPY2CgFHxqEvyPDX9sFOhAV4sVoGsk2RB0TeiY EwAACxMBAJqcGAAAADRJREFUOE9jYKAUfGoS/I8Nf2wU6EBXixWgayTZEHRN6JigIf+X6f2nBI8aMGoA
oCH/l+n9pwSPGjBqAHUMGHAAAO9c/kJD+HpiAAAAAElFTkSuQmCC dQwYcAAA71z+QkP4emIAAAAASUVORK5CYII=
</value> </value>
</data> </data>
<data name="btnShowPrtFld.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="btnShowPrtFld.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
YQUAAAAJcEhZcwAACxMAAAsTAQCanBgAAAA0SURBVDhPY2CgFHxqEvyPDX9sFOhAV4sVoGsk2RB0TeiY EwAACxMBAJqcGAAAADRJREFUOE9jYKAUfGoS/I8Nf2wU6EBXixWgayTZEHRN6JigIf+X6f2nBI8aMGoA
oCH/l+n9pwSPGjBqAHUMGHAAAO9c/kJD+HpiAAAAAElFTkSuQmCC dQwYcAAA71z+QkP4emIAAAAASUVORK5CYII=
</value> </value>
</data> </data>
<data name="btnHelpAbout.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="btnHelpAbout.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -339,6 +339,9 @@
HM29CO23pWh3l/Bz4QZPYlnkk5YA/gbYS8m5Qty18AAAAABJRU5ErkJggg== HM29CO23pWh3l/Bz4QZPYlnkk5YA/gbYS8m5Qty18AAAAABJRU5ErkJggg==
</value> </value>
</data> </data>
<metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>240, 17</value>
</metadata>
<data name="btnExit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="btnExit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
@@ -389,9 +392,6 @@
2AlZGRmMVIjXgI7OLub6xkaVtLS0ovT09IjCwkIWdDUgDAAMn43RSw4q2AAAAABJRU5ErkJggg== 2AlZGRmMVIjXgI7OLub6xkaVtLS0ovT09IjCwkIWdDUgDAAMn43RSw4q2AAAAABJRU5ErkJggg==
</value> </value>
</data> </data>
<metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>240, 17</value>
</metadata>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>651, 17</value> <value>651, 17</value>
</metadata> </metadata>

View File

@@ -97,21 +97,6 @@ namespace Volian.Controls.Library
set { if (Visible != value) Visible = value; } set { if (Visible != value) Visible = value; }
} }
/// <summary>
/// Expose text properties for height and widht to handle selecting RO Image Types.
/// </summary>
public string TbFSwd
{
get {return tbFSWd.Text;}
set { tbFSWd.Text = value; tbFSWd.Refresh(); } // trBarFS.Value = Convert.ToInt32(value);
}
public string TbFSht
{
get { return tbFSHt.Text; }
set { tbFSHt.Text = value; tbFSHt.Refresh(); _origFigureSizeRatio = float.Parse(value) / float.Parse(tbFSWd.Text); }
}
#endregion #endregion
#region Constructor #region Constructor
public DisplayTags() public DisplayTags()
@@ -172,6 +157,18 @@ namespace Volian.Controls.Library
tbFSWd.SelectionLength = 0; tbFSWd.SelectionLength = 0;
tbFSWd.SelectionStart = tbFSWd.TextLength; // position to the end of the Width text box tbFSWd.SelectionStart = tbFSWd.TextLength; // position to the end of the Width text box
} }
/// <summary>
/// Update text properties for height and width for new RO Image Types.
/// </summary>
public void SetNewImageHeightAndWidth(int height, int width)
{
tbFSHt.Text = height.ToString();
tbFSWd.Text = width.ToString();
tbFSWd.Refresh();
tbFSHt.Refresh();
_origFigureSizeWidth = width;
_origFigureSizeRatio = (float)height / (float)width;
}
public void ToggleChangeBar() // for use with shortcut keystoke <ALT><F2> public void ToggleChangeBar() // for use with shortcut keystoke <ALT><F2>
{ {
if (rbChgBarOff.Checked) if (rbChgBarOff.Checked)

View File

@@ -340,9 +340,8 @@ namespace Volian.Controls.Library
this.Height = MyPictureBox.Height + 10; this.Height = MyPictureBox.Height + 10;
if (_displayTags != null) if (_displayTags != null)
{ {
_displayTags._origFigureSizeWidth = wd; // Set the Height and Width on the step properties page for the new image
_displayTags.TbFSwd = wd.ToString(); _displayTags.SetNewImageHeightAndWidth(ht, wd);
_displayTags.TbFSht = ht.ToString();
} }
} }