From efce3d25d3dfbe84f2bcdbfe129d06a1ea6be1fd Mon Sep 17 00:00:00 2001 From: Jsj Date: Wed, 5 Mar 2008 21:29:45 +0000 Subject: [PATCH] --- PROMS/VEPROMS User Interface/App.config | 3 ++ .../frmFolderProperties.cs | 31 ++++++++++--------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/PROMS/VEPROMS User Interface/App.config b/PROMS/VEPROMS User Interface/App.config index 565627b8..dc33a02c 100644 --- a/PROMS/VEPROMS User Interface/App.config +++ b/PROMS/VEPROMS User Interface/App.config @@ -101,6 +101,9 @@ 2 + + 192, 255, 255 + diff --git a/PROMS/VEPROMS User Interface/frmFolderProperties.cs b/PROMS/VEPROMS User Interface/frmFolderProperties.cs index e3e79fa0..579890f2 100644 --- a/PROMS/VEPROMS User Interface/frmFolderProperties.cs +++ b/PROMS/VEPROMS User Interface/frmFolderProperties.cs @@ -162,6 +162,7 @@ namespace VEPROMS this.btnFormatSettings.Visible = false; this.btnOutputSettings.Visible = false; this.btnEdSettings.Visible = false; + ppLblDefSettingsInfo.Visible = false; ppCbShwDefSettings.Visible = false; // hide check box for showing default values for top node } else @@ -825,13 +826,13 @@ namespace VEPROMS /// label containing the default private void ProcessCmbxSelectedValueChange(ComboBoxEx cmbx, string defstr, ButtonX button, Label deflabel) { - if ((cmbx.SelectedIndex != -1) && defstr.Equals(cmbx.SelectedValue)) - { - button.Focus(); - button.PerformClick(); - } - button.Visible = (!_FolderConfig.Name.Equals("VEPROMS")) && (cmbx.SelectedValue != null); - deflabel.Visible = ppCbShwDefSettings.Checked && button.Visible; + if ((cmbx.SelectedIndex != -1) && defstr != null && defstr.Equals(cmbx.SelectedValue)) + { + button.Focus(); + button.PerformClick(); + } + button.Visible = (!_FolderConfig.Name.Equals("VEPROMS")) && (cmbx.SelectedValue != null); + deflabel.Visible = ppCbShwDefSettings.Checked && button.Visible; } /// @@ -843,14 +844,14 @@ namespace VEPROMS /// label containing the default private void ProcessCmbxSelectionEnumChanged(ComboBoxEx cmbx, object enumval, ButtonX button, Label deflabel) { - if ((cmbx.SelectedIndex != -1) && - cmbx.SelectedValue.Equals(enumval)) - { - button.Focus(); - button.PerformClick(); - } - button.Visible = ((!_FolderConfig.Name.Equals("VEPROMS")) && (cmbx.SelectedValue != null)); - deflabel.Visible = ppCbShwDefSettings.Checked && button.Visible; + if ((cmbx.SelectedIndex != -1) && + cmbx.SelectedValue.Equals(enumval)) + { + button.Focus(); + button.PerformClick(); + } + button.Visible = ((!_FolderConfig.Name.Equals("VEPROMS")) && (cmbx.SelectedValue != null)); + deflabel.Visible = ppCbShwDefSettings.Checked && button.Visible; } ///