diff --git a/ResultsBrowser/Forms/DatabaseSettings.Designer.cs b/ResultsBrowser/Forms/DatabaseSettings.Designer.cs index 8239bc0c0..eb572005a 100644 --- a/ResultsBrowser/Forms/DatabaseSettings.Designer.cs +++ b/ResultsBrowser/Forms/DatabaseSettings.Designer.cs @@ -28,117 +28,135 @@ /// private void InitializeComponent() { - this.textBox10 = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.textBox11 = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); - this.textBox12 = new System.Windows.Forms.TextBox(); - this.okButton = new System.Windows.Forms.Button(); - this.cancelButton = new System.Windows.Forms.Button(); - this.SuspendLayout(); - // - // textBox10 - // - this.textBox10.Location = new System.Drawing.Point(85, 23); - this.textBox10.Name = "textBox10"; - this.textBox10.Size = new System.Drawing.Size(555, 20); - this.textBox10.TabIndex = 0; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(26, 26); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(39, 13); - this.label1.TabIndex = 1; - this.label1.Text = "PT300"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(26, 52); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(39, 13); - this.label2.TabIndex = 3; - this.label2.Text = "PT150"; - // - // textBox11 - // - this.textBox11.Location = new System.Drawing.Point(85, 49); - this.textBox11.Name = "textBox11"; - this.textBox11.Size = new System.Drawing.Size(555, 20); - this.textBox11.TabIndex = 2; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(26, 78); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(33, 13); - this.label3.TabIndex = 5; - this.label3.Text = "PT50"; - // - // textBox12 - // - this.textBox12.Location = new System.Drawing.Point(85, 75); - this.textBox12.Name = "textBox12"; - this.textBox12.Size = new System.Drawing.Size(555, 20); - this.textBox12.TabIndex = 4; - // - // okButton - // - this.okButton.Location = new System.Drawing.Point(434, 109); - this.okButton.Name = "okButton"; - this.okButton.Size = new System.Drawing.Size(95, 38); - this.okButton.TabIndex = 6; - this.okButton.Text = "OK"; - this.okButton.UseVisualStyleBackColor = true; - this.okButton.Click += new System.EventHandler(this.okButton_Click); - // - // cancelButton - // - this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancelButton.Location = new System.Drawing.Point(545, 109); - this.cancelButton.Name = "cancelButton"; - this.cancelButton.Size = new System.Drawing.Size(95, 38); - this.cancelButton.TabIndex = 7; - this.cancelButton.Text = "Cancel"; - this.cancelButton.UseVisualStyleBackColor = true; - this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click); - // - // DatabaseSettings - // - this.AcceptButton = this.okButton; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.cancelButton; - this.ClientSize = new System.Drawing.Size(668, 159); - this.Controls.Add(this.cancelButton); - this.Controls.Add(this.okButton); - this.Controls.Add(this.label3); - this.Controls.Add(this.textBox12); - this.Controls.Add(this.label2); - this.Controls.Add(this.textBox11); - this.Controls.Add(this.label1); - this.Controls.Add(this.textBox10); - this.Name = "DatabaseSettings"; - this.Text = "Database Settings"; - this.Load += new System.EventHandler(this.DatabaseSettings_Load); - this.ResumeLayout(false); - this.PerformLayout(); + this.connectionStringTextBox1 = new System.Windows.Forms.TextBox(); + this.benchNameLabel = new System.Windows.Forms.Label(); + this.connectionStringLabel = new System.Windows.Forms.Label(); + this.connectionStringTextBox2 = new System.Windows.Forms.TextBox(); + this.connectionStringTextBox3 = new System.Windows.Forms.TextBox(); + this.okButton = new System.Windows.Forms.Button(); + this.cancelButton = new System.Windows.Forms.Button(); + this.benchNameTextBox1 = new System.Windows.Forms.TextBox(); + this.benchNameTextBox2 = new System.Windows.Forms.TextBox(); + this.benchNameTextBox3 = new System.Windows.Forms.TextBox(); + this.SuspendLayout(); + // + // connectionStringTextBox1 + // + this.connectionStringTextBox1.Location = new System.Drawing.Point(157, 45); + this.connectionStringTextBox1.Name = "connectionStringTextBox1"; + this.connectionStringTextBox1.Size = new System.Drawing.Size(555, 20); + this.connectionStringTextBox1.TabIndex = 0; + // + // benchNameLabel + // + this.benchNameLabel.AutoSize = true; + this.benchNameLabel.Location = new System.Drawing.Point(26, 20); + this.benchNameLabel.Name = "benchNameLabel"; + this.benchNameLabel.Size = new System.Drawing.Size(67, 13); + this.benchNameLabel.TabIndex = 1; + this.benchNameLabel.Text = "Bench name"; + // + // connectionStringLabel + // + this.connectionStringLabel.AutoSize = true; + this.connectionStringLabel.Location = new System.Drawing.Point(154, 20); + this.connectionStringLabel.Name = "connectionStringLabel"; + this.connectionStringLabel.Size = new System.Drawing.Size(89, 13); + this.connectionStringLabel.TabIndex = 3; + this.connectionStringLabel.Text = "Connection string"; + // + // connectionStringTextBox2 + // + this.connectionStringTextBox2.Location = new System.Drawing.Point(157, 71); + this.connectionStringTextBox2.Name = "connectionStringTextBox2"; + this.connectionStringTextBox2.Size = new System.Drawing.Size(555, 20); + this.connectionStringTextBox2.TabIndex = 2; + // + // connectionStringTextBox3 + // + this.connectionStringTextBox3.Location = new System.Drawing.Point(157, 97); + this.connectionStringTextBox3.Name = "connectionStringTextBox3"; + this.connectionStringTextBox3.Size = new System.Drawing.Size(555, 20); + this.connectionStringTextBox3.TabIndex = 4; + // + // okButton + // + this.okButton.Location = new System.Drawing.Point(506, 135); + this.okButton.Name = "okButton"; + this.okButton.Size = new System.Drawing.Size(95, 38); + this.okButton.TabIndex = 6; + this.okButton.Text = "OK"; + this.okButton.UseVisualStyleBackColor = true; + this.okButton.Click += new System.EventHandler(this.okButton_Click); + // + // cancelButton + // + this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancelButton.Location = new System.Drawing.Point(617, 135); + this.cancelButton.Name = "cancelButton"; + this.cancelButton.Size = new System.Drawing.Size(95, 38); + this.cancelButton.TabIndex = 7; + this.cancelButton.Text = "Cancel"; + this.cancelButton.UseVisualStyleBackColor = true; + this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click); + // + // benchNameTextBox1 + // + this.benchNameTextBox1.Location = new System.Drawing.Point(29, 45); + this.benchNameTextBox1.Name = "benchNameTextBox1"; + this.benchNameTextBox1.Size = new System.Drawing.Size(100, 20); + this.benchNameTextBox1.TabIndex = 8; + // + // benchNameTextBox2 + // + this.benchNameTextBox2.Location = new System.Drawing.Point(29, 71); + this.benchNameTextBox2.Name = "benchNameTextBox2"; + this.benchNameTextBox2.Size = new System.Drawing.Size(100, 20); + this.benchNameTextBox2.TabIndex = 9; + // + // benchNameTextBox3 + // + this.benchNameTextBox3.Location = new System.Drawing.Point(29, 97); + this.benchNameTextBox3.Name = "benchNameTextBox3"; + this.benchNameTextBox3.Size = new System.Drawing.Size(100, 20); + this.benchNameTextBox3.TabIndex = 10; + // + // DatabaseSettings + // + this.AcceptButton = this.okButton; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.cancelButton; + this.ClientSize = new System.Drawing.Size(743, 189); + this.Controls.Add(this.benchNameTextBox3); + this.Controls.Add(this.benchNameTextBox2); + this.Controls.Add(this.benchNameTextBox1); + this.Controls.Add(this.cancelButton); + this.Controls.Add(this.okButton); + this.Controls.Add(this.connectionStringTextBox3); + this.Controls.Add(this.connectionStringLabel); + this.Controls.Add(this.connectionStringTextBox2); + this.Controls.Add(this.benchNameLabel); + this.Controls.Add(this.connectionStringTextBox1); + this.Name = "DatabaseSettings"; + this.Text = "Database Settings"; + this.Load += new System.EventHandler(this.DatabaseSettings_Load); + this.ResumeLayout(false); + this.PerformLayout(); } #endregion - private System.Windows.Forms.TextBox textBox10; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.TextBox textBox11; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.TextBox textBox12; + private System.Windows.Forms.TextBox connectionStringTextBox1; + private System.Windows.Forms.Label benchNameLabel; + private System.Windows.Forms.Label connectionStringLabel; + private System.Windows.Forms.TextBox connectionStringTextBox2; + private System.Windows.Forms.TextBox connectionStringTextBox3; private System.Windows.Forms.Button okButton; private System.Windows.Forms.Button cancelButton; + private System.Windows.Forms.TextBox benchNameTextBox1; + private System.Windows.Forms.TextBox benchNameTextBox2; + private System.Windows.Forms.TextBox benchNameTextBox3; } } \ No newline at end of file diff --git a/ResultsBrowser/Forms/DatabaseSettings.cs b/ResultsBrowser/Forms/DatabaseSettings.cs index 8c732f799..3155e4372 100644 --- a/ResultsBrowser/Forms/DatabaseSettings.cs +++ b/ResultsBrowser/Forms/DatabaseSettings.cs @@ -18,16 +18,30 @@ namespace ResultsBrowser.Forms private void DatabaseSettings_Load(object sender, EventArgs e) { - textBox10.Text = Program.LocalSettings.ConnectionString1; - textBox11.Text = Program.LocalSettings.ConnectionString2; - textBox12.Text = Program.LocalSettings.ConnectionString3; + Localize(); + + benchNameTextBox1.Text = Program.LocalSettings.Bench1; + benchNameTextBox2.Text = Program.LocalSettings.Bench2; + benchNameTextBox3.Text = Program.LocalSettings.Bench3; + connectionStringTextBox1.Text = Program.LocalSettings.ConnectionString1; + connectionStringTextBox2.Text = Program.LocalSettings.ConnectionString2; + connectionStringTextBox3.Text = Program.LocalSettings.ConnectionString3; } + void Localize() + { + benchNameLabel.Text = "Bench name"; + connectionStringLabel.Text = "Connection string"; /// TODO: Use resources + } + private void okButton_Click(object sender, EventArgs e) { - Program.LocalSettings.ConnectionString1 = textBox10.Text; - Program.LocalSettings.ConnectionString2 = textBox11.Text; - Program.LocalSettings.ConnectionString3 = textBox12.Text; + Program.LocalSettings.Bench1 = benchNameTextBox1.Text; + Program.LocalSettings.Bench2 = benchNameTextBox2.Text; + Program.LocalSettings.Bench3 = benchNameTextBox3.Text; + Program.LocalSettings.ConnectionString1 = connectionStringTextBox1.Text; + Program.LocalSettings.ConnectionString2 = connectionStringTextBox2.Text; + Program.LocalSettings.ConnectionString3 = connectionStringTextBox3.Text; Program.LocalSettings.Save(); diff --git a/ResultsBrowser/LocalSettings.cs b/ResultsBrowser/LocalSettings.cs index 723caa4a8..190a206b8 100644 --- a/ResultsBrowser/LocalSettings.cs +++ b/ResultsBrowser/LocalSettings.cs @@ -23,6 +23,10 @@ namespace ResultsBrowser /// public string Language = "en"; + public string Bench1; + public string Bench2; + public string Bench3; + /// C:\VSProjects\TBF\TestBenchFramework\LocalSettings.cs /// Names and database settings of test benches. /// diff --git a/ResultsBrowser/RBrowserWnd.Designer.cs b/ResultsBrowser/RBrowserWnd.Designer.cs index b1e234959..7b3c72514 100644 --- a/ResultsBrowser/RBrowserWnd.Designer.cs +++ b/ResultsBrowser/RBrowserWnd.Designer.cs @@ -28,535 +28,535 @@ /// private void InitializeComponent() { - this.queryBatchesButton = new System.Windows.Forms.Button(); - this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.queryResultsItemsLabel = new System.Windows.Forms.Label(); - this.queryWatermetersButton = new System.Windows.Forms.Button(); - this.batchNrGroupBox = new System.Windows.Forms.GroupBox(); - this.batchNrToTextBox = new System.Windows.Forms.TextBox(); - this.batchNrFromTextBox = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.batchNrCheckBox = new System.Windows.Forms.CheckBox(); - this.removeFromQueryButton = new System.Windows.Forms.Button(); - this.addToReportButton = new System.Windows.Forms.Button(); - this.procedureGroupBox = new System.Windows.Forms.GroupBox(); - this.procedureCheckBox = new System.Windows.Forms.CheckBox(); - this.procedureComboBox = new System.Windows.Forms.ComboBox(); - this.fromGroupBox = new System.Windows.Forms.GroupBox(); - this.label2 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); - this.filterDateCheckBox = new System.Windows.Forms.CheckBox(); - this.toDateTimePicker = new System.Windows.Forms.DateTimePicker(); - this.fromDateTimePicker = new System.Windows.Forms.DateTimePicker(); - this.purchaseOrderGroupBox = new System.Windows.Forms.GroupBox(); - this.purchaseOrderCheckBox = new System.Windows.Forms.CheckBox(); - this.purchaseOrderComboBox = new System.Windows.Forms.ComboBox(); - this.queryResultsListBox = new System.Windows.Forms.ListBox(); - this.configReportButton = new System.Windows.Forms.Button(); - this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.splitContainer3 = new System.Windows.Forms.SplitContainer(); - this.reportItemsLabel = new System.Windows.Forms.Label(); - this.configButton = new System.Windows.Forms.Button(); - this.makeReportButton = new System.Windows.Forms.Button(); - this.removeFromReportButton = new System.Windows.Forms.Button(); - this.reportFileGroupBox = new System.Windows.Forms.GroupBox(); - this.browseFileButton = new System.Windows.Forms.Button(); - this.reportFileComboBox = new System.Windows.Forms.ComboBox(); - this.makeAscFileButton = new System.Windows.Forms.Button(); - this.reportListBox = new System.Windows.Forms.ListBox(); - this.radioButton1 = new System.Windows.Forms.RadioButton(); - this.radioButton2 = new System.Windows.Forms.RadioButton(); - this.radioButton3 = new System.Windows.Forms.RadioButton(); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); - this.splitContainer1.Panel1.SuspendLayout(); - this.splitContainer1.Panel2.SuspendLayout(); - this.splitContainer1.SuspendLayout(); - this.batchNrGroupBox.SuspendLayout(); - this.procedureGroupBox.SuspendLayout(); - this.fromGroupBox.SuspendLayout(); - this.purchaseOrderGroupBox.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); - this.splitContainer2.Panel1.SuspendLayout(); - this.splitContainer2.Panel2.SuspendLayout(); - this.splitContainer2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit(); - this.splitContainer3.Panel1.SuspendLayout(); - this.splitContainer3.Panel2.SuspendLayout(); - this.splitContainer3.SuspendLayout(); - this.reportFileGroupBox.SuspendLayout(); - this.SuspendLayout(); - // - // queryBatchesButton - // - this.queryBatchesButton.Location = new System.Drawing.Point(130, 136); - this.queryBatchesButton.Name = "queryBatchesButton"; - this.queryBatchesButton.Size = new System.Drawing.Size(108, 29); - this.queryBatchesButton.TabIndex = 3; - this.queryBatchesButton.Text = "Query batches"; - this.queryBatchesButton.UseVisualStyleBackColor = true; - this.queryBatchesButton.Click += new System.EventHandler(this.queryBatchesButton_Click); - // - // splitContainer1 - // - this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; - this.splitContainer1.IsSplitterFixed = true; - this.splitContainer1.Location = new System.Drawing.Point(0, 0); - this.splitContainer1.Name = "splitContainer1"; - this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; - // - // splitContainer1.Panel1 - // - this.splitContainer1.Panel1.Controls.Add(this.radioButton3); - this.splitContainer1.Panel1.Controls.Add(this.radioButton2); - this.splitContainer1.Panel1.Controls.Add(this.radioButton1); - this.splitContainer1.Panel1.Controls.Add(this.queryResultsItemsLabel); - this.splitContainer1.Panel1.Controls.Add(this.queryWatermetersButton); - this.splitContainer1.Panel1.Controls.Add(this.batchNrGroupBox); - this.splitContainer1.Panel1.Controls.Add(this.removeFromQueryButton); - this.splitContainer1.Panel1.Controls.Add(this.addToReportButton); - this.splitContainer1.Panel1.Controls.Add(this.procedureGroupBox); - this.splitContainer1.Panel1.Controls.Add(this.fromGroupBox); - this.splitContainer1.Panel1.Controls.Add(this.queryBatchesButton); - this.splitContainer1.Panel1.Controls.Add(this.purchaseOrderGroupBox); - // - // splitContainer1.Panel2 - // - this.splitContainer1.Panel2.Controls.Add(this.queryResultsListBox); - this.splitContainer1.Size = new System.Drawing.Size(604, 624); - this.splitContainer1.SplitterDistance = 190; - this.splitContainer1.TabIndex = 5; - // - // queryResultsItemsLabel - // - this.queryResultsItemsLabel.AutoSize = true; - this.queryResultsItemsLabel.Location = new System.Drawing.Point(255, 177); - this.queryResultsItemsLabel.Name = "queryResultsItemsLabel"; - this.queryResultsItemsLabel.Size = new System.Drawing.Size(40, 13); - this.queryResultsItemsLabel.TabIndex = 13; - this.queryResultsItemsLabel.Text = "0 items"; - // - // queryWatermetersButton - // - this.queryWatermetersButton.Location = new System.Drawing.Point(258, 136); - this.queryWatermetersButton.Name = "queryWatermetersButton"; - this.queryWatermetersButton.Size = new System.Drawing.Size(108, 29); - this.queryWatermetersButton.TabIndex = 12; - this.queryWatermetersButton.Text = "Query water meters"; - this.queryWatermetersButton.UseVisualStyleBackColor = true; - this.queryWatermetersButton.Click += new System.EventHandler(this.queryWatermetersButton_Click); - // - // batchNrGroupBox - // - this.batchNrGroupBox.Controls.Add(this.batchNrToTextBox); - this.batchNrGroupBox.Controls.Add(this.batchNrFromTextBox); - this.batchNrGroupBox.Controls.Add(this.label4); - this.batchNrGroupBox.Controls.Add(this.label3); - this.batchNrGroupBox.Controls.Add(this.batchNrCheckBox); - this.batchNrGroupBox.Location = new System.Drawing.Point(222, 14); - this.batchNrGroupBox.Name = "batchNrGroupBox"; - this.batchNrGroupBox.Size = new System.Drawing.Size(149, 104); - this.batchNrGroupBox.TabIndex = 11; - this.batchNrGroupBox.TabStop = false; - // - // batchNrToTextBox - // - this.batchNrToTextBox.Location = new System.Drawing.Point(56, 65); - this.batchNrToTextBox.Name = "batchNrToTextBox"; - this.batchNrToTextBox.Size = new System.Drawing.Size(62, 20); - this.batchNrToTextBox.TabIndex = 5; - // - // batchNrFromTextBox - // - this.batchNrFromTextBox.Location = new System.Drawing.Point(56, 33); - this.batchNrFromTextBox.Name = "batchNrFromTextBox"; - this.batchNrFromTextBox.Size = new System.Drawing.Size(62, 20); - this.batchNrFromTextBox.TabIndex = 4; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(19, 68); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(20, 13); - this.label4.TabIndex = 3; - this.label4.Text = "To"; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(19, 36); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(30, 13); - this.label3.TabIndex = 2; - this.label3.Text = "From"; - // - // batchNrCheckBox - // - this.batchNrCheckBox.AutoSize = true; - this.batchNrCheckBox.Location = new System.Drawing.Point(19, 0); - this.batchNrCheckBox.Name = "batchNrCheckBox"; - this.batchNrCheckBox.Size = new System.Drawing.Size(116, 17); - this.batchNrCheckBox.TabIndex = 1; - this.batchNrCheckBox.Text = "Filter batch number"; - this.batchNrCheckBox.UseVisualStyleBackColor = true; - // - // removeFromQueryButton - // - this.removeFromQueryButton.Location = new System.Drawing.Point(377, 136); - this.removeFromQueryButton.Name = "removeFromQueryButton"; - this.removeFromQueryButton.Size = new System.Drawing.Size(114, 29); - this.removeFromQueryButton.TabIndex = 9; - this.removeFromQueryButton.Text = "Remove selected"; - this.removeFromQueryButton.UseVisualStyleBackColor = true; - this.removeFromQueryButton.Click += new System.EventHandler(this.removeFromQueryButton_Click); - // - // addToReportButton - // - this.addToReportButton.Location = new System.Drawing.Point(558, 130); - this.addToReportButton.Name = "addToReportButton"; - this.addToReportButton.Size = new System.Drawing.Size(46, 40); - this.addToReportButton.TabIndex = 8; - this.addToReportButton.Text = ">>>"; - this.addToReportButton.UseVisualStyleBackColor = true; - this.addToReportButton.Click += new System.EventHandler(this.addToReportButton_Click); - // - // procedureGroupBox - // - this.procedureGroupBox.Controls.Add(this.procedureCheckBox); - this.procedureGroupBox.Controls.Add(this.procedureComboBox); - this.procedureGroupBox.Location = new System.Drawing.Point(15, 68); - this.procedureGroupBox.Name = "procedureGroupBox"; - this.procedureGroupBox.Size = new System.Drawing.Size(201, 50); - this.procedureGroupBox.TabIndex = 6; - this.procedureGroupBox.TabStop = false; - // - // procedureCheckBox - // - this.procedureCheckBox.AutoSize = true; - this.procedureCheckBox.Location = new System.Drawing.Point(19, 0); - this.procedureCheckBox.Name = "procedureCheckBox"; - this.procedureCheckBox.Size = new System.Drawing.Size(99, 17); - this.procedureCheckBox.TabIndex = 1; - this.procedureCheckBox.Text = "Filter procedure"; - this.procedureCheckBox.UseVisualStyleBackColor = true; - this.procedureCheckBox.CheckedChanged += new System.EventHandler(this.procedureCheckBox_CheckedChanged); - // - // procedureComboBox - // - this.procedureComboBox.FormattingEnabled = true; - this.procedureComboBox.Location = new System.Drawing.Point(18, 19); - this.procedureComboBox.Name = "procedureComboBox"; - this.procedureComboBox.Size = new System.Drawing.Size(170, 21); - this.procedureComboBox.TabIndex = 0; - // - // fromGroupBox - // - this.fromGroupBox.Controls.Add(this.label2); - this.fromGroupBox.Controls.Add(this.label1); - this.fromGroupBox.Controls.Add(this.filterDateCheckBox); - this.fromGroupBox.Controls.Add(this.toDateTimePicker); - this.fromGroupBox.Controls.Add(this.fromDateTimePicker); - this.fromGroupBox.Location = new System.Drawing.Point(377, 14); - this.fromGroupBox.Name = "fromGroupBox"; - this.fromGroupBox.Size = new System.Drawing.Size(221, 104); - this.fromGroupBox.TabIndex = 3; - this.fromGroupBox.TabStop = false; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(16, 68); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(20, 13); - this.label2.TabIndex = 3; - this.label2.Text = "To"; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(16, 36); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(30, 13); - this.label1.TabIndex = 2; - this.label1.Text = "From"; - // - // filterDateCheckBox - // - this.filterDateCheckBox.AutoSize = true; - this.filterDateCheckBox.Location = new System.Drawing.Point(19, -1); - this.filterDateCheckBox.Name = "filterDateCheckBox"; - this.filterDateCheckBox.Size = new System.Drawing.Size(72, 17); - this.filterDateCheckBox.TabIndex = 1; - this.filterDateCheckBox.Text = "Filter date"; - this.filterDateCheckBox.UseVisualStyleBackColor = true; - // - // toDateTimePicker - // - this.toDateTimePicker.Location = new System.Drawing.Point(56, 65); - this.toDateTimePicker.Name = "toDateTimePicker"; - this.toDateTimePicker.Size = new System.Drawing.Size(151, 20); - this.toDateTimePicker.TabIndex = 0; - // - // fromDateTimePicker - // - this.fromDateTimePicker.Location = new System.Drawing.Point(56, 32); - this.fromDateTimePicker.Name = "fromDateTimePicker"; - this.fromDateTimePicker.Size = new System.Drawing.Size(151, 20); - this.fromDateTimePicker.TabIndex = 0; - // - // purchaseOrderGroupBox - // - this.purchaseOrderGroupBox.Controls.Add(this.purchaseOrderCheckBox); - this.purchaseOrderGroupBox.Controls.Add(this.purchaseOrderComboBox); - this.purchaseOrderGroupBox.Location = new System.Drawing.Point(15, 14); - this.purchaseOrderGroupBox.Name = "purchaseOrderGroupBox"; - this.purchaseOrderGroupBox.Size = new System.Drawing.Size(201, 50); - this.purchaseOrderGroupBox.TabIndex = 2; - this.purchaseOrderGroupBox.TabStop = false; - // - // purchaseOrderCheckBox - // - this.purchaseOrderCheckBox.AutoSize = true; - this.purchaseOrderCheckBox.Location = new System.Drawing.Point(19, 0); - this.purchaseOrderCheckBox.Name = "purchaseOrderCheckBox"; - this.purchaseOrderCheckBox.Size = new System.Drawing.Size(122, 17); - this.purchaseOrderCheckBox.TabIndex = 1; - this.purchaseOrderCheckBox.Text = "Filter purchase order"; - this.purchaseOrderCheckBox.UseVisualStyleBackColor = true; - // - // purchaseOrderComboBox - // - this.purchaseOrderComboBox.FormattingEnabled = true; - this.purchaseOrderComboBox.Location = new System.Drawing.Point(18, 19); - this.purchaseOrderComboBox.Name = "purchaseOrderComboBox"; - this.purchaseOrderComboBox.Size = new System.Drawing.Size(170, 21); - this.purchaseOrderComboBox.TabIndex = 0; - // - // queryResultsListBox - // - this.queryResultsListBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.queryResultsListBox.FormattingEnabled = true; - this.queryResultsListBox.Location = new System.Drawing.Point(0, 0); - this.queryResultsListBox.Name = "queryResultsListBox"; - this.queryResultsListBox.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple; - this.queryResultsListBox.Size = new System.Drawing.Size(604, 430); - this.queryResultsListBox.TabIndex = 0; - this.queryResultsListBox.DoubleClick += new System.EventHandler(this.queryResultsListBox_DoubleClick); - // - // configReportButton - // - this.configReportButton.Location = new System.Drawing.Point(226, 95); - this.configReportButton.Name = "configReportButton"; - this.configReportButton.Size = new System.Drawing.Size(103, 47); - this.configReportButton.TabIndex = 5; - this.configReportButton.Text = "Configure Report"; - this.configReportButton.UseVisualStyleBackColor = true; - this.configReportButton.Click += new System.EventHandler(this.configReportButton_Click); - // - // splitContainer2 - // - this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer2.Location = new System.Drawing.Point(0, 0); - this.splitContainer2.Name = "splitContainer2"; - // - // splitContainer2.Panel1 - // - this.splitContainer2.Panel1.Controls.Add(this.splitContainer1); - // - // splitContainer2.Panel2 - // - this.splitContainer2.Panel2.Controls.Add(this.splitContainer3); - this.splitContainer2.Size = new System.Drawing.Size(1284, 624); - this.splitContainer2.SplitterDistance = 604; - this.splitContainer2.TabIndex = 6; - // - // splitContainer3 - // - this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; - this.splitContainer3.IsSplitterFixed = true; - this.splitContainer3.Location = new System.Drawing.Point(0, 0); - this.splitContainer3.Name = "splitContainer3"; - this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal; - // - // splitContainer3.Panel1 - // - this.splitContainer3.Panel1.Controls.Add(this.reportItemsLabel); - this.splitContainer3.Panel1.Controls.Add(this.configButton); - this.splitContainer3.Panel1.Controls.Add(this.makeReportButton); - this.splitContainer3.Panel1.Controls.Add(this.removeFromReportButton); - this.splitContainer3.Panel1.Controls.Add(this.reportFileGroupBox); - this.splitContainer3.Panel1.Controls.Add(this.makeAscFileButton); - this.splitContainer3.Panel1.Controls.Add(this.configReportButton); - // - // splitContainer3.Panel2 - // - this.splitContainer3.Panel2.Controls.Add(this.reportListBox); - this.splitContainer3.Size = new System.Drawing.Size(676, 624); - this.splitContainer3.SplitterDistance = 190; - this.splitContainer3.TabIndex = 6; - // - // reportItemsLabel - // - this.reportItemsLabel.AutoSize = true; - this.reportItemsLabel.Location = new System.Drawing.Point(261, 177); - this.reportItemsLabel.Name = "reportItemsLabel"; - this.reportItemsLabel.Size = new System.Drawing.Size(40, 13); - this.reportItemsLabel.TabIndex = 14; - this.reportItemsLabel.Text = "0 items"; - // - // configButton - // - this.configButton.Location = new System.Drawing.Point(589, 14); - this.configButton.Name = "configButton"; - this.configButton.Size = new System.Drawing.Size(75, 71); - this.configButton.TabIndex = 12; - this.configButton.Text = "Configure"; - this.configButton.UseVisualStyleBackColor = true; - this.configButton.Click += new System.EventHandler(this.configButton_Click); - // - // makeReportButton - // - this.makeReportButton.Location = new System.Drawing.Point(335, 95); - this.makeReportButton.Name = "makeReportButton"; - this.makeReportButton.Size = new System.Drawing.Size(103, 47); - this.makeReportButton.TabIndex = 11; - this.makeReportButton.Text = "Make Report"; - this.makeReportButton.UseVisualStyleBackColor = true; - this.makeReportButton.Click += new System.EventHandler(this.makeReportButton_Click); - // - // removeFromReportButton - // - this.removeFromReportButton.Location = new System.Drawing.Point(60, 136); - this.removeFromReportButton.Name = "removeFromReportButton"; - this.removeFromReportButton.Size = new System.Drawing.Size(114, 29); - this.removeFromReportButton.TabIndex = 10; - this.removeFromReportButton.Text = "Remove selected"; - this.removeFromReportButton.UseVisualStyleBackColor = true; - this.removeFromReportButton.Click += new System.EventHandler(this.removeFromReportButton_Click); - // - // reportFileGroupBox - // - this.reportFileGroupBox.Controls.Add(this.browseFileButton); - this.reportFileGroupBox.Controls.Add(this.reportFileComboBox); - this.reportFileGroupBox.Location = new System.Drawing.Point(18, 14); - this.reportFileGroupBox.Name = "reportFileGroupBox"; - this.reportFileGroupBox.Size = new System.Drawing.Size(546, 63); - this.reportFileGroupBox.TabIndex = 8; - this.reportFileGroupBox.TabStop = false; - this.reportFileGroupBox.Text = "Report file name"; - // - // browseFileButton - // - this.browseFileButton.Location = new System.Drawing.Point(453, 22); - this.browseFileButton.Name = "browseFileButton"; - this.browseFileButton.Size = new System.Drawing.Size(75, 27); - this.browseFileButton.TabIndex = 2; - this.browseFileButton.Text = "Browse"; - this.browseFileButton.UseVisualStyleBackColor = true; - this.browseFileButton.Click += new System.EventHandler(this.browseFileButton_Click); - // - // reportFileComboBox - // - this.reportFileComboBox.FormattingEnabled = true; - this.reportFileComboBox.Location = new System.Drawing.Point(20, 25); - this.reportFileComboBox.Name = "reportFileComboBox"; - this.reportFileComboBox.Size = new System.Drawing.Size(414, 21); - this.reportFileComboBox.TabIndex = 1; - // - // makeAscFileButton - // - this.makeAscFileButton.Location = new System.Drawing.Point(443, 95); - this.makeAscFileButton.Name = "makeAscFileButton"; - this.makeAscFileButton.Size = new System.Drawing.Size(103, 47); - this.makeAscFileButton.TabIndex = 7; - this.makeAscFileButton.Text = "Make *.asc File"; - this.makeAscFileButton.UseVisualStyleBackColor = true; - this.makeAscFileButton.Click += new System.EventHandler(this.makeAscFileButton_Click); - // - // reportListBox - // - this.reportListBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.reportListBox.FormattingEnabled = true; - this.reportListBox.Location = new System.Drawing.Point(0, 0); - this.reportListBox.Name = "reportListBox"; - this.reportListBox.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple; - this.reportListBox.Size = new System.Drawing.Size(676, 430); - this.reportListBox.TabIndex = 0; - this.reportListBox.DoubleClick += new System.EventHandler(this.reportListBox_DoubleClick); - // - // radioButton1 - // - this.radioButton1.AutoSize = true; - this.radioButton1.Location = new System.Drawing.Point(15, 126); - this.radioButton1.Name = "radioButton1"; - this.radioButton1.Size = new System.Drawing.Size(57, 17); - this.radioButton1.TabIndex = 14; - this.radioButton1.TabStop = true; - this.radioButton1.Text = "PT300"; - this.radioButton1.UseVisualStyleBackColor = true; - this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); - // - // radioButton2 - // - this.radioButton2.AutoSize = true; - this.radioButton2.Location = new System.Drawing.Point(15, 145); - this.radioButton2.Name = "radioButton2"; - this.radioButton2.Size = new System.Drawing.Size(57, 17); - this.radioButton2.TabIndex = 15; - this.radioButton2.TabStop = true; - this.radioButton2.Text = "PT150"; - this.radioButton2.UseVisualStyleBackColor = true; - this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton2_CheckedChanged); - // - // radioButton3 - // - this.radioButton3.AutoSize = true; - this.radioButton3.Location = new System.Drawing.Point(15, 164); - this.radioButton3.Name = "radioButton3"; - this.radioButton3.Size = new System.Drawing.Size(51, 17); - this.radioButton3.TabIndex = 16; - this.radioButton3.TabStop = true; - this.radioButton3.Text = "PT50"; - this.radioButton3.UseVisualStyleBackColor = true; - this.radioButton3.CheckedChanged += new System.EventHandler(this.radioButton3_CheckedChanged); - // - // RBrowserWnd - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1284, 624); - this.Controls.Add(this.splitContainer2); - this.Name = "RBrowserWnd"; - this.Text = "Results browser"; - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainWnd_FormClosing); - this.Load += new System.EventHandler(this.MainWnd_Load); - this.splitContainer1.Panel1.ResumeLayout(false); - this.splitContainer1.Panel1.PerformLayout(); - this.splitContainer1.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); - this.splitContainer1.ResumeLayout(false); - this.batchNrGroupBox.ResumeLayout(false); - this.batchNrGroupBox.PerformLayout(); - this.procedureGroupBox.ResumeLayout(false); - this.procedureGroupBox.PerformLayout(); - this.fromGroupBox.ResumeLayout(false); - this.fromGroupBox.PerformLayout(); - this.purchaseOrderGroupBox.ResumeLayout(false); - this.purchaseOrderGroupBox.PerformLayout(); - this.splitContainer2.Panel1.ResumeLayout(false); - this.splitContainer2.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); - this.splitContainer2.ResumeLayout(false); - this.splitContainer3.Panel1.ResumeLayout(false); - this.splitContainer3.Panel1.PerformLayout(); - this.splitContainer3.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit(); - this.splitContainer3.ResumeLayout(false); - this.reportFileGroupBox.ResumeLayout(false); - this.ResumeLayout(false); + this.queryBatchesButton = new System.Windows.Forms.Button(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.radioButton3 = new System.Windows.Forms.RadioButton(); + this.radioButton2 = new System.Windows.Forms.RadioButton(); + this.radioButton1 = new System.Windows.Forms.RadioButton(); + this.queryResultsItemsLabel = new System.Windows.Forms.Label(); + this.queryWatermetersButton = new System.Windows.Forms.Button(); + this.batchNrGroupBox = new System.Windows.Forms.GroupBox(); + this.batchNrToTextBox = new System.Windows.Forms.TextBox(); + this.batchNrFromTextBox = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.batchNrCheckBox = new System.Windows.Forms.CheckBox(); + this.removeFromQueryButton = new System.Windows.Forms.Button(); + this.addToReportButton = new System.Windows.Forms.Button(); + this.procedureGroupBox = new System.Windows.Forms.GroupBox(); + this.procedureCheckBox = new System.Windows.Forms.CheckBox(); + this.procedureComboBox = new System.Windows.Forms.ComboBox(); + this.fromGroupBox = new System.Windows.Forms.GroupBox(); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.filterDateCheckBox = new System.Windows.Forms.CheckBox(); + this.toDateTimePicker = new System.Windows.Forms.DateTimePicker(); + this.fromDateTimePicker = new System.Windows.Forms.DateTimePicker(); + this.purchaseOrderGroupBox = new System.Windows.Forms.GroupBox(); + this.purchaseOrderCheckBox = new System.Windows.Forms.CheckBox(); + this.purchaseOrderComboBox = new System.Windows.Forms.ComboBox(); + this.queryResultsListBox = new System.Windows.Forms.ListBox(); + this.configReportButton = new System.Windows.Forms.Button(); + this.splitContainer2 = new System.Windows.Forms.SplitContainer(); + this.splitContainer3 = new System.Windows.Forms.SplitContainer(); + this.reportItemsLabel = new System.Windows.Forms.Label(); + this.configButton = new System.Windows.Forms.Button(); + this.makeReportButton = new System.Windows.Forms.Button(); + this.removeFromReportButton = new System.Windows.Forms.Button(); + this.reportFileGroupBox = new System.Windows.Forms.GroupBox(); + this.browseFileButton = new System.Windows.Forms.Button(); + this.reportFileComboBox = new System.Windows.Forms.ComboBox(); + this.makeAscFileButton = new System.Windows.Forms.Button(); + this.reportListBox = new System.Windows.Forms.ListBox(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + this.batchNrGroupBox.SuspendLayout(); + this.procedureGroupBox.SuspendLayout(); + this.fromGroupBox.SuspendLayout(); + this.purchaseOrderGroupBox.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); + this.splitContainer2.Panel1.SuspendLayout(); + this.splitContainer2.Panel2.SuspendLayout(); + this.splitContainer2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit(); + this.splitContainer3.Panel1.SuspendLayout(); + this.splitContainer3.Panel2.SuspendLayout(); + this.splitContainer3.SuspendLayout(); + this.reportFileGroupBox.SuspendLayout(); + this.SuspendLayout(); + // + // queryBatchesButton + // + this.queryBatchesButton.Location = new System.Drawing.Point(130, 136); + this.queryBatchesButton.Name = "queryBatchesButton"; + this.queryBatchesButton.Size = new System.Drawing.Size(108, 29); + this.queryBatchesButton.TabIndex = 3; + this.queryBatchesButton.Text = "Query batches"; + this.queryBatchesButton.UseVisualStyleBackColor = true; + this.queryBatchesButton.Click += new System.EventHandler(this.queryBatchesButton_Click); + // + // splitContainer1 + // + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer1.IsSplitterFixed = true; + this.splitContainer1.Location = new System.Drawing.Point(0, 0); + this.splitContainer1.Name = "splitContainer1"; + this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.radioButton3); + this.splitContainer1.Panel1.Controls.Add(this.radioButton2); + this.splitContainer1.Panel1.Controls.Add(this.radioButton1); + this.splitContainer1.Panel1.Controls.Add(this.queryResultsItemsLabel); + this.splitContainer1.Panel1.Controls.Add(this.queryWatermetersButton); + this.splitContainer1.Panel1.Controls.Add(this.batchNrGroupBox); + this.splitContainer1.Panel1.Controls.Add(this.removeFromQueryButton); + this.splitContainer1.Panel1.Controls.Add(this.addToReportButton); + this.splitContainer1.Panel1.Controls.Add(this.procedureGroupBox); + this.splitContainer1.Panel1.Controls.Add(this.fromGroupBox); + this.splitContainer1.Panel1.Controls.Add(this.queryBatchesButton); + this.splitContainer1.Panel1.Controls.Add(this.purchaseOrderGroupBox); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.queryResultsListBox); + this.splitContainer1.Size = new System.Drawing.Size(604, 624); + this.splitContainer1.SplitterDistance = 190; + this.splitContainer1.TabIndex = 5; + // + // radioButton3 + // + this.radioButton3.AutoSize = true; + this.radioButton3.Location = new System.Drawing.Point(15, 164); + this.radioButton3.Name = "radioButton3"; + this.radioButton3.Size = new System.Drawing.Size(61, 17); + this.radioButton3.TabIndex = 16; + this.radioButton3.TabStop = true; + this.radioButton3.Text = "bench3"; + this.radioButton3.UseVisualStyleBackColor = true; + this.radioButton3.CheckedChanged += new System.EventHandler(this.radioButton3_CheckedChanged); + // + // radioButton2 + // + this.radioButton2.AutoSize = true; + this.radioButton2.Location = new System.Drawing.Point(15, 145); + this.radioButton2.Name = "radioButton2"; + this.radioButton2.Size = new System.Drawing.Size(61, 17); + this.radioButton2.TabIndex = 15; + this.radioButton2.TabStop = true; + this.radioButton2.Text = "bench2"; + this.radioButton2.UseVisualStyleBackColor = true; + this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton2_CheckedChanged); + // + // radioButton1 + // + this.radioButton1.AutoSize = true; + this.radioButton1.Location = new System.Drawing.Point(15, 126); + this.radioButton1.Name = "radioButton1"; + this.radioButton1.Size = new System.Drawing.Size(61, 17); + this.radioButton1.TabIndex = 14; + this.radioButton1.TabStop = true; + this.radioButton1.Text = "bench1"; + this.radioButton1.UseVisualStyleBackColor = true; + this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); + // + // queryResultsItemsLabel + // + this.queryResultsItemsLabel.AutoSize = true; + this.queryResultsItemsLabel.Location = new System.Drawing.Point(255, 177); + this.queryResultsItemsLabel.Name = "queryResultsItemsLabel"; + this.queryResultsItemsLabel.Size = new System.Drawing.Size(40, 13); + this.queryResultsItemsLabel.TabIndex = 13; + this.queryResultsItemsLabel.Text = "0 items"; + // + // queryWatermetersButton + // + this.queryWatermetersButton.Location = new System.Drawing.Point(258, 136); + this.queryWatermetersButton.Name = "queryWatermetersButton"; + this.queryWatermetersButton.Size = new System.Drawing.Size(108, 29); + this.queryWatermetersButton.TabIndex = 12; + this.queryWatermetersButton.Text = "Query water meters"; + this.queryWatermetersButton.UseVisualStyleBackColor = true; + this.queryWatermetersButton.Click += new System.EventHandler(this.queryWatermetersButton_Click); + // + // batchNrGroupBox + // + this.batchNrGroupBox.Controls.Add(this.batchNrToTextBox); + this.batchNrGroupBox.Controls.Add(this.batchNrFromTextBox); + this.batchNrGroupBox.Controls.Add(this.label4); + this.batchNrGroupBox.Controls.Add(this.label3); + this.batchNrGroupBox.Controls.Add(this.batchNrCheckBox); + this.batchNrGroupBox.Location = new System.Drawing.Point(222, 14); + this.batchNrGroupBox.Name = "batchNrGroupBox"; + this.batchNrGroupBox.Size = new System.Drawing.Size(149, 104); + this.batchNrGroupBox.TabIndex = 11; + this.batchNrGroupBox.TabStop = false; + // + // batchNrToTextBox + // + this.batchNrToTextBox.Location = new System.Drawing.Point(56, 65); + this.batchNrToTextBox.Name = "batchNrToTextBox"; + this.batchNrToTextBox.Size = new System.Drawing.Size(62, 20); + this.batchNrToTextBox.TabIndex = 5; + // + // batchNrFromTextBox + // + this.batchNrFromTextBox.Location = new System.Drawing.Point(56, 33); + this.batchNrFromTextBox.Name = "batchNrFromTextBox"; + this.batchNrFromTextBox.Size = new System.Drawing.Size(62, 20); + this.batchNrFromTextBox.TabIndex = 4; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(19, 68); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(20, 13); + this.label4.TabIndex = 3; + this.label4.Text = "To"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(19, 36); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(30, 13); + this.label3.TabIndex = 2; + this.label3.Text = "From"; + // + // batchNrCheckBox + // + this.batchNrCheckBox.AutoSize = true; + this.batchNrCheckBox.Location = new System.Drawing.Point(19, 0); + this.batchNrCheckBox.Name = "batchNrCheckBox"; + this.batchNrCheckBox.Size = new System.Drawing.Size(116, 17); + this.batchNrCheckBox.TabIndex = 1; + this.batchNrCheckBox.Text = "Filter batch number"; + this.batchNrCheckBox.UseVisualStyleBackColor = true; + // + // removeFromQueryButton + // + this.removeFromQueryButton.Location = new System.Drawing.Point(377, 136); + this.removeFromQueryButton.Name = "removeFromQueryButton"; + this.removeFromQueryButton.Size = new System.Drawing.Size(114, 29); + this.removeFromQueryButton.TabIndex = 9; + this.removeFromQueryButton.Text = "Remove selected"; + this.removeFromQueryButton.UseVisualStyleBackColor = true; + this.removeFromQueryButton.Click += new System.EventHandler(this.removeFromQueryButton_Click); + // + // addToReportButton + // + this.addToReportButton.Location = new System.Drawing.Point(558, 130); + this.addToReportButton.Name = "addToReportButton"; + this.addToReportButton.Size = new System.Drawing.Size(46, 40); + this.addToReportButton.TabIndex = 8; + this.addToReportButton.Text = ">>>"; + this.addToReportButton.UseVisualStyleBackColor = true; + this.addToReportButton.Click += new System.EventHandler(this.addToReportButton_Click); + // + // procedureGroupBox + // + this.procedureGroupBox.Controls.Add(this.procedureCheckBox); + this.procedureGroupBox.Controls.Add(this.procedureComboBox); + this.procedureGroupBox.Location = new System.Drawing.Point(15, 68); + this.procedureGroupBox.Name = "procedureGroupBox"; + this.procedureGroupBox.Size = new System.Drawing.Size(201, 50); + this.procedureGroupBox.TabIndex = 6; + this.procedureGroupBox.TabStop = false; + // + // procedureCheckBox + // + this.procedureCheckBox.AutoSize = true; + this.procedureCheckBox.Location = new System.Drawing.Point(19, 0); + this.procedureCheckBox.Name = "procedureCheckBox"; + this.procedureCheckBox.Size = new System.Drawing.Size(99, 17); + this.procedureCheckBox.TabIndex = 1; + this.procedureCheckBox.Text = "Filter procedure"; + this.procedureCheckBox.UseVisualStyleBackColor = true; + this.procedureCheckBox.CheckedChanged += new System.EventHandler(this.procedureCheckBox_CheckedChanged); + // + // procedureComboBox + // + this.procedureComboBox.FormattingEnabled = true; + this.procedureComboBox.Location = new System.Drawing.Point(18, 19); + this.procedureComboBox.Name = "procedureComboBox"; + this.procedureComboBox.Size = new System.Drawing.Size(170, 21); + this.procedureComboBox.TabIndex = 0; + // + // fromGroupBox + // + this.fromGroupBox.Controls.Add(this.label2); + this.fromGroupBox.Controls.Add(this.label1); + this.fromGroupBox.Controls.Add(this.filterDateCheckBox); + this.fromGroupBox.Controls.Add(this.toDateTimePicker); + this.fromGroupBox.Controls.Add(this.fromDateTimePicker); + this.fromGroupBox.Location = new System.Drawing.Point(377, 14); + this.fromGroupBox.Name = "fromGroupBox"; + this.fromGroupBox.Size = new System.Drawing.Size(221, 104); + this.fromGroupBox.TabIndex = 3; + this.fromGroupBox.TabStop = false; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(16, 68); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(20, 13); + this.label2.TabIndex = 3; + this.label2.Text = "To"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(16, 36); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(30, 13); + this.label1.TabIndex = 2; + this.label1.Text = "From"; + // + // filterDateCheckBox + // + this.filterDateCheckBox.AutoSize = true; + this.filterDateCheckBox.Location = new System.Drawing.Point(19, -1); + this.filterDateCheckBox.Name = "filterDateCheckBox"; + this.filterDateCheckBox.Size = new System.Drawing.Size(72, 17); + this.filterDateCheckBox.TabIndex = 1; + this.filterDateCheckBox.Text = "Filter date"; + this.filterDateCheckBox.UseVisualStyleBackColor = true; + // + // toDateTimePicker + // + this.toDateTimePicker.Location = new System.Drawing.Point(56, 65); + this.toDateTimePicker.Name = "toDateTimePicker"; + this.toDateTimePicker.Size = new System.Drawing.Size(151, 20); + this.toDateTimePicker.TabIndex = 0; + // + // fromDateTimePicker + // + this.fromDateTimePicker.Location = new System.Drawing.Point(56, 32); + this.fromDateTimePicker.Name = "fromDateTimePicker"; + this.fromDateTimePicker.Size = new System.Drawing.Size(151, 20); + this.fromDateTimePicker.TabIndex = 0; + // + // purchaseOrderGroupBox + // + this.purchaseOrderGroupBox.Controls.Add(this.purchaseOrderCheckBox); + this.purchaseOrderGroupBox.Controls.Add(this.purchaseOrderComboBox); + this.purchaseOrderGroupBox.Location = new System.Drawing.Point(15, 14); + this.purchaseOrderGroupBox.Name = "purchaseOrderGroupBox"; + this.purchaseOrderGroupBox.Size = new System.Drawing.Size(201, 50); + this.purchaseOrderGroupBox.TabIndex = 2; + this.purchaseOrderGroupBox.TabStop = false; + // + // purchaseOrderCheckBox + // + this.purchaseOrderCheckBox.AutoSize = true; + this.purchaseOrderCheckBox.Location = new System.Drawing.Point(19, 0); + this.purchaseOrderCheckBox.Name = "purchaseOrderCheckBox"; + this.purchaseOrderCheckBox.Size = new System.Drawing.Size(122, 17); + this.purchaseOrderCheckBox.TabIndex = 1; + this.purchaseOrderCheckBox.Text = "Filter purchase order"; + this.purchaseOrderCheckBox.UseVisualStyleBackColor = true; + // + // purchaseOrderComboBox + // + this.purchaseOrderComboBox.FormattingEnabled = true; + this.purchaseOrderComboBox.Location = new System.Drawing.Point(18, 19); + this.purchaseOrderComboBox.Name = "purchaseOrderComboBox"; + this.purchaseOrderComboBox.Size = new System.Drawing.Size(170, 21); + this.purchaseOrderComboBox.TabIndex = 0; + // + // queryResultsListBox + // + this.queryResultsListBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.queryResultsListBox.FormattingEnabled = true; + this.queryResultsListBox.Location = new System.Drawing.Point(0, 0); + this.queryResultsListBox.Name = "queryResultsListBox"; + this.queryResultsListBox.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple; + this.queryResultsListBox.Size = new System.Drawing.Size(604, 430); + this.queryResultsListBox.TabIndex = 0; + this.queryResultsListBox.DoubleClick += new System.EventHandler(this.queryResultsListBox_DoubleClick); + // + // configReportButton + // + this.configReportButton.Location = new System.Drawing.Point(226, 95); + this.configReportButton.Name = "configReportButton"; + this.configReportButton.Size = new System.Drawing.Size(103, 47); + this.configReportButton.TabIndex = 5; + this.configReportButton.Text = "Configure Report"; + this.configReportButton.UseVisualStyleBackColor = true; + this.configReportButton.Click += new System.EventHandler(this.configReportButton_Click); + // + // splitContainer2 + // + this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer2.Location = new System.Drawing.Point(0, 0); + this.splitContainer2.Name = "splitContainer2"; + // + // splitContainer2.Panel1 + // + this.splitContainer2.Panel1.Controls.Add(this.splitContainer1); + // + // splitContainer2.Panel2 + // + this.splitContainer2.Panel2.Controls.Add(this.splitContainer3); + this.splitContainer2.Size = new System.Drawing.Size(1284, 624); + this.splitContainer2.SplitterDistance = 604; + this.splitContainer2.TabIndex = 6; + // + // splitContainer3 + // + this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer3.IsSplitterFixed = true; + this.splitContainer3.Location = new System.Drawing.Point(0, 0); + this.splitContainer3.Name = "splitContainer3"; + this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer3.Panel1 + // + this.splitContainer3.Panel1.Controls.Add(this.reportItemsLabel); + this.splitContainer3.Panel1.Controls.Add(this.configButton); + this.splitContainer3.Panel1.Controls.Add(this.makeReportButton); + this.splitContainer3.Panel1.Controls.Add(this.removeFromReportButton); + this.splitContainer3.Panel1.Controls.Add(this.reportFileGroupBox); + this.splitContainer3.Panel1.Controls.Add(this.makeAscFileButton); + this.splitContainer3.Panel1.Controls.Add(this.configReportButton); + // + // splitContainer3.Panel2 + // + this.splitContainer3.Panel2.Controls.Add(this.reportListBox); + this.splitContainer3.Size = new System.Drawing.Size(676, 624); + this.splitContainer3.SplitterDistance = 190; + this.splitContainer3.TabIndex = 6; + // + // reportItemsLabel + // + this.reportItemsLabel.AutoSize = true; + this.reportItemsLabel.Location = new System.Drawing.Point(261, 177); + this.reportItemsLabel.Name = "reportItemsLabel"; + this.reportItemsLabel.Size = new System.Drawing.Size(40, 13); + this.reportItemsLabel.TabIndex = 14; + this.reportItemsLabel.Text = "0 items"; + // + // configButton + // + this.configButton.Location = new System.Drawing.Point(589, 14); + this.configButton.Name = "configButton"; + this.configButton.Size = new System.Drawing.Size(75, 71); + this.configButton.TabIndex = 12; + this.configButton.Text = "Configure"; + this.configButton.UseVisualStyleBackColor = true; + this.configButton.Click += new System.EventHandler(this.configButton_Click); + // + // makeReportButton + // + this.makeReportButton.Location = new System.Drawing.Point(335, 95); + this.makeReportButton.Name = "makeReportButton"; + this.makeReportButton.Size = new System.Drawing.Size(103, 47); + this.makeReportButton.TabIndex = 11; + this.makeReportButton.Text = "Make Report"; + this.makeReportButton.UseVisualStyleBackColor = true; + this.makeReportButton.Click += new System.EventHandler(this.makeReportButton_Click); + // + // removeFromReportButton + // + this.removeFromReportButton.Location = new System.Drawing.Point(60, 136); + this.removeFromReportButton.Name = "removeFromReportButton"; + this.removeFromReportButton.Size = new System.Drawing.Size(114, 29); + this.removeFromReportButton.TabIndex = 10; + this.removeFromReportButton.Text = "Remove selected"; + this.removeFromReportButton.UseVisualStyleBackColor = true; + this.removeFromReportButton.Click += new System.EventHandler(this.removeFromReportButton_Click); + // + // reportFileGroupBox + // + this.reportFileGroupBox.Controls.Add(this.browseFileButton); + this.reportFileGroupBox.Controls.Add(this.reportFileComboBox); + this.reportFileGroupBox.Location = new System.Drawing.Point(18, 14); + this.reportFileGroupBox.Name = "reportFileGroupBox"; + this.reportFileGroupBox.Size = new System.Drawing.Size(546, 63); + this.reportFileGroupBox.TabIndex = 8; + this.reportFileGroupBox.TabStop = false; + this.reportFileGroupBox.Text = "Report file name"; + // + // browseFileButton + // + this.browseFileButton.Location = new System.Drawing.Point(453, 22); + this.browseFileButton.Name = "browseFileButton"; + this.browseFileButton.Size = new System.Drawing.Size(75, 27); + this.browseFileButton.TabIndex = 2; + this.browseFileButton.Text = "Browse"; + this.browseFileButton.UseVisualStyleBackColor = true; + this.browseFileButton.Click += new System.EventHandler(this.browseFileButton_Click); + // + // reportFileComboBox + // + this.reportFileComboBox.FormattingEnabled = true; + this.reportFileComboBox.Location = new System.Drawing.Point(20, 25); + this.reportFileComboBox.Name = "reportFileComboBox"; + this.reportFileComboBox.Size = new System.Drawing.Size(414, 21); + this.reportFileComboBox.TabIndex = 1; + // + // makeAscFileButton + // + this.makeAscFileButton.Location = new System.Drawing.Point(443, 95); + this.makeAscFileButton.Name = "makeAscFileButton"; + this.makeAscFileButton.Size = new System.Drawing.Size(103, 47); + this.makeAscFileButton.TabIndex = 7; + this.makeAscFileButton.Text = "Make *.asc File"; + this.makeAscFileButton.UseVisualStyleBackColor = true; + this.makeAscFileButton.Click += new System.EventHandler(this.makeAscFileButton_Click); + // + // reportListBox + // + this.reportListBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.reportListBox.FormattingEnabled = true; + this.reportListBox.Location = new System.Drawing.Point(0, 0); + this.reportListBox.Name = "reportListBox"; + this.reportListBox.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple; + this.reportListBox.Size = new System.Drawing.Size(676, 430); + this.reportListBox.TabIndex = 0; + this.reportListBox.DoubleClick += new System.EventHandler(this.reportListBox_DoubleClick); + // + // RBrowserWnd + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1284, 624); + this.Controls.Add(this.splitContainer2); + this.Name = "RBrowserWnd"; + this.Text = "Results browser"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainWnd_FormClosing); + this.Load += new System.EventHandler(this.MainWnd_Load); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel1.PerformLayout(); + this.splitContainer1.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); + this.batchNrGroupBox.ResumeLayout(false); + this.batchNrGroupBox.PerformLayout(); + this.procedureGroupBox.ResumeLayout(false); + this.procedureGroupBox.PerformLayout(); + this.fromGroupBox.ResumeLayout(false); + this.fromGroupBox.PerformLayout(); + this.purchaseOrderGroupBox.ResumeLayout(false); + this.purchaseOrderGroupBox.PerformLayout(); + this.splitContainer2.Panel1.ResumeLayout(false); + this.splitContainer2.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); + this.splitContainer2.ResumeLayout(false); + this.splitContainer3.Panel1.ResumeLayout(false); + this.splitContainer3.Panel1.PerformLayout(); + this.splitContainer3.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit(); + this.splitContainer3.ResumeLayout(false); + this.reportFileGroupBox.ResumeLayout(false); + this.ResumeLayout(false); } diff --git a/ResultsBrowser/RBrowserWnd.cs b/ResultsBrowser/RBrowserWnd.cs index 9aae50f7d..57cfdc8ca 100644 --- a/ResultsBrowser/RBrowserWnd.cs +++ b/ResultsBrowser/RBrowserWnd.cs @@ -64,11 +64,45 @@ namespace ResultsBrowser batchNrToTextBox.Text = Program.LocalSettings.BatchTo; Results.DB.ConnectionString = Program.LocalSettings.ConnectionString1; - radioButton1.Checked = true; + UpdateRadioButtons(); + radioButton1.Checked = true; radioButton2.Checked = false; radioButton3.Checked = false; } + void UpdateRadioButtons() + { + if (string.IsNullOrEmpty(Program.LocalSettings.Bench1)) + { + radioButton1.Visible = false; + } + else + { + radioButton1.Visible = true; + radioButton1.Text = Program.LocalSettings.Bench1; + } + + if (string.IsNullOrEmpty(Program.LocalSettings.Bench2)) + { + radioButton2.Visible = false; + } + else + { + radioButton2.Visible = true; + radioButton2.Text = Program.LocalSettings.Bench1; + } + + if (string.IsNullOrEmpty(Program.LocalSettings.Bench3)) + { + radioButton3.Visible = false; + } + else + { + radioButton3.Visible = true; + radioButton3.Text = Program.LocalSettings.Bench1; + } + } + private void MainWnd_FormClosing(object sender, FormClosingEventArgs e) { Program.LocalSettings.UpdateHistory(purchaseOrderComboBox.Text, ref Program.LocalSettings.PurchaseOrderHistory); @@ -387,7 +421,10 @@ namespace ResultsBrowser if ((new Forms.DatabaseSettings()).ShowDialog() == DialogResult.OK) { Results.DB.ConnectionString = Program.LocalSettings.ConnectionString1; - } + radioButton1.Text = Program.LocalSettings.Bench1; + radioButton2.Text = Program.LocalSettings.Bench2; + radioButton3.Text = Program.LocalSettings.Bench3; + } }