Imported Upstream version 5.10.0.47

Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-01-24 17:04:36 +00:00
parent 88ff76fe28
commit e46a49ecf1
5927 changed files with 226314 additions and 129848 deletions

View File

@ -48,6 +48,9 @@ namespace System.Web.UI.Design.WebControls
_databaseConnectionGroupBox.Location = new Point(13, top);
_databaseConnectionGroupBox.Size = new Size(503, 124);
_radioButtonsGroupContainer.Location = new Point(0, 0);
_radioButtonsGroupContainer.Size = new Size(503, 124);
top = 0; // rest of controls in this group are positioned relative to the group box, so top resets
_namedConnectionRadioButton.Location = new Point(9, top + 20);
@ -72,6 +75,7 @@ namespace System.Web.UI.Design.WebControls
_containerNameComboBox.Location = new Point(13, top + 3);
_containerNameComboBox.Size = new Size(502, 21);
// if any controls are added, top should be reset to _containerNameComboBox.Bottom before adding them here
}
@ -85,6 +89,7 @@ namespace System.Web.UI.Design.WebControls
_containerNameComboBox.TabStop = true;
int tabIndex = 0;
_radioButtonsGroupContainer.TabIndex = tabIndex;
_databaseConnectionGroupLabel.TabIndex = tabIndex += 10;
_databaseConnectionGroupBox.TabIndex = tabIndex += 10;
_namedConnectionRadioButton.TabIndex = tabIndex += 10;
@ -127,9 +132,12 @@ namespace System.Web.UI.Design.WebControls
// Update the flag to track if we have text in the box
_configureObjectContext.SelectConnectionStringHasValue(!String.IsNullOrEmpty(_connectionStringTextBox.Text));
// Move the focus to the associated TextBox
_connectionStringTextBox.Select();
_connectionStringTextBox.Select(0, _connectionStringTextBox.TextLength);
if (LocalAppContextSwitches.UseLegacyAccessibilityFeatures)
{
// Move the focus to the associated TextBox
_connectionStringTextBox.Select();
_connectionStringTextBox.Select(0, _connectionStringTextBox.TextLength);
}
}
}
// else it's being unchecked, so that means another radio button is being checked and that handler will take care of updating the state
@ -166,8 +174,11 @@ namespace System.Web.UI.Design.WebControls
// Update flag to indicate if there is a value selected in this box
_configureObjectContext.SelectConnectionStringHasValue(_namedConnectionComboBox.SelectedIndex != -1);
// Move the focus to the associated ComboBox
_namedConnectionComboBox.Select();
if (LocalAppContextSwitches.UseLegacyAccessibilityFeatures)
{
// Move the focus to the associated ComboBox
_namedConnectionComboBox.Select();
}
// If there is a selected NamedConnection, validate the connection string right away
// so that we can potentially select the default container name if there is one
@ -267,8 +278,11 @@ namespace System.Web.UI.Design.WebControls
}
else
{
_connectionStringTextBox.Select();
_connectionStringTextBox.Select(0, _connectionStringTextBox.TextLength);
if (LocalAppContextSwitches.UseLegacyAccessibilityFeatures || _connectionStringTextBox.TextLength != 0)
{
_connectionStringTextBox.Select();
_connectionStringTextBox.Select(0, _connectionStringTextBox.TextLength);
}
}
}
}

View File

@ -8,6 +8,7 @@
//------------------------------------------------------------------------------
using System.Windows.Forms;
using System.Web.UI.Design;
namespace System.Web.UI.Design.WebControls
{
partial class EntityDataSourceConfigureObjectContextPanel
@ -44,6 +45,7 @@ namespace System.Web.UI.Design.WebControls
this._connectionStringRadioButton = new System.Windows.Forms.RadioButton();
this._containerNameLabel = new System.Windows.Forms.Label();
this._containerNameComboBox = new System.Windows.Forms.ComboBox();
this._radioButtonsGroupContainer = new System.Windows.Forms.GroupBox();
this.SuspendLayout();
this.InitializeSizes();
@ -56,12 +58,24 @@ namespace System.Web.UI.Design.WebControls
//
// _databaseConnectionGroupBox
//
this._databaseConnectionGroupBox.Controls.Add(this._namedConnectionRadioButton);
this._databaseConnectionGroupBox.Controls.Add(this._namedConnectionComboBox);
this._databaseConnectionGroupBox.Controls.Add(this._connectionStringRadioButton);
this._databaseConnectionGroupBox.Controls.Add(this._connectionStringTextBox);
if (LocalAppContextSwitches.UseLegacyAccessibilityFeatures)
{
this._databaseConnectionGroupBox.Controls.Add(this._namedConnectionRadioButton);
this._databaseConnectionGroupBox.Controls.Add(this._namedConnectionComboBox);
this._databaseConnectionGroupBox.Controls.Add(this._connectionStringRadioButton);
this._databaseConnectionGroupBox.Controls.Add(this._connectionStringTextBox);
}
else
{
this._databaseConnectionGroupBox.Controls.Add(this._namedConnectionComboBox);
this._databaseConnectionGroupBox.Controls.Add(this._connectionStringTextBox);
this._radioButtonsGroupContainer.Controls.Add(this._namedConnectionRadioButton);
this._radioButtonsGroupContainer.Controls.Add(this._connectionStringRadioButton);
this._databaseConnectionGroupBox.Controls.Add(this._radioButtonsGroupContainer);
}
this._databaseConnectionGroupBox.Name = "_databaseConnectionGroupBox";
this._databaseConnectionGroupBox.Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top;
this._databaseConnectionGroupBox.Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top;
this._radioButtonsGroupContainer.Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top;
//
// _namedConnectionRadioButton
//
@ -130,6 +144,7 @@ namespace System.Web.UI.Design.WebControls
private System.Windows.Forms.RadioButton _connectionStringRadioButton;
private System.Windows.Forms.TextBox _connectionStringTextBox;
private System.Windows.Forms.Label _containerNameLabel;
private System.Windows.Forms.ComboBox _containerNameComboBox;
private System.Windows.Forms.ComboBox _containerNameComboBox;
private System.Windows.Forms.GroupBox _radioButtonsGroupContainer;
}
}