Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Merge pull request 'C2024-007: Proms form font combo box debug mode displayed by command line arg in debug mode' (#298) from GenWork into Development

Browse Source 
Ok to generate exes for testing
This commit is contained in:
John Jenko 2024-04-16 08:40:07 -04:00
commit 4a3ca1c074
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs generated
View File

@ -68,6 +68,7 @@ namespace VEPROMS
this.cbScrunch = new System.Windows.Forms.CheckBox(); this.cbScrunch = new System.Windows.Forms.CheckBox();
this.btnNext = new System.Windows.Forms.Button(); this.btnNext = new System.Windows.Forms.Button();
this.cmbFont = new System.Windows.Forms.ComboBox(); this.cmbFont = new System.Windows.Forms.ComboBox();
this.lblDummy = new System.Windows.Forms.Label();
this.labelItem10 = new DevComponents.DotNetBar.LabelItem(); this.labelItem10 = new DevComponents.DotNetBar.LabelItem();
this.bottomProgBar = new DevComponents.DotNetBar.ProgressBarItem(); this.bottomProgBar = new DevComponents.DotNetBar.ProgressBarItem();
this.labelItem9 = new DevComponents.DotNetBar.LabelItem(); this.labelItem9 = new DevComponents.DotNetBar.LabelItem();
@ -514,6 +515,7 @@ namespace VEPROMS
this.bottomBar.Controls.Add(this.cbScrunch); this.bottomBar.Controls.Add(this.cbScrunch);
this.bottomBar.Controls.Add(this.btnNext); this.bottomBar.Controls.Add(this.btnNext);
this.bottomBar.Controls.Add(this.cmbFont); this.bottomBar.Controls.Add(this.cmbFont);
this.bottomBar.Controls.Add(this.lblDummy);
this.bottomBar.Dock = System.Windows.Forms.DockStyle.Bottom; this.bottomBar.Dock = System.Windows.Forms.DockStyle.Bottom;
this.bottomBar.Font = new System.Drawing.Font("Segoe UI", 9F); this.bottomBar.Font = new System.Drawing.Font("Segoe UI", 9F);
this.bottomBar.IsMaximized = false; this.bottomBar.IsMaximized = false;
@ -601,6 +603,15 @@ namespace VEPROMS
this.cmbFont.TabIndex = 0; this.cmbFont.TabIndex = 0;
this.cmbFont.SelectedIndexChanged += new System.EventHandler(this.cmbFont_SelectedIndexChanged); this.cmbFont.SelectedIndexChanged += new System.EventHandler(this.cmbFont_SelectedIndexChanged);
// //
// lblDummy
//
this.lblDummy.Dock = System.Windows.Forms.DockStyle.Right;
this.lblDummy.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
this.lblDummy.Location = new System.Drawing.Point(1013, 0);
this.lblDummy.Name = "lblDummy";
this.lblDummy.Size = new System.Drawing.Size(10, 25);
this.lblDummy.Visible = false;
//
// labelItem10 // labelItem10
// //
this.labelItem10.BorderSide = DevComponents.DotNetBar.eBorderSide.Left; this.labelItem10.BorderSide = DevComponents.DotNetBar.eBorderSide.Left;
@ -1732,6 +1743,7 @@ namespace VEPROMS
private DevComponents.DotNetBar.ButtonItem btnShortCuts; private DevComponents.DotNetBar.ButtonItem btnShortCuts;
private DevComponents.DotNetBar.LabelItem lblItemID; private DevComponents.DotNetBar.LabelItem lblItemID;
private System.Windows.Forms.ComboBox cmbFont; private System.Windows.Forms.ComboBox cmbFont;
private System.Windows.Forms.Label lblDummy;
private DevComponents.DotNetBar.LabelItem lblResolution; private DevComponents.DotNetBar.LabelItem lblResolution;
private DevComponents.DotNetBar.LabelItem lblUser; private DevComponents.DotNetBar.LabelItem lblUser;
private DevComponents.DotNetBar.LabelItem lblLastChange; private DevComponents.DotNetBar.LabelItem lblLastChange;

8
PROMS/VEPROMS User Interface/frmVEPROMS.cs
View File

@ -3202,6 +3202,14 @@ namespace VEPROMS
txtSearch.Visible = false; txtSearch.Visible = false;
lblLastChange.Visible = false; lblLastChange.Visible = false;
btnStepRTF.Visible = false; btnStepRTF.Visible = false;
lblDummy.Visible = false;
}
else
{
// C2024-007: On Proms main form, allow for control of whether the FontMenu
// combo box is displayed. Only done when running in debugmode
cmbFont.Visible = Volian.Base.Library.VlnSettings.GetCommandFlag("FontMenu");
lblDummy.Visible = !Volian.Base.Library.VlnSettings.GetCommandFlag("FontMenu");
} }
} }