From f846cd5073501d1d6c367e7951fdc0b7a7dacd55 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 4 Mar 2016 20:45:24 +0000 Subject: [PATCH] Fixed initialization of the format dropdown list --- PROMS/VEPROMS User Interface/frmFolderProperties.cs | 4 ++++ PROMS/VEPROMS User Interface/frmProcedureProperties.cs | 5 +++++ PROMS/VEPROMS User Interface/frmSectionProperties.cs | 6 ++++-- PROMS/VEPROMS User Interface/frmVersionsProperties.cs | 4 ++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmFolderProperties.cs b/PROMS/VEPROMS User Interface/frmFolderProperties.cs index f9de03bd..b24eaaf2 100644 --- a/PROMS/VEPROMS User Interface/frmFolderProperties.cs +++ b/PROMS/VEPROMS User Interface/frmFolderProperties.cs @@ -150,6 +150,10 @@ namespace VEPROMS ppCmbxFormat.DisplayMember = "FullName"; ppCmbxFormat.ValueMember = "FullName"; ppCmbxFormat.DataSource = FormatInfoList.SortedFormatInfoList; + if (_FolderConfig.FormatSelection != null) + ppCmbxFormat.SelectedValue = _FolderConfig.FormatSelection; + else + ppCmbxFormat.SelectedIndex = -1; // Get the saved settings for this user // // This setting tells us if we should display the default values on this property page diff --git a/PROMS/VEPROMS User Interface/frmProcedureProperties.cs b/PROMS/VEPROMS User Interface/frmProcedureProperties.cs index d30ad056..39664d94 100644 --- a/PROMS/VEPROMS User Interface/frmProcedureProperties.cs +++ b/PROMS/VEPROMS User Interface/frmProcedureProperties.cs @@ -161,6 +161,10 @@ namespace VEPROMS ppCmbxFormat.DisplayMember = "FullName"; ppCmbxFormat.ValueMember = "FullName"; ppCmbxFormat.DataSource = FormatInfoList.SortedFormatInfoList; + if (_ProcedureConfig.FormatSelection != null) + ppCmbxFormat.SelectedValue = _ProcedureConfig.FormatSelection; + else + ppCmbxFormat.SelectedIndex = -1; // Get the saved settings for this user // @@ -221,6 +225,7 @@ namespace VEPROMS if (_ProcedureConfig.CreatingNew && dvc != null && dvc.MyEnhancedDocuments != null && dvc.MyEnhancedDocuments.Count > 0 && dvc.MyEnhancedDocuments[0].Type != 0) cbEnhanced.Visible = true; _Initializing = false; + } #region General tab diff --git a/PROMS/VEPROMS User Interface/frmSectionProperties.cs b/PROMS/VEPROMS User Interface/frmSectionProperties.cs index db03331b..410a62ed 100644 --- a/PROMS/VEPROMS User Interface/frmSectionProperties.cs +++ b/PROMS/VEPROMS User Interface/frmSectionProperties.cs @@ -277,7 +277,10 @@ namespace VEPROMS ppCmbxFormat.DisplayMember = "FullName"; ppCmbxFormat.ValueMember = "FullName"; ppCmbxFormat.DataSource = FormatInfoList.SortedFormatInfoList; - ppCmbxFormat.SelectedIndex = -1; + if (_SectionConfig.FormatSelection != null) + ppCmbxFormat.SelectedValue = _SectionConfig.FormatSelection; + else + ppCmbxFormat.SelectedIndex = -1; // Get the saved settings for this user // // Get setting telling us whether to display the default values on this property page @@ -467,7 +470,6 @@ namespace VEPROMS // for word docs, no enhanced controls should be visible: grpLnkEnh.Visible = false; } - if(_SectionConfig.FormatSelection != null) ppCmbxFormat.SelectedValue = _SectionConfig.FormatSelection; _Initializing = false; //_InitialIndex = ppCmbxFormat.SelectedIndex; } diff --git a/PROMS/VEPROMS User Interface/frmVersionsProperties.cs b/PROMS/VEPROMS User Interface/frmVersionsProperties.cs index e8f48be6..c457a213 100644 --- a/PROMS/VEPROMS User Interface/frmVersionsProperties.cs +++ b/PROMS/VEPROMS User Interface/frmVersionsProperties.cs @@ -271,6 +271,10 @@ namespace VEPROMS ppCmbxFormat.DisplayMember = "FullName"; ppCmbxFormat.ValueMember = "FullName"; ppCmbxFormat.DataSource = FormatInfoList.SortedFormatInfoList; + if (_DocVersionConfig.FormatSelection != null) + ppCmbxFormat.SelectedValue = _DocVersionConfig.FormatSelection; + else + ppCmbxFormat.SelectedIndex = -1; // Get the saved settings for this user //