Index: Core/Common/src/Core.Common.Controls.Swf/FindAndReplaceControl.Designer.cs =================================================================== diff -u -rf43e90a16e94b36691e0ebb8e9ffa5989678b093 -r0c662ac435fd244395ce5fd7d94eeefcf940364c --- Core/Common/src/Core.Common.Controls.Swf/FindAndReplaceControl.Designer.cs (.../FindAndReplaceControl.Designer.cs) (revision f43e90a16e94b36691e0ebb8e9ffa5989678b093) +++ Core/Common/src/Core.Common.Controls.Swf/FindAndReplaceControl.Designer.cs (.../FindAndReplaceControl.Designer.cs) (revision 0c662ac435fd244395ce5fd7d94eeefcf940364c) @@ -37,10 +37,14 @@ this.buttonReplace = new System.Windows.Forms.Button(); this.buttonFind = new System.Windows.Forms.Button(); this.buttonReplaceAll = new System.Windows.Forms.Button(); + this.findTextBox = new System.Windows.Forms.TextBox(); + this.replaceTextBox = new System.Windows.Forms.TextBox(); this.SuspendLayout(); // // label1 // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(4, 9); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(53, 13); this.label1.TabIndex = 5; @@ -49,14 +53,14 @@ // // textBoxFind // - this.FindTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.findTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.FindTextBox.Location = new System.Drawing.Point(81, 5); - this.FindTextBox.Name = "FindTextBox"; - this.FindTextBox.Size = new System.Drawing.Size(223, 20); - this.FindTextBox.TabIndex = 0; - this.FindTextBox.TextChanged += new System.EventHandler(this.textBoxFind_TextChanged); - this.FindTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBoxFind_KeyDown); + this.findTextBox.Location = new System.Drawing.Point(81, 5); + this.findTextBox.Name = "FindTextBox"; + this.findTextBox.Size = new System.Drawing.Size(223, 20); + this.findTextBox.TabIndex = 0; + this.findTextBox.TextChanged += new System.EventHandler(this.textBoxFind_TextChanged); + this.findTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBoxFind_KeyDown); // // buttonClose // @@ -82,22 +86,26 @@ // // textBoxReplace // - this.ReplaceTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.replaceTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.ReplaceTextBox.Location = new System.Drawing.Point(81, 30); - this.ReplaceTextBox.Name = "ReplaceTextBox"; - this.ReplaceTextBox.Size = new System.Drawing.Size(223, 20); - this.ReplaceTextBox.TabIndex = 1; - this.ReplaceTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBoxFind_KeyDown); + this.replaceTextBox.Location = new System.Drawing.Point(81, 30); + this.replaceTextBox.Name = "ReplaceTextBox"; + this.replaceTextBox.Size = new System.Drawing.Size(223, 20); + this.replaceTextBox.TabIndex = 1; + this.replaceTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBoxFind_KeyDown); // // buttonReplace // + this.buttonReplace.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.buttonReplace.FlatAppearance.BorderSize = 0; this.buttonReplace.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonReplace.Image = ((System.Drawing.Image)(resources.GetObject("buttonReplace.Image"))); this.buttonReplace.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.buttonReplace.Location = new System.Drawing.Point(310, 30); this.buttonReplace.Name = "buttonReplace"; + this.buttonReplace.Size = new System.Drawing.Size(24, 21); + this.buttonReplace.TabIndex = 3; + this.buttonReplace.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; this.toolTip1.SetToolTip(this.buttonReplace, resources.GetString("buttonReplace.ToolTip")); this.buttonReplace.UseVisualStyleBackColor = true; this.buttonReplace.Click += new System.EventHandler(this.buttonReplace_Click); @@ -106,12 +114,16 @@ // // buttonFind // + this.buttonFind.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.buttonFind.FlatAppearance.BorderSize = 0; this.buttonFind.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonFind.Image = global::Core.Common.Controls.Swf.Properties.Resources.binocular; this.buttonFind.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.buttonFind.Location = new System.Drawing.Point(310, 5); this.buttonFind.Name = "buttonFind"; + this.buttonFind.Size = new System.Drawing.Size(24, 20); + this.buttonFind.TabIndex = 2; + this.buttonFind.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; this.toolTip1.SetToolTip(this.buttonFind, resources.GetString("buttonFind.ToolTip")); this.buttonFind.UseVisualStyleBackColor = true; this.buttonFind.Click += new System.EventHandler(this.buttonFind_Click); @@ -127,6 +139,9 @@ this.buttonReplaceAll.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.buttonReplaceAll.Location = new System.Drawing.Point(340, 30); this.buttonReplaceAll.Name = "buttonReplaceAll"; + this.buttonReplaceAll.Size = new System.Drawing.Size(24, 21); + this.buttonReplaceAll.TabIndex = 5; + this.buttonReplaceAll.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; this.toolTip1.SetToolTip(this.buttonReplaceAll, resources.GetString("buttonReplaceAll.ToolTip")); this.buttonReplaceAll.UseVisualStyleBackColor = true; this.buttonReplaceAll.Click += new System.EventHandler(this.buttonReplaceAll_Click); @@ -136,6 +151,8 @@ // FindAndReplaceControl // resources.ApplyResources(this, "$this"); + this.AutoSize = true; + this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.BackColor = System.Drawing.SystemColors.Control; this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.Controls.Add(this.buttonReplace); @@ -144,8 +161,8 @@ this.Controls.Add(this.label1); this.Controls.Add(this.labelReplaceWith); this.Controls.Add(this.buttonFind); - this.Controls.Add(this.ReplaceTextBox); - this.Controls.Add(this.FindTextBox); + this.Controls.Add(this.replaceTextBox); + this.Controls.Add(this.findTextBox); this.Name = "FindAndReplaceControl"; this.Size = new System.Drawing.Size(368, 54); this.VisibleChanged += new System.EventHandler(this.FindAndReplaceControl_VisibleChanged); Index: Core/Common/src/Core.Common.Controls.Swf/FindAndReplaceControl.cs =================================================================== diff -u -rf43e90a16e94b36691e0ebb8e9ffa5989678b093 -r0c662ac435fd244395ce5fd7d94eeefcf940364c --- Core/Common/src/Core.Common.Controls.Swf/FindAndReplaceControl.cs (.../FindAndReplaceControl.cs) (revision f43e90a16e94b36691e0ebb8e9ffa5989678b093) +++ Core/Common/src/Core.Common.Controls.Swf/FindAndReplaceControl.cs (.../FindAndReplaceControl.cs) (revision 0c662ac435fd244395ce5fd7d94eeefcf940364c) @@ -22,9 +22,9 @@ ShowReplaceControls(false); } - public TextBox FindTextBox { get; private set; } + public TextBox findTextBox { get; private set; } - public TextBox ReplaceTextBox { get; private set; } + public TextBox replaceTextBox { get; private set; } [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] @@ -60,7 +60,7 @@ private void ShowReplaceControls(bool show) { labelReplaceWith.Visible = show; - ReplaceTextBox.Visible = show; + replaceTextBox.Visible = show; buttonReplace.Visible = show; buttonReplaceAll.Visible = show; } @@ -90,7 +90,7 @@ if (ReplaceText != null) { - ReplaceText(currentMatch.Index, currentMatch.Length, ReplaceTextBox.Text); + ReplaceText(currentMatch.Index, currentMatch.Length, replaceTextBox.Text); } FindNext(); @@ -117,7 +117,7 @@ if (nextMatch != null && SelectText != null) { - SelectText(nextMatch.Index, FindTextBox.Text.Length); + SelectText(nextMatch.Index, findTextBox.Text.Length); if (ScrollToPosition != null) { ScrollToPosition(nextMatch.Index); @@ -135,7 +135,7 @@ textToSearch = currentText; } - var expr = new Regex(Regex.Escape(FindTextBox.Text)); + var expr = new Regex(Regex.Escape(findTextBox.Text)); if (matches == null || isDirty) { @@ -179,9 +179,9 @@ foreach (var match in matches.OfType().Reverse()) { - ReplaceText(match.Index, match.Length, ReplaceTextBox.Text); + ReplaceText(match.Index, match.Length, replaceTextBox.Text); } - Log.InfoFormat(Resources.FindAndReplaceControl_buttonReplaceAll_Click_Replaced__0__occurrences_of__1__with__2_, matches.Count, FindTextBox.Text, ReplaceTextBox.Text); + Log.InfoFormat(Resources.FindAndReplaceControl_buttonReplaceAll_Click_Replaced__0__occurrences_of__1__with__2_, matches.Count, findTextBox.Text, replaceTextBox.Text); } private void button_KeyDown(object sender, KeyEventArgs e) @@ -200,9 +200,9 @@ private void textBoxFind_TextChanged(object sender, EventArgs e) { - if (sender == FindTextBox && HighLightText != null) + if (sender == findTextBox && HighLightText != null) { - HighLightText(FindTextBox.Text); + HighLightText(findTextBox.Text); } isDirty = true; Index: Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Charting/QuarterViewDateTimeFormatProviderTest.cs =================================================================== diff -u -r3debb2835679b29531ce363c17d5fde650cbdca3 -r0c662ac435fd244395ce5fd7d94eeefcf940364c --- Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Charting/QuarterViewDateTimeFormatProviderTest.cs (.../QuarterViewDateTimeFormatProviderTest.cs) (revision 3debb2835679b29531ce363c17d5fde650cbdca3) +++ Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Charting/QuarterViewDateTimeFormatProviderTest.cs (.../QuarterViewDateTimeFormatProviderTest.cs) (revision 0c662ac435fd244395ce5fd7d94eeefcf940364c) @@ -16,7 +16,7 @@ var minDate = new DateTime(2001, 1, 1); var maxDate = new DateTime(2002, 7, 1); - provider.GetRangeLabel(minDate, maxDate).Should("Unexpected quarter datetime string.").Be.EqualTo("1st Qtr 2001 till 3rd Qtr 2002"); + provider.GetRangeLabel(minDate, maxDate).Should("Unexpected quarter datetime string.").Be.EqualTo("1e kwartaal 2001 tot 3e kw. 2002"); } } } \ No newline at end of file Index: Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Charting/YearViewDateTimeFormatProviderTest.cs =================================================================== diff -u -r3debb2835679b29531ce363c17d5fde650cbdca3 -r0c662ac435fd244395ce5fd7d94eeefcf940364c --- Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Charting/YearViewDateTimeFormatProviderTest.cs (.../YearViewDateTimeFormatProviderTest.cs) (revision 3debb2835679b29531ce363c17d5fde650cbdca3) +++ Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Charting/YearViewDateTimeFormatProviderTest.cs (.../YearViewDateTimeFormatProviderTest.cs) (revision 0c662ac435fd244395ce5fd7d94eeefcf940364c) @@ -18,7 +18,7 @@ [Test] public void GetAxisAnnotation() { - Assert.AreEqual("1991 till 2010", Provider.GetRangeLabel(new DateTime(1991, 11, 11), new DateTime(2010, 1, 1))); + Assert.AreEqual("1991 tot 2010", Provider.GetRangeLabel(new DateTime(1991, 11, 11), new DateTime(2010, 1, 1))); } } } \ No newline at end of file Index: Core/Common/test/Core.Common.Base.Tests/Controls/Swf/FindAndReplaceControlTest.cs =================================================================== diff -u -r6a3a7c7e3442a1c99598c8f0fe7bd95062bc8845 -r0c662ac435fd244395ce5fd7d94eeefcf940364c --- Core/Common/test/Core.Common.Base.Tests/Controls/Swf/FindAndReplaceControlTest.cs (.../FindAndReplaceControlTest.cs) (revision 6a3a7c7e3442a1c99598c8f0fe7bd95062bc8845) +++ Core/Common/test/Core.Common.Base.Tests/Controls/Swf/FindAndReplaceControlTest.cs (.../FindAndReplaceControlTest.cs) (revision 0c662ac435fd244395ce5fd7d94eeefcf940364c) @@ -24,7 +24,7 @@ HighLightText = t => Assert.AreEqual("Test", t) }; - findAndReplaceControl.FindTextBox.Text = @"Test"; + findAndReplaceControl.findTextBox.Text = @"Test"; TypeUtils.CallPrivateMethod(findAndReplaceControl, "FindNext"); } @@ -49,11 +49,11 @@ Assert.AreEqual(4, length); }, HighLightText = t => Assert.AreEqual("Test", t), - FindTextBox = + findTextBox = { Text = @"Test" }, - ReplaceTextBox = + replaceTextBox = { Text = @"New test" } Index: Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Table/TableViewPasteControllerTest.cs =================================================================== diff -u -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd -r0c662ac435fd244395ce5fd7d94eeefcf940364c --- Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Table/TableViewPasteControllerTest.cs (.../TableViewPasteControllerTest.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) +++ Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Table/TableViewPasteControllerTest.cs (.../TableViewPasteControllerTest.cs) (revision 0c662ac435fd244395ce5fd7d94eeefcf940364c) @@ -29,8 +29,7 @@ int callCount = 0; tableViewCopyPasteController.PasteFailed += (s, e) => { - Assert.AreEqual("Cannot paste into sorted column", - e.Value); + Assert.AreEqual("Kan niet plakken in gesorteerde kolom", e.Value); callCount++; }; //action! paste in the first column..second column is hit so should fail @@ -59,7 +58,7 @@ int callCount = 0; tableViewCopyPasteController.PasteFailed += (s, e) => { - Assert.AreEqual("Cannot paste into filtered tableview.", + Assert.AreEqual("Kan niet plakken in een gefilterde tableview.", e.Value); callCount++; }; @@ -236,7 +235,7 @@ { callCount++; Assert.AreEqual( - "Cannot paste into non rectangular selection", + "Kan niet in niet-rechthoekige selectie plakken", e.Value); }; //this should a paste failed event Index: Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Table/TableViewTest.cs =================================================================== diff -u -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd -r0c662ac435fd244395ce5fd7d94eeefcf940364c --- Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Table/TableViewTest.cs (.../TableViewTest.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) +++ Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Table/TableViewTest.cs (.../TableViewTest.cs) (revision 0c662ac435fd244395ce5fd7d94eeefcf940364c) @@ -1453,7 +1453,7 @@ } [Test] - [ExpectedException(typeof(InvalidOperationException), ExpectedMessage = "Unable to select cells when tableView has RowSelect enabled. Use SelectRow instead.")] + [ExpectedException(typeof(InvalidOperationException), ExpectedMessage = "Niet in staat om cellen te selecteren wanneer tableView RowSelect ingeschakeld is. Gebruik in plaats daarvan SelectRow.")] public void SelectCellsForTableViewWithRowSelectThrowsException() { //this test relates to issue 3069...demonstrating a problem paste lines when rowselect is enabled. Index: Core/Common/test/Core.Common.Base.Tests/Controls/Swf/TreeViewControls/TreeViewControllerTest.cs =================================================================== diff -u -r7e3c01860ea45e4fff580e28780eb4f0c0a560c8 -r0c662ac435fd244395ce5fd7d94eeefcf940364c --- Core/Common/test/Core.Common.Base.Tests/Controls/Swf/TreeViewControls/TreeViewControllerTest.cs (.../TreeViewControllerTest.cs) (revision 7e3c01860ea45e4fff580e28780eb4f0c0a560c8) +++ Core/Common/test/Core.Common.Base.Tests/Controls/Swf/TreeViewControls/TreeViewControllerTest.cs (.../TreeViewControllerTest.cs) (revision 0c662ac435fd244395ce5fd7d94eeefcf940364c) @@ -18,7 +18,7 @@ public class TreeViewControllerTest { [Test] - [ExpectedException(typeof(ArgumentException), ExpectedMessage = "Tree view can't be null")] + [ExpectedException(typeof(ArgumentException), ExpectedMessage = "Structuurweergave mag niet leeg zijn")] public void ConstructWithoutTreeView() { new TreeViewController(null); @@ -144,7 +144,7 @@ } [Test] - [ExpectedException(ExpectedMessage = "Unable to resolve node presenter for null data")] + [ExpectedException(ExpectedMessage = "Niet in staat om node presenter te vinden voor 'null' object")] public void TestOnNodeCheckedWithNodeWithoutTagValue() { var mocks = new MockRepository();