diff --git a/CoreUtilities/LJCGenDoc/UpdateGenDoc.cmd b/CoreUtilities/LJCGenDoc/UpdateGenDoc.cmd index 0a93a6c8..b97502a7 100644 --- a/CoreUtilities/LJCGenDoc/UpdateGenDoc.cmd +++ b/CoreUtilities/LJCGenDoc/UpdateGenDoc.cmd @@ -32,6 +32,10 @@ set src=%assmRoot%LJCNetCommon\LJCNetCommon\%bin% echo copy %src%\LJCNetCommon.dll %to% copy %src%\LJCNetCommon.dll %to% +set src=%assmRoot%LJCNetCommon\LJCNetCommon\%bin% +echo copy %src%\LJCNetCommon.dll %to% +copy %src%\LJCNetCommon.dll %to% + rem ***************************** rem *** Runtime-only Binaries *** @@ -68,10 +72,18 @@ set src=%assmRoot%LJCDBServiceLib\LJCDBServiceLib\%bin% echo copy %src%\LJCDBServiceLib.dll %to% copy %src%\LJCDBServiceLib.dll %to% +set src=%assmRoot%LJCDBViewControls\LJCDBViewControls\%bin% +echo copy %src%\LJCDBViewControls.dll %to% +copy %src%\LJCDBViewControls.dll %to% + set src=%utilRoot%LJCGenDoc\LJCGenDocDAL\%bin% echo copy %src%\LJCGenDocDAL.dll %to% copy %src%\LJCGenDocDAL.dll %to% +set src=LJCViewEditor\LJCViewEditor\%bin% +echo copy %utilRoot%%src%\LJCViewEditor.exe %to% +copy %utilRoot%%src%\LJCViewEditor.exe %to% + rem --------------------------- set to=%toRoot%LJCGenDocLib\%bin% echo. @@ -86,6 +98,7 @@ echo copy %src%\LJCDataAccess.dll %to% copy %src%\LJCDataAccess.dll %to% set src=%assmRoot%LJCDataAccessConfig\LJCDataAccessConfig\%bin% +echo copy %src%\LJCDataAccessConfig.dll %to%% copy %src%\LJCDataAccessConfig.dll %to% set src=%assmRoot%LJCDBClientLib\LJCDBClientLib\%bin% @@ -94,6 +107,7 @@ copy %src%\LJCDBClientLib.dll %to% set src=%assmRoot%LJCDBMessage\LJCDBMessage\%bin% echo copy %src%\LJCDBMessage.dll %to% +echo copy %src%\LJCDBMessage.dll %to% copy %src%\LJCDBMessage.dll %to% set src=%assmRoot%LJCDBServiceLib\LJCDBServiceLib\%bin% diff --git a/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/AssemblyTab/AssemblyGroupGridCode.cs b/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/AssemblyTab/AssemblyGroupGridCode.cs index 5c1e0dc2..4409ceb8 100644 --- a/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/AssemblyTab/AssemblyGroupGridCode.cs +++ b/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/AssemblyTab/AssemblyGroupGridCode.cs @@ -15,7 +15,6 @@ using System.Collections.Generic; using System.Drawing; using System.Windows.Forms; -using LJCViewEditor; namespace LJCGenDocEdit { @@ -323,29 +322,32 @@ internal void SetupGrid(ViewInfo viewInfo) // Get the view grid columns var gridColumns = mDataDbView.GetGridColumns(viewInfo.DataID); - if (null == gridColumns) + if (gridColumns != null) + { + // Setup the grid columns. + AssemblyGroupGrid.LJCAddColumns(gridColumns); + //AssemblyGroupGrid.LJCRestoreColumnValues(ControlValues); + } + else { // Did not load any Grid Columns. var viewCombo = DocList.AssemblyGroupViewCombo; var dataID = viewCombo.LJCSelectedItemID(); viewInfo.DataID = dataID; - ViewCommon.DoViewEdit(viewInfo); + ViewCommon.DoViewEdit(viewInfo, DocList.ConfigFileName); string title = "Reload Confirmation"; string message = "Reload View Combo?"; if (DialogResult.Yes == MessageBox.Show(message, title , MessageBoxButtons.YesNo, MessageBoxIcon.Question)) { + gridColumns = mDataDbView.GetGridColumns(viewInfo.DataID); + AssemblyGroupGrid.LJCAddColumns(gridColumns); + //AssemblyGroupGrid.LJCRestoreColumnValues(ControlValues); viewCombo.Items.Clear(); viewCombo.LJCLoad(); } } - else - { - // Setup the grid columns. - AssemblyGroupGrid.LJCAddColumns(gridColumns); - //AssemblyGroupGrid.LJCRestoreColumnValues(ControlValues); - } // *** End *** Change - Data Views FormCommon.NotSortable(AssemblyGroupGrid); AssemblyGroupGrid.LJCDragDataName = "DocAssemblyGroup"; diff --git a/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/LJCGenDocList.Designer.cs b/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/LJCGenDocList.Designer.cs index f58674cc..5279cc88 100644 --- a/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/LJCGenDocList.Designer.cs +++ b/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/LJCGenDocList.Designer.cs @@ -29,12 +29,12 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); this.TabsSplit = new System.Windows.Forms.SplitContainer(); this.MainTabs = new LJCWinFormControls.LJCTabControl(this.components); this.MainTabsMenu = new System.Windows.Forms.ContextMenuStrip(this.components); @@ -160,6 +160,13 @@ private void InitializeComponent() this.TileTabs = new LJCWinFormControls.LJCTabControl(this.components); this.TileTabsMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.TileTabsMove = new System.Windows.Forms.ToolStripMenuItem(); + this.AssemblyGroupComboMenu = new System.Windows.Forms.ContextMenuStrip(this.components); + this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.AssemblyGroupComboEdit = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator28 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator29 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator30 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator31 = new System.Windows.Forms.ToolStripSeparator(); ((System.ComponentModel.ISupportInitialize)(this.TabsSplit)).BeginInit(); this.TabsSplit.Panel1.SuspendLayout(); this.TabsSplit.Panel2.SuspendLayout(); @@ -194,6 +201,7 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.MethodItemGrid)).BeginInit(); this.MethodItemMenu.SuspendLayout(); this.TileTabsMenu.SuspendLayout(); + this.AssemblyGroupComboMenu.SuspendLayout(); this.SuspendLayout(); // // TabsSplit @@ -279,7 +287,10 @@ private void InitializeComponent() // // AssemblyGroupViewCombo // + this.AssemblyGroupViewCombo.ContextMenuStrip = this.AssemblyGroupComboMenu; this.AssemblyGroupViewCombo.FormattingEnabled = true; + this.AssemblyGroupViewCombo.LJCDataConfigName = null; + this.AssemblyGroupViewCombo.LJCTableName = null; this.AssemblyGroupViewCombo.Location = new System.Drawing.Point(200, 3); this.AssemblyGroupViewCombo.Name = "AssemblyGroupViewCombo"; this.AssemblyGroupViewCombo.Size = new System.Drawing.Size(300, 28); @@ -297,14 +308,14 @@ private void InitializeComponent() this.AssemblyGroupGrid.BackgroundColor = System.Drawing.Color.AliceBlue; this.AssemblyGroupGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.AssemblyGroupGrid.ContextMenuStrip = this.AssemblyGroupMenu; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.ControlLight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.AssemblyGroupGrid.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.ControlLight; + dataGridViewCellStyle7.SelectionForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.AssemblyGroupGrid.DefaultCellStyle = dataGridViewCellStyle7; this.AssemblyGroupGrid.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter; this.AssemblyGroupGrid.LJCAllowDrag = true; this.AssemblyGroupGrid.LJCAllowSelectionChange = false; @@ -467,6 +478,8 @@ private void InitializeComponent() // AssemblyViewCombo // this.AssemblyViewCombo.FormattingEnabled = true; + this.AssemblyViewCombo.LJCDataConfigName = null; + this.AssemblyViewCombo.LJCTableName = null; this.AssemblyViewCombo.Location = new System.Drawing.Point(200, 3); this.AssemblyViewCombo.Name = "AssemblyViewCombo"; this.AssemblyViewCombo.Size = new System.Drawing.Size(300, 28); @@ -484,14 +497,14 @@ private void InitializeComponent() this.AssemblyItemGrid.BackgroundColor = System.Drawing.Color.AliceBlue; this.AssemblyItemGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.AssemblyItemGrid.ContextMenuStrip = this.AssemblyMenu; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.ControlLight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.AssemblyItemGrid.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.ControlLight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.AssemblyItemGrid.DefaultCellStyle = dataGridViewCellStyle1; this.AssemblyItemGrid.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter; this.AssemblyItemGrid.LJCAllowDrag = true; this.AssemblyItemGrid.LJCAllowSelectionChange = false; @@ -692,6 +705,8 @@ private void InitializeComponent() // ClassGroupViewCombo // this.ClassGroupViewCombo.FormattingEnabled = true; + this.ClassGroupViewCombo.LJCDataConfigName = null; + this.ClassGroupViewCombo.LJCTableName = null; this.ClassGroupViewCombo.Location = new System.Drawing.Point(200, 2); this.ClassGroupViewCombo.Name = "ClassGroupViewCombo"; this.ClassGroupViewCombo.Size = new System.Drawing.Size(300, 28); @@ -709,14 +724,14 @@ private void InitializeComponent() this.ClassGroupGrid.BackgroundColor = System.Drawing.Color.AliceBlue; this.ClassGroupGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.ClassGroupGrid.ContextMenuStrip = this.ClassGroupMenu; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.ControlLight; - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.ClassGroupGrid.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.ControlLight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.ClassGroupGrid.DefaultCellStyle = dataGridViewCellStyle2; this.ClassGroupGrid.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter; this.ClassGroupGrid.LJCAllowDrag = true; this.ClassGroupGrid.LJCAllowSelectionChange = false; @@ -878,6 +893,8 @@ private void InitializeComponent() // ClassViewCombo // this.ClassViewCombo.FormattingEnabled = true; + this.ClassViewCombo.LJCDataConfigName = null; + this.ClassViewCombo.LJCTableName = null; this.ClassViewCombo.Location = new System.Drawing.Point(200, 2); this.ClassViewCombo.Name = "ClassViewCombo"; this.ClassViewCombo.Size = new System.Drawing.Size(300, 28); @@ -895,14 +912,14 @@ private void InitializeComponent() this.ClassItemGrid.BackgroundColor = System.Drawing.Color.AliceBlue; this.ClassItemGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.ClassItemGrid.ContextMenuStrip = this.ClassMenu; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.ControlLight; - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.ClassItemGrid.DefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.ControlLight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.ClassItemGrid.DefaultCellStyle = dataGridViewCellStyle3; this.ClassItemGrid.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter; this.ClassItemGrid.LJCAllowDrag = true; this.ClassItemGrid.LJCAllowSelectionChange = false; @@ -1102,6 +1119,8 @@ private void InitializeComponent() // MethodGroupViewCombo // this.MethodGroupViewCombo.FormattingEnabled = true; + this.MethodGroupViewCombo.LJCDataConfigName = null; + this.MethodGroupViewCombo.LJCTableName = null; this.MethodGroupViewCombo.Location = new System.Drawing.Point(200, 2); this.MethodGroupViewCombo.Name = "MethodGroupViewCombo"; this.MethodGroupViewCombo.Size = new System.Drawing.Size(300, 28); @@ -1119,14 +1138,14 @@ private void InitializeComponent() this.MethodGroupGrid.BackgroundColor = System.Drawing.Color.AliceBlue; this.MethodGroupGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.MethodGroupGrid.ContextMenuStrip = this.MethodGroupMenu; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.ControlLight; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.MethodGroupGrid.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.ControlLight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.MethodGroupGrid.DefaultCellStyle = dataGridViewCellStyle4; this.MethodGroupGrid.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter; this.MethodGroupGrid.LJCAllowDrag = true; this.MethodGroupGrid.LJCAllowSelectionChange = false; @@ -1288,6 +1307,8 @@ private void InitializeComponent() // MethodViewCombo // this.MethodViewCombo.FormattingEnabled = true; + this.MethodViewCombo.LJCDataConfigName = null; + this.MethodViewCombo.LJCTableName = null; this.MethodViewCombo.Location = new System.Drawing.Point(200, 2); this.MethodViewCombo.Name = "MethodViewCombo"; this.MethodViewCombo.Size = new System.Drawing.Size(300, 28); @@ -1305,14 +1326,14 @@ private void InitializeComponent() this.MethodItemGrid.BackgroundColor = System.Drawing.Color.AliceBlue; this.MethodItemGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.MethodItemGrid.ContextMenuStrip = this.MethodItemMenu; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle6.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.ControlLight; - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.MethodItemGrid.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.ControlLight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.MethodItemGrid.DefaultCellStyle = dataGridViewCellStyle5; this.MethodItemGrid.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter; this.MethodItemGrid.LJCAllowDrag = true; this.MethodItemGrid.LJCAllowSelectionChange = false; @@ -1485,6 +1506,54 @@ private void InitializeComponent() this.TileTabsMove.Text = "Move Left"; this.TileTabsMove.Click += new System.EventHandler(this.TileTabsMove_Click); // + // AssemblyGroupComboMenu + // + this.AssemblyGroupComboMenu.ImageScalingSize = new System.Drawing.Size(24, 24); + this.AssemblyGroupComboMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripMenuItem1, + this.AssemblyGroupComboEdit, + this.toolStripSeparator28, + this.toolStripSeparator29, + this.toolStripSeparator30, + this.toolStripSeparator31}); + this.AssemblyGroupComboMenu.Name = "AssemblyMenu"; + this.AssemblyGroupComboMenu.Size = new System.Drawing.Size(332, 92); + // + // toolStripMenuItem1 + // + this.toolStripMenuItem1.BackColor = System.Drawing.SystemColors.GradientActiveCaption; + this.toolStripMenuItem1.Name = "toolStripMenuItem1"; + this.toolStripMenuItem1.Size = new System.Drawing.Size(331, 32); + this.toolStripMenuItem1.Text = "Assembly Group Combo Menu"; + // + // AssemblyGroupComboEdit + // + this.AssemblyGroupComboEdit.Name = "AssemblyGroupComboEdit"; + this.AssemblyGroupComboEdit.ShortcutKeyDisplayString = "ENTER"; + this.AssemblyGroupComboEdit.Size = new System.Drawing.Size(331, 32); + this.AssemblyGroupComboEdit.Text = "&Edit"; + this.AssemblyGroupComboEdit.Click += new System.EventHandler(this.AssemblyGroupComboEdit_Click); + // + // toolStripSeparator28 + // + this.toolStripSeparator28.Name = "toolStripSeparator28"; + this.toolStripSeparator28.Size = new System.Drawing.Size(328, 6); + // + // toolStripSeparator29 + // + this.toolStripSeparator29.Name = "toolStripSeparator29"; + this.toolStripSeparator29.Size = new System.Drawing.Size(328, 6); + // + // toolStripSeparator30 + // + this.toolStripSeparator30.Name = "toolStripSeparator30"; + this.toolStripSeparator30.Size = new System.Drawing.Size(328, 6); + // + // toolStripSeparator31 + // + this.toolStripSeparator31.Name = "toolStripSeparator31"; + this.toolStripSeparator31.Size = new System.Drawing.Size(328, 6); + // // LJCGenDocList // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); @@ -1528,6 +1597,7 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.MethodItemGrid)).EndInit(); this.MethodItemMenu.ResumeLayout(false); this.TileTabsMenu.ResumeLayout(false); + this.AssemblyGroupComboMenu.ResumeLayout(false); this.ResumeLayout(false); } @@ -1659,6 +1729,13 @@ private void InitializeComponent() private LJCDBViewControls.ViewCombo ClassViewCombo; private LJCDBViewControls.ViewCombo MethodGroupViewCombo; private LJCDBViewControls.ViewCombo MethodViewCombo; + private System.Windows.Forms.ContextMenuStrip AssemblyGroupComboMenu; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1; + private System.Windows.Forms.ToolStripMenuItem AssemblyGroupComboEdit; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator28; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator29; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator30; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator31; } } diff --git a/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/LJCGenDocList.cs b/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/LJCGenDocList.cs index c1c6c9c3..d2e49f99 100644 --- a/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/LJCGenDocList.cs +++ b/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/LJCGenDocList.cs @@ -1,6 +1,7 @@ // Copyright(c) Lester J.Clark and Contributors. // Licensed under the MIT License. // LJCGenDocList.cs +using LJCDBViewControls; using LJCGenDocDAL; using LJCWinFormCommon; using System; @@ -70,6 +71,11 @@ private void TileTabsMove_Click(object sender, EventArgs e) #region Assembly Group + private void AssemblyGroupComboEdit_Click(object sender, EventArgs e) + { + ViewCommon.DoViewEdit(AssemblyGroupViewInfo, ConfigFileName); + } + // Displays a detail dialog for a new record. private void AssemblyGroupNew_Click(object sender, EventArgs e) { @@ -984,6 +990,7 @@ private void MethodItemGrid_SelectionChanged(object sender, EventArgs e) MethodItemGrid.LJCAllowSelectionChange = true; } #endregion + #endregion } } diff --git a/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/LJCGenDocList.resx b/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/LJCGenDocList.resx index abec30b7..d9142eb9 100644 --- a/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/LJCGenDocList.resx +++ b/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/LJCGenDocList.resx @@ -135,6 +135,9 @@ True + + 190, 69 + True @@ -168,6 +171,33 @@ True + + True + + + True + + + True + + + True + + + True + + + 17, 69 + + + True + + + True + + + True + True @@ -192,9 +222,6 @@ True - - True - True @@ -228,12 +255,6 @@ True - - True - - - 17, 69 - True diff --git a/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/LJCGenDocListCode.cs b/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/LJCGenDocListCode.cs index 86a4811b..470d2b19 100644 --- a/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/LJCGenDocListCode.cs +++ b/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/LJCGenDocListCode.cs @@ -6,7 +6,6 @@ using LJCDBViewControls; using LJCGenDocDAL; using LJCNetCommon; -using LJCViewEditor; using LJCWinFormCommon; using LJCWinFormControls; using System; @@ -218,6 +217,8 @@ private void InitializeClassData() { var values = ValuesGenDocEdit.Instance; mSettings = values.StandardSettings; + //*** Next Statement *** External Config + ConfigFileName = values.ConfigFileName; Managers = new ManagersGenDoc(); Managers.SetDBProperties(mSettings.DbServiceRef @@ -360,7 +361,8 @@ private void LoadComboAssemblyGroup() var viewCombo = AssemblyGroupViewCombo; var dataID = viewCombo.LJCSelectedItemID(); AssemblyGroupViewInfo.DataID = dataID; - ViewCommon.DoViewEdit(AssemblyGroupViewInfo); + //*** Next Statement *** External Config + ViewCommon.DoViewEdit(AssemblyGroupViewInfo, ConfigFileName); string title = "Reload Confirmation"; string message = "Reload Asesembly Group View Combo?"; @@ -472,6 +474,10 @@ private void SetFocusTab(MouseEventArgs e) #region Properties + /// The ConfigFile name. + //*** New Property *** External Config + public string ConfigFileName { get; set; } + /// The Managers object. internal ManagersGenDoc Managers { get; set; } diff --git a/CoreUtilities/LJCGenDocEdit/UpdateGenDocEdit.cmd b/CoreUtilities/LJCGenDocEdit/UpdateGenDocEdit.cmd index e39293b5..1b18e841 100644 --- a/CoreUtilities/LJCGenDocEdit/UpdateGenDocEdit.cmd +++ b/CoreUtilities/LJCGenDocEdit/UpdateGenDocEdit.cmd @@ -36,6 +36,10 @@ set src=%assmRoot%LJCDBViewControls\LJCDBViewControls\%bin% echo copy %src%\LJCDBViewControls.dll %to% copy %src%\LJCDBViewControls.dll %to% +set src=%assmRoot%LJCDBViewDAL\LJCDBViewDAL\%bin% +echo copy %src%\LJCDBViewDAL.dll %to% +copy %src%\LJCDBViewDAL.dll %to% + set src=%utilRoot%LJCGenDoc\LJCDocObjLib\%bin% echo copy %src%\LJCDocObjLib.dll %to% copy %src%\LJCDocObjLib.dll %to% @@ -100,6 +104,10 @@ set src=%utilRoot%LJCViewEditor\LJCViewEditor\%bin% echo copy %src%\LJCViewEditor.exe %to% copy %src%\LJCViewEditor.exe %to% +set src=%utilRoot%LJCViewEditor\LJCViewEditorDAL\%bin% +echo copy %src%\LJCViewEditorDAL.dll %to% +copy %src%\LJCViewEditorDAL.dll %to% + if %1%. == BuildAll. goto End if %1%. == nopause. goto End pause diff --git a/CoreUtilities/LJCViewEditor/LJCViewEditor/Forms/ViewEditorListCode.cs b/CoreUtilities/LJCViewEditor/LJCViewEditor/Forms/ViewEditorListCode.cs index 9af97759..0e47b25b 100644 --- a/CoreUtilities/LJCViewEditor/LJCViewEditor/Forms/ViewEditorListCode.cs +++ b/CoreUtilities/LJCViewEditor/LJCViewEditor/Forms/ViewEditorListCode.cs @@ -242,6 +242,12 @@ private void InitialControlValues() private void InitializeClassData() { var values = ValuesViewEditor.Instance; + //*** Begin *** External Config + if (NetString.HasValue(ConfigFileName)) + { + values.SetConfigFile(ConfigFileName); + } + //*** Begin *** External Config mSettings = values.StandardSettings; Text += $" - {mSettings.DataConfigName}"; BeginColor = mSettings.BeginColor; @@ -520,6 +526,10 @@ private void FilterSetFocusTab(TabPage tabPage) #region Properties + /// The ConfigFile name. + //*** New Property *** External Config + public string ConfigFileName { get; set; } + // The Managers object. internal ManagersDbView Managers { get; set; }