This commit is contained in:
2010-11-10 16:02:37 +00:00
parent b135576283
commit 46cc8df7c2
4 changed files with 107 additions and 108 deletions

View File

@@ -16,6 +16,7 @@ namespace VEPROMS
{
public partial class frmProcedureProperties : DevComponents.DotNetBar.Office2007Form
{
private bool _Initializing = false;
private string _DefaultFormatName = null;
//private string _DefaultPagination = null;
private string _DefaultWatermark = null;
@@ -26,7 +27,6 @@ namespace VEPROMS
private string _DefaultChgBarUsrMsg2 = null;
private string _DefaultFormatColumns = null;
private bool _DefaultDisableDuplex = false;
private bool _Initializing = false;
private ProcedureConfig _ProcedureConfig;
private StepTabRibbon _MyStepTabRibbon;
@@ -55,6 +55,7 @@ namespace VEPROMS
//_MyStepTabRibbon.Location = new System.Drawing.Point(0, 0);
_MyStepTabRibbon.Name = "displayTabRibbon1";
_MyStepTabRibbon.Visible = false;
//defaultSettingsVisiblity();
}
private void ppBtnOK_Click(object sender, EventArgs e)
@@ -123,7 +124,6 @@ namespace VEPROMS
// Get the default Format Columns
_DefaultFormatColumns = _ProcedureConfig.Format_Columns.ToString();
Console.WriteLine("_DefaultFormatColumns {0}", _DefaultFormatColumns);
SetupDefault(EnumDescConverter.GetEnumDescription(_ProcedureConfig.Format_Columns), ppLblStpEditorColsDefault, ppCmbxStpEditorCols);
// Get the default Disable Duplex
@@ -217,8 +217,8 @@ namespace VEPROMS
/// <param name="e">EventArgs</param>
private void ppCmbxStpEditorCols_SelectedValueChanged(object sender, EventArgs e)
{
//if (!_Initializing)
//{
if (!_Initializing)
{
FormatColumns fc = (FormatColumns)Enum.Parse(typeof(FormatColumns), _DefaultFormatColumns);
ProcessCmbxSelectionEnumChanged(ppCmbxStpEditorCols, fc, ppBtnDefEdCols, ppLblStpEditorColsDefault);
//if ((ppCmbxStpEditorCols.SelectedIndex != -1) && ppCmbxStpEditorCols.SelectedValue.Equals(fc))
@@ -228,8 +228,8 @@ namespace VEPROMS
//}
//ppBtnDefEdCols.Visible = ppCmbxStpEditorCols.SelectedValue != null;
//ppLblStpEditorColsDefault.Visible = ppCbShwDefSettings.Checked && ppBtnDefEdCols.Visible;
tcpGeneral.Focus();
//}
//tcpGeneral.Focus();
}
}
#endregion
@@ -309,11 +309,11 @@ namespace VEPROMS
// Get the parent setting
PrintChangeBar pcb = (PrintChangeBar)Enum.Parse(typeof(PrintChangeBar), _DefaultChgBarType);
// Compare parent setting with current setting
_Initializing = true;
//_Initializing = true;
if (pcb != _ProcedureConfig.Print_ChangeBar)
_ProcedureConfig.Print_ChangeBar = pcb; // this will force a database update (write)
ppCmbxChangeBarType.SelectedIndex = -1; //reset to the default Change Bar setting
_Initializing = false;
//_Initializing = false;
//tcpFormatSettings.Focus();
}
@@ -712,5 +712,14 @@ namespace VEPROMS
}
}
private void frmProcedureProperties_Shown(object sender, EventArgs e)
{
ppProcNumStpRTB.Focus();
}
}
}