diff --git a/Config/Config.csproj b/Config/Config.csproj
index 02f999fb6..823b84e87 100644
--- a/Config/Config.csproj
+++ b/Config/Config.csproj
@@ -22,6 +22,7 @@
prompt
4
false
+ x86
pdbonly
diff --git a/Results/Results.csproj b/Results/Results.csproj
index 845607b21..8b6ff167f 100644
--- a/Results/Results.csproj
+++ b/Results/Results.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ x86
pdbonly
diff --git a/ResultsBrowser/BenchesDlg.Designer.cs b/ResultsBrowser/BenchesDlg.Designer.cs
index 393ad4f42..38845c57d 100644
--- a/ResultsBrowser/BenchesDlg.Designer.cs
+++ b/ResultsBrowser/BenchesDlg.Designer.cs
@@ -43,7 +43,6 @@ namespace ResultsBrowser
//
resources.ApplyResources(this.okButton, "okButton");
this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
- this.okButton.ImageKey = global::TBF.Resources.Strings.String1;
this.okButton.Name = "okButton";
this.okButton.UseVisualStyleBackColor = true;
this.okButton.Click += new System.EventHandler(this.okButton_Click);
@@ -52,7 +51,6 @@ namespace ResultsBrowser
//
resources.ApplyResources(this.cancelButton, "cancelButton");
this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.cancelButton.ImageKey = global::TBF.Resources.Strings.String1;
this.cancelButton.Name = "cancelButton";
this.cancelButton.UseVisualStyleBackColor = true;
this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
@@ -67,7 +65,6 @@ namespace ResultsBrowser
// label1
//
resources.ApplyResources(this.label1, "label1");
- this.label1.ImageKey = global::TBF.Resources.Strings.String1;
this.label1.Name = "label1";
//
// editButton
diff --git a/ResultsBrowser/BenchesDlg.cs b/ResultsBrowser/BenchesDlg.cs
index c8f452fb8..e6b8c601d 100644
--- a/ResultsBrowser/BenchesDlg.cs
+++ b/ResultsBrowser/BenchesDlg.cs
@@ -1,8 +1,9 @@
///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2015 Sensus Metering Systems
///
using System;
using System.Windows.Forms;
+using ResultsBrowser.Resources;
namespace ResultsBrowser
{
diff --git a/ResultsBrowser/BenchesDlg.resx b/ResultsBrowser/BenchesDlg.resx
index 139fa0b04..b0bd3866d 100644
--- a/ResultsBrowser/BenchesDlg.resx
+++ b/ResultsBrowser/BenchesDlg.resx
@@ -134,8 +134,8 @@
192, 37
-
- 164, 134
+
+ OK
&Add
@@ -164,9 +164,6 @@
&Remove
-
- 344, 71
-
$this
@@ -209,8 +206,8 @@
$this
-
- 459, 185
+
+ 12, 37
11
@@ -218,6 +215,9 @@
6, 13
+
+ copyButton
+
105, 28
@@ -255,8 +255,8 @@
&Copy
-
- 12, 37
+
+ 344, 71
4
@@ -270,8 +270,11 @@
$this
-
- copyButton
+
+ $this
+
+
+ editButton
105, 28
@@ -282,8 +285,8 @@
3
-
- editButton
+
+ 164, 134
cancelButton
@@ -303,14 +306,11 @@
2
-
- OK
-
Database Settings
-
- $this
+
+ 459, 185
System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -333,7 +333,4 @@
True
-
- de
-
\ No newline at end of file
diff --git a/ResultsBrowser/DatabaseSettingsDlg.Designer.cs b/ResultsBrowser/DatabaseSettingsDlg.Designer.cs
index 4fbf915a6..2df897d17 100644
--- a/ResultsBrowser/DatabaseSettingsDlg.Designer.cs
+++ b/ResultsBrowser/DatabaseSettingsDlg.Designer.cs
@@ -66,7 +66,6 @@ namespace ResultsBrowser
// okButton
//
this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
- this.okButton.ImageKey = global::TBF.Resources.Strings.String1;
resources.ApplyResources(this.okButton, "okButton");
this.okButton.Name = "okButton";
this.okButton.UseVisualStyleBackColor = true;
@@ -75,7 +74,6 @@ namespace ResultsBrowser
// cancelButton
//
this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.cancelButton.ImageKey = global::TBF.Resources.Strings.String1;
resources.ApplyResources(this.cancelButton, "cancelButton");
this.cancelButton.Name = "cancelButton";
this.cancelButton.UseVisualStyleBackColor = true;
@@ -84,7 +82,6 @@ namespace ResultsBrowser
// label1
//
resources.ApplyResources(this.label1, "label1");
- this.label1.ImageKey = global::TBF.Resources.Strings.String1;
this.label1.Name = "label1";
//
// benchNameTextBox
@@ -100,7 +97,6 @@ namespace ResultsBrowser
// connectionStringLabel
//
resources.ApplyResources(this.connectionStringLabel, "connectionStringLabel");
- this.connectionStringLabel.ImageKey = global::TBF.Resources.Strings.String1;
this.connectionStringLabel.Name = "connectionStringLabel";
//
// benchConnectionStringTextBox
@@ -126,37 +122,31 @@ namespace ResultsBrowser
// label2
//
resources.ApplyResources(this.label2, "label2");
- this.label2.ImageKey = global::TBF.Resources.Strings.String1;
this.label2.Name = "label2";
//
// label3
//
resources.ApplyResources(this.label3, "label3");
- this.label3.ImageKey = global::TBF.Resources.Strings.String1;
this.label3.Name = "label3";
//
// label4
//
resources.ApplyResources(this.label4, "label4");
- this.label4.ImageKey = global::TBF.Resources.Strings.String1;
this.label4.Name = "label4";
//
// label5
//
resources.ApplyResources(this.label5, "label5");
- this.label5.ImageKey = global::TBF.Resources.Strings.String1;
this.label5.Name = "label5";
//
// label6
//
resources.ApplyResources(this.label6, "label6");
- this.label6.ImageKey = global::TBF.Resources.Strings.String1;
this.label6.Name = "label6";
//
// testConnUsersBtn
//
this.testConnUsersBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.testConnUsersBtn.ImageKey = global::TBF.Resources.Strings.String1;
resources.ApplyResources(this.testConnUsersBtn, "testConnUsersBtn");
this.testConnUsersBtn.Name = "testConnUsersBtn";
this.testConnUsersBtn.UseVisualStyleBackColor = true;
@@ -165,7 +155,6 @@ namespace ResultsBrowser
// createUsersDbBtn
//
this.createUsersDbBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.createUsersDbBtn.ImageKey = global::TBF.Resources.Strings.String1;
resources.ApplyResources(this.createUsersDbBtn, "createUsersDbBtn");
this.createUsersDbBtn.Name = "createUsersDbBtn";
this.createUsersDbBtn.UseVisualStyleBackColor = true;
@@ -174,14 +163,12 @@ namespace ResultsBrowser
// realBenchCheckBox
//
resources.ApplyResources(this.realBenchCheckBox, "realBenchCheckBox");
- this.realBenchCheckBox.ImageKey = global::TBF.Resources.Strings.String1;
this.realBenchCheckBox.Name = "realBenchCheckBox";
this.realBenchCheckBox.UseVisualStyleBackColor = true;
//
// dbTypeLabel
//
resources.ApplyResources(this.dbTypeLabel, "dbTypeLabel");
- this.dbTypeLabel.ImageKey = global::TBF.Resources.Strings.String1;
this.dbTypeLabel.Name = "dbTypeLabel";
//
// usersDbTypeComboBox
@@ -217,7 +204,6 @@ namespace ResultsBrowser
// testConnBenchBtn
//
this.testConnBenchBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.testConnBenchBtn.ImageKey = global::TBF.Resources.Strings.String1;
resources.ApplyResources(this.testConnBenchBtn, "testConnBenchBtn");
this.testConnBenchBtn.Name = "testConnBenchBtn";
this.testConnBenchBtn.UseVisualStyleBackColor = true;
@@ -226,7 +212,6 @@ namespace ResultsBrowser
// testConnProceduresBtn
//
this.testConnProceduresBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.testConnProceduresBtn.ImageKey = global::TBF.Resources.Strings.String1;
resources.ApplyResources(this.testConnProceduresBtn, "testConnProceduresBtn");
this.testConnProceduresBtn.Name = "testConnProceduresBtn";
this.testConnProceduresBtn.UseVisualStyleBackColor = true;
@@ -235,7 +220,6 @@ namespace ResultsBrowser
// testConnWMTypesBtn
//
this.testConnWMTypesBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.testConnWMTypesBtn.ImageKey = global::TBF.Resources.Strings.String1;
resources.ApplyResources(this.testConnWMTypesBtn, "testConnWMTypesBtn");
this.testConnWMTypesBtn.Name = "testConnWMTypesBtn";
this.testConnWMTypesBtn.UseVisualStyleBackColor = true;
@@ -244,7 +228,6 @@ namespace ResultsBrowser
// testConnWaterMetersBtn
//
this.testConnWaterMetersBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.testConnWaterMetersBtn.ImageKey = global::TBF.Resources.Strings.String1;
resources.ApplyResources(this.testConnWaterMetersBtn, "testConnWaterMetersBtn");
this.testConnWaterMetersBtn.Name = "testConnWaterMetersBtn";
this.testConnWaterMetersBtn.UseVisualStyleBackColor = true;
@@ -253,7 +236,6 @@ namespace ResultsBrowser
// createBenchDbBtn
//
this.createBenchDbBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.createBenchDbBtn.ImageKey = global::TBF.Resources.Strings.String1;
resources.ApplyResources(this.createBenchDbBtn, "createBenchDbBtn");
this.createBenchDbBtn.Name = "createBenchDbBtn";
this.createBenchDbBtn.UseVisualStyleBackColor = true;
@@ -262,7 +244,6 @@ namespace ResultsBrowser
// createProceduresDbBtn
//
this.createProceduresDbBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.createProceduresDbBtn.ImageKey = global::TBF.Resources.Strings.String1;
resources.ApplyResources(this.createProceduresDbBtn, "createProceduresDbBtn");
this.createProceduresDbBtn.Name = "createProceduresDbBtn";
this.createProceduresDbBtn.UseVisualStyleBackColor = true;
@@ -271,7 +252,6 @@ namespace ResultsBrowser
// createWMTypesDbBtn
//
this.createWMTypesDbBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.createWMTypesDbBtn.ImageKey = global::TBF.Resources.Strings.String1;
resources.ApplyResources(this.createWMTypesDbBtn, "createWMTypesDbBtn");
this.createWMTypesDbBtn.Name = "createWMTypesDbBtn";
this.createWMTypesDbBtn.UseVisualStyleBackColor = true;
@@ -280,7 +260,6 @@ namespace ResultsBrowser
// createWaterMetersDbBtn
//
this.createWaterMetersDbBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.createWaterMetersDbBtn.ImageKey = global::TBF.Resources.Strings.String1;
resources.ApplyResources(this.createWaterMetersDbBtn, "createWaterMetersDbBtn");
this.createWaterMetersDbBtn.Name = "createWaterMetersDbBtn";
this.createWaterMetersDbBtn.UseVisualStyleBackColor = true;
diff --git a/ResultsBrowser/DatabaseSettingsDlg.cs b/ResultsBrowser/DatabaseSettingsDlg.cs
index 6459de002..73e1807c9 100644
--- a/ResultsBrowser/DatabaseSettingsDlg.cs
+++ b/ResultsBrowser/DatabaseSettingsDlg.cs
@@ -1,3 +1,6 @@
+///
+/// Copyright (c) 2015 Sensus Metering Systems
+///
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -5,9 +8,9 @@ using System.Data;
using System.Drawing;
using System.Text;
using System.Windows.Forms;
-using TBF.Resources;
+using ResultsBrowser.Resources;
-namespace TBF
+namespace ResultsBrowser
{
///
/// Dialog to process test bench name and database settings (BenchSettings)
@@ -15,13 +18,13 @@ namespace TBF
public partial class DatabaseSettingsDlg : Form
{
// Reference to bench DB settins (not a local copy)
- DatabaseSettings bench;
+ Config.DatabaseSettings bench;
///
/// Constructor
///
/// Test bench database settings
- public DatabaseSettingsDlg(DatabaseSettings bench)
+ public DatabaseSettingsDlg(Config.DatabaseSettings bench)
{
this.bench = bench;
@@ -64,9 +67,9 @@ namespace TBF
realBenchCheckBox.Checked = bench.IsRealBench;
/// Initialize 'Database type' combo-boxes
- for (int i = 0; i < (int)DBType.DbTypesCount; i++)
+ for (int i = 0; i < (int)Config.DBType.DbTypesCount; i++)
{
- DBType dbType = (DBType)i;
+ Config.DBType dbType = (Config.DBType)i;
usersDbTypeComboBox.Items.Add(dbType);
benchDbTypeComboBox.Items.Add(dbType);
proceduresDbTypeComboBox.Items.Add(dbType);
@@ -108,11 +111,11 @@ namespace TBF
bench.WMTypesDBSettings.ConnectionString = wmTypesConnectionStringTextBox.Text;
bench.WaterMetersDBSettings.ConnectionString = watermetersConnectionStringTextBox.Text;
- bench.UsersDBSettings.DbType = (DBType)usersDbTypeComboBox.SelectedIndex;
- bench.BenchDBSettings.DbType = (DBType)benchDbTypeComboBox.SelectedIndex;
- bench.ProceduresDBSettings.DbType = (DBType)proceduresDbTypeComboBox.SelectedIndex;
- bench.WMTypesDBSettings.DbType = (DBType)wmTypesDbTypeComboBox.SelectedIndex;
- bench.WaterMetersDBSettings.DbType = (DBType)watermetersDbTypeComboBox.SelectedIndex;
+ bench.UsersDBSettings.DbType = (Config.DBType)usersDbTypeComboBox.SelectedIndex;
+ bench.BenchDBSettings.DbType = (Config.DBType)benchDbTypeComboBox.SelectedIndex;
+ bench.ProceduresDBSettings.DbType = (Config.DBType)proceduresDbTypeComboBox.SelectedIndex;
+ bench.WMTypesDBSettings.DbType = (Config.DBType)wmTypesDbTypeComboBox.SelectedIndex;
+ bench.WaterMetersDBSettings.DbType = (Config.DBType)watermetersDbTypeComboBox.SelectedIndex;
return true;
}
@@ -155,7 +158,7 @@ namespace TBF
try
{
Cursor.Current = Cursors.WaitCursor;
- FluentCommon.CreateEmptyUsersDB(bench.UsersDBSettings);
+ Config.FluentCommon.CreateEmptyUsersDB(bench.UsersDBSettings);
MessageBox.Show(Strings.DB_was_successfully_created, Strings.Notification);
Cursor.Current = Cursors.Default;
DialogResult = DialogResult.None;
@@ -177,7 +180,7 @@ namespace TBF
try
{
Cursor.Current = Cursors.WaitCursor;
- FluentCommon.CreateEmptyBenchDB(bench.BenchDBSettings);
+ Config.FluentCommon.CreateEmptyBenchDB(bench.BenchDBSettings);
MessageBox.Show(Strings.DB_was_successfully_created, Strings.Notification);
Cursor.Current = Cursors.Default;
DialogResult = DialogResult.None;
@@ -199,7 +202,7 @@ namespace TBF
try
{
Cursor.Current = Cursors.WaitCursor;
- FluentCommon.CreateEmptyProceduresDB(bench.ProceduresDBSettings);
+ Config.FluentCommon.CreateEmptyProceduresDB(bench.ProceduresDBSettings);
MessageBox.Show(Strings.DB_was_successfully_created, Strings.Notification);
Cursor.Current = Cursors.Default;
DialogResult = DialogResult.None;
@@ -226,7 +229,7 @@ namespace TBF
try
{
Cursor.Current = Cursors.WaitCursor;
- FluentCommon.CreateEmptyWaterMetersDB(bench.WaterMetersDBSettings);
+ Config.FluentCommon.CreateEmptyWaterMetersDB(bench.WaterMetersDBSettings);
MessageBox.Show(Strings.DB_was_successfully_created, Strings.Notification);
Cursor.Current = Cursors.Default;
DialogResult = DialogResult.None;
diff --git a/ResultsBrowser/Forms/LoginDlg.cs b/ResultsBrowser/Forms/LoginDlg.cs
index 56386a5c7..2c1115dc2 100644
--- a/ResultsBrowser/Forms/LoginDlg.cs
+++ b/ResultsBrowser/Forms/LoginDlg.cs
@@ -1,10 +1,6 @@
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
using System.Windows.Forms;
+using Config.Entities;
using ResultsBrowser.Resources;
namespace ResultsBrowser.Forms
@@ -88,11 +84,11 @@ namespace ResultsBrowser.Forms
user = userNameTextBox.Text;
password = passwordTextBox.Text;
- bool authorized = Entities.User.IsPowerUser(user, password);
+ bool authorized = Config.Entities.User.IsPowerUser(user, password);
if (!authorized && !noDatabase)
{
- Entities.User loadedUser = Entities.User.LoadUserByName(user);
+ User loadedUser = User.LoadUserByName(user);
if (loadedUser != null)
{
if (requiredGroupMembership == Config.Grp.GID.Invalid)
@@ -110,7 +106,6 @@ namespace ResultsBrowser.Forms
{
DialogResult = DialogResult.OK;
Close();
- if (Program.MainWnd != null) Program.MainWnd.UpdateUser();
return;
}
@@ -126,7 +121,7 @@ namespace ResultsBrowser.Forms
{
if (requiredGroupMembership == Config.Grp.GID.Invalid)
{
- Entities.User.Unauthorize();
+ User.Unauthorize();
}
DialogResult = DialogResult.Cancel;
diff --git a/ResultsBrowser/Forms/LoginDlg.de.resx b/ResultsBrowser/Forms/LoginDlg.de.resx
deleted file mode 100644
index e161a92e1..000000000
--- a/ResultsBrowser/Forms/LoginDlg.de.resx
+++ /dev/null
@@ -1,142 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
-
- 75, 13
-
-
- Benutzername
-
-
- 50, 13
-
-
- Passwort
-
-
- &Abbrechen
-
-
- &OK
-
-
- Anmelden
-
-
\ No newline at end of file
diff --git a/ResultsBrowser/Forms/LoginDlgWithBenchSelection.cs b/ResultsBrowser/Forms/LoginDlgWithBenchSelection.cs
index 196f5f323..89e7b23f4 100644
--- a/ResultsBrowser/Forms/LoginDlgWithBenchSelection.cs
+++ b/ResultsBrowser/Forms/LoginDlgWithBenchSelection.cs
@@ -1,9 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
using System.Windows.Forms;
using ResultsBrowser.Resources;
@@ -47,14 +42,14 @@ namespace ResultsBrowser.Forms
private void LoginDlgWithBenchSelection_Load(object sender, EventArgs e)
{
#if DEBUG
- userNameTextBox.Text = Program.AdminUsername;
- passwordTextBox.Text = Program.AdminPassword;
+ userNameTextBox.Text = Config.Data.AdminUsername;
+ passwordTextBox.Text = Config.Data.AdminPassword;
#endif
- int nrOfBenches = Program.LocalSettings.testBenches == null ? 0 : Program.LocalSettings.testBenches.GetLength(0);
+ int nrOfBenches = Program.LocalSettings.TestBenches == null ? 0 : Program.LocalSettings.TestBenches.GetLength(0);
for (int i = 0; i < nrOfBenches; i++)
{
- testBenchComboBox.Items.Add(Program.LocalSettings.testBenches[i].BenchName);
- if (benchName != null && benchName == Program.LocalSettings.testBenches[i].BenchName)
+ testBenchComboBox.Items.Add(Program.LocalSettings.TestBenches[i].BenchName);
+ if (benchName != null && benchName == Program.LocalSettings.TestBenches[i].BenchName)
{
testBenchComboBox.Text = benchName;
}
diff --git a/ResultsBrowser/Forms/LoginDlgWithBenchSelection.de.resx b/ResultsBrowser/Forms/LoginDlgWithBenchSelection.de.resx
deleted file mode 100644
index 030cbca00..000000000
--- a/ResultsBrowser/Forms/LoginDlgWithBenchSelection.de.resx
+++ /dev/null
@@ -1,145 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
-
- 75, 13
-
-
- Benutzername
-
-
- 50, 13
-
-
- Passwort
-
-
- 52, 13
-
-
- Prüfstand
-
-
- Abbrechen
-
-
- Anmelden am Prüfstand
-
-
\ No newline at end of file
diff --git a/ResultsBrowser/Forms/LoginDlgWithBenchSelection.designer.cs b/ResultsBrowser/Forms/LoginDlgWithBenchSelection.designer.cs
index be1d6a842..c90cbbc56 100644
--- a/ResultsBrowser/Forms/LoginDlgWithBenchSelection.designer.cs
+++ b/ResultsBrowser/Forms/LoginDlgWithBenchSelection.designer.cs
@@ -42,19 +42,16 @@
// label1
//
resources.ApplyResources(this.label1, "label1");
- this.label1.ImageKey = global::TBF.Resources.Strings.String1;
this.label1.Name = "label1";
//
// label2
//
resources.ApplyResources(this.label2, "label2");
- this.label2.ImageKey = global::TBF.Resources.Strings.String1;
this.label2.Name = "label2";
//
// label3
//
resources.ApplyResources(this.label3, "label3");
- this.label3.ImageKey = global::TBF.Resources.Strings.String1;
this.label3.Name = "label3";
//
// testBenchComboBox
@@ -75,7 +72,6 @@
//
resources.ApplyResources(this.cancelButton, "cancelButton");
this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.cancelButton.ImageKey = global::TBF.Resources.Strings.String1;
this.cancelButton.Name = "cancelButton";
this.cancelButton.UseVisualStyleBackColor = true;
this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
@@ -84,7 +80,6 @@
//
resources.ApplyResources(this.okButton, "okButton");
this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
- this.okButton.ImageKey = global::TBF.Resources.Strings.String1;
this.okButton.Name = "okButton";
this.okButton.UseVisualStyleBackColor = true;
this.okButton.Click += new System.EventHandler(this.okButton_Click);
diff --git a/ResultsBrowser/Forms/LoginDlgWithBenchSelection.resx b/ResultsBrowser/Forms/LoginDlgWithBenchSelection.resx
index f44b0b6fe..4aa013558 100644
--- a/ResultsBrowser/Forms/LoginDlgWithBenchSelection.resx
+++ b/ResultsBrowser/Forms/LoginDlgWithBenchSelection.resx
@@ -121,14 +121,11 @@
User name
-
- 402, 102
-
105, 28
-
- 285, 48
+
+ OK
Cancel
@@ -252,6 +249,9 @@
okButton
+
+ 285, 48
+
$this
@@ -264,6 +264,9 @@
True
+
+ $this
+
3
@@ -276,8 +279,8 @@
$this
-
- 4
+
+ System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
cancelButton
@@ -303,17 +306,14 @@
7
-
- OK
-
System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- $this
+
+ 402, 102
-
- System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 4
5
@@ -333,7 +333,4 @@
True
-
- de
-
\ No newline at end of file
diff --git a/ResultsBrowser/MainWnd.Designer.cs b/ResultsBrowser/MainWnd.Designer.cs
index 34bda0846..5115296b5 100644
--- a/ResultsBrowser/MainWnd.Designer.cs
+++ b/ResultsBrowser/MainWnd.Designer.cs
@@ -28,114 +28,12 @@
///
private void InitializeComponent()
{
- this.dateFromComboBox = new System.Windows.Forms.ComboBox();
- this.label1 = new System.Windows.Forms.Label();
- this.label2 = new System.Windows.Forms.Label();
- this.dateToComboBox = new System.Windows.Forms.ComboBox();
- this.label3 = new System.Windows.Forms.Label();
- this.procedureComboBox = new System.Windows.Forms.ComboBox();
- this.searchButton = new System.Windows.Forms.Button();
- this.resultsTextBox = new System.Windows.Forms.TextBox();
- this.SuspendLayout();
- //
- // dateFromComboBox
- //
- this.dateFromComboBox.FormattingEnabled = true;
- this.dateFromComboBox.Location = new System.Drawing.Point(45, 49);
- this.dateFromComboBox.Name = "dateFromComboBox";
- this.dateFromComboBox.Size = new System.Drawing.Size(133, 21);
- this.dateFromComboBox.TabIndex = 0;
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(42, 32);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(53, 13);
- this.label1.TabIndex = 1;
- this.label1.Text = "Date from";
- //
- // label2
- //
- this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(206, 32);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(42, 13);
- this.label2.TabIndex = 3;
- this.label2.Text = "Date to";
- //
- // dateToComboBox
- //
- this.dateToComboBox.FormattingEnabled = true;
- this.dateToComboBox.Location = new System.Drawing.Point(209, 49);
- this.dateToComboBox.Name = "dateToComboBox";
- this.dateToComboBox.Size = new System.Drawing.Size(133, 21);
- this.dateToComboBox.TabIndex = 2;
- //
- // label3
- //
- this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(367, 32);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(56, 13);
- this.label3.TabIndex = 5;
- this.label3.Text = "Procedure";
- //
- // procedureComboBox
- //
- this.procedureComboBox.FormattingEnabled = true;
- this.procedureComboBox.Location = new System.Drawing.Point(370, 49);
- this.procedureComboBox.Name = "procedureComboBox";
- this.procedureComboBox.Size = new System.Drawing.Size(133, 21);
- this.procedureComboBox.TabIndex = 4;
- //
- // searchButton
- //
- this.searchButton.Location = new System.Drawing.Point(395, 109);
- this.searchButton.Name = "searchButton";
- this.searchButton.Size = new System.Drawing.Size(107, 31);
- this.searchButton.TabIndex = 6;
- this.searchButton.Text = "Search";
- this.searchButton.UseVisualStyleBackColor = true;
- //
- // resultsTextBox
- //
- this.resultsTextBox.Location = new System.Drawing.Point(46, 175);
- this.resultsTextBox.Multiline = true;
- this.resultsTextBox.Name = "resultsTextBox";
- this.resultsTextBox.Size = new System.Drawing.Size(456, 234);
- this.resultsTextBox.TabIndex = 7;
- //
- // Form1
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.components = new System.ComponentModel.Container();
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(550, 448);
- this.Controls.Add(this.resultsTextBox);
- this.Controls.Add(this.searchButton);
- this.Controls.Add(this.label3);
- this.Controls.Add(this.procedureComboBox);
- this.Controls.Add(this.label2);
- this.Controls.Add(this.dateToComboBox);
- this.Controls.Add(this.label1);
- this.Controls.Add(this.dateFromComboBox);
- this.Name = "Form1";
- this.Text = "Results Browser";
- this.ResumeLayout(false);
- this.PerformLayout();
-
+ this.Text = "Form1";
}
#endregion
-
- private System.Windows.Forms.ComboBox dateFromComboBox;
- private System.Windows.Forms.Label label1;
- private System.Windows.Forms.Label label2;
- private System.Windows.Forms.ComboBox dateToComboBox;
- private System.Windows.Forms.Label label3;
- private System.Windows.Forms.ComboBox procedureComboBox;
- private System.Windows.Forms.Button searchButton;
- private System.Windows.Forms.TextBox resultsTextBox;
}
}
diff --git a/ResultsBrowser/MainWnd.resx b/ResultsBrowser/MainWnd.resx
deleted file mode 100644
index 1af7de150..000000000
--- a/ResultsBrowser/MainWnd.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file
diff --git a/ResultsBrowser/Program.cs b/ResultsBrowser/Program.cs
index 7e4558c2e..1173a464e 100644
--- a/ResultsBrowser/Program.cs
+++ b/ResultsBrowser/Program.cs
@@ -1,4 +1,4 @@
-///
+///
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
using System;
@@ -11,8 +11,8 @@ using ResultsBrowser.Forms;
namespace ResultsBrowser
{
- public class Program
- {
+ public class Program
+ {
public const string HomeDir = "C:\\Tbf\\"; /// Contains subdirectories Results, Logs, Images, ...
/// log4net
@@ -27,29 +27,29 @@ namespace ResultsBrowser
public static System.Globalization.CultureInfo AltCulture;
- ///
- /// Main window object.
- ///
- public static MainWnd MainWnd;
+ ///
+ /// Main window object.
+ ///
+ public static MainWnd MainWnd;
- ///
- /// The main entry point for the application.
- ///
- [STAThread]
- static void Main()
- {
- log.Fatal("--------------------------------------------------------------------------------");
+ ///
+ /// The main entry point for the application.
+ ///
+ [STAThread]
+ static void Main()
+ {
+ log.Fatal("--------------------------------------------------------------------------------");
- /// Local program configuration directory including the trailing backslash
+ /// Local program configuration directory including the trailing backslash
string locAppDataDir = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) +
Path.DirectorySeparatorChar + "TestBenchFramework" + Path.DirectorySeparatorChar;
- /// Check whether local application data directory exists.
+ /// Check whether local application data directory exists.
/// If not, create it and copy the initial configuration to this directory.
/// This is done only once after a clean program installation on the first program start-up
try
- {
+ {
if (!Directory.Exists(locAppDataDir))
{
Directory.CreateDirectory(locAppDataDir);
@@ -69,11 +69,11 @@ namespace ResultsBrowser
Environment.CurrentDirectory = locAppDataDir;
}
}
- catch (Exception e)
- {
- log.Error("A problem when creating the local application data directory and preparing the initial configuration", e);
+ catch (Exception e)
+ {
+ log.Error("A problem when creating the local application data directory and preparing the initial configuration", e);
return;
- }
+ }
/// Configue and start logging
log4net.Config.XmlConfigurator.Configure(new System.IO.FileInfo(locAppDataDir + log4netConfigFName));
@@ -82,14 +82,22 @@ namespace ResultsBrowser
///
/// Load the local settings
///
- Program.LocalSettings = LocalSettings.Load(Program.LocalSettingsFileName);
- if (Program.LocalSettings == null || Program.LocalSettings.TestBenches == null)
+ LocalSettings = LocalSettings.Load(Program.LocalSettingsFileName);
+ if (LocalSettings == null || LocalSettings.TestBenches == null)
{
/// Loading local seetings from regular config file failed. Use the backup
- Program.LocalSettings = LocalSettings.Load(Program.LocalSettingsBackupName);
- if (Program.LocalSettings == null || Program.LocalSettings.TestBenches == null)
+ LocalSettings = LocalSettings.Load(Program.LocalSettingsBackupName);
+ if (LocalSettings == null || LocalSettings.TestBenches == null)
{
- return; /// Fatal error
+ if (MessageBox.Show("No program settings found. Do you want to use default settings?",
+ "Question", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+ {
+ return;
+ }
+
+ /// Create new default settings and save them
+ LocalSettings = new LocalSettings();
+ LocalSettings.Save();
}
else
{
@@ -118,10 +126,10 @@ namespace ResultsBrowser
//AltCulture = null;
AltCulture = new System.Globalization.CultureInfo("SK");
- /// This belongs to Application.Run(new MainWnd()) ...
- /// and should be executed before opening 'loginDlg'
- Application.EnableVisualStyles();
- Application.SetCompatibleTextRenderingDefault(false);
+ /// This belongs to Application.Run(new MainWnd()) ...
+ /// and should be executed before opening 'loginDlg'
+ Application.EnableVisualStyles();
+ Application.SetCompatibleTextRenderingDefault(false);
/// Ensure that there is at least one bench in the configuration
while (Program.LocalSettings.BenchesCount == 0)
@@ -141,34 +149,35 @@ namespace ResultsBrowser
if (Program.LocalSettings == null) return; /// Fatal error
}
- /// User login
- bool retryLogin = true; /// true = stay in a login loop
- do {
- LoginDlgWithBenchSelection loginDlgBench;
- if (LocalSettings.LastBenchName != null)
- {
- loginDlgBench = new LoginDlgWithBenchSelection(LocalSettings.LastBenchName);
- }
- else
- {
- loginDlgBench = new LoginDlgWithBenchSelection();
- }
- DialogResult dr = loginDlgBench.ShowDialog();
+ /// User login
+ bool retryLogin = true; /// true = stay in a login loop
+ do
+ {
+ LoginDlgWithBenchSelection loginDlgBench;
+ if (LocalSettings.LastBenchName != null)
+ {
+ loginDlgBench = new LoginDlgWithBenchSelection(LocalSettings.LastBenchName);
+ }
+ else
+ {
+ loginDlgBench = new LoginDlgWithBenchSelection();
+ }
+ DialogResult dr = loginDlgBench.ShowDialog();
- if (dr == DialogResult.Cancel)
- {
- return; /// Login canceled --> Exit application
- }
- else
- {
+ if (dr == DialogResult.Cancel)
+ {
+ return; /// Login canceled --> Exit application
+ }
+ else
+ {
- for (int i = 0; i < LocalSettings.BenchesCount; i++)
- {
- if (LocalSettings.TestBenches[i].BenchName == loginDlgBench.BenchName)
- {
- User loadedUser = null;
- try
- {
+ for (int i = 0; i < LocalSettings.BenchesCount; i++)
+ {
+ if (LocalSettings.TestBenches[i].BenchName == loginDlgBench.BenchName)
+ {
+ User loadedUser = null;
+ try
+ {
bool authorized = false;
if (User.IsPowerUser(loginDlgBench.User, loginDlgBench.Password))
@@ -189,30 +198,30 @@ namespace ResultsBrowser
}
if (authorized)
- {
+ {
log.InfoFormat("Password accepted, bench '{0}' parameters loaded.", LocalSettings.TestBenches[i].BenchName);
- /// Copy the selected bench settings to CurrentBench.
- /// Clone() guarantees that current bench settings wont be modified
- /// when user modifies the database settings in DatabaseSettingsDlg.
+ /// Copy the selected bench settings to CurrentBench.
+ /// Clone() guarantees that current bench settings wont be modified
+ /// when user modifies the database settings in DatabaseSettingsDlg.
Config.Data.CurrentBench = (Config.DatabaseSettings)LocalSettings.TestBenches[i].Clone();
- /// Save the selection to local settings
+ /// Save the selection to local settings
LocalSettings.LastBenchName = Config.Data.CurrentBench.BenchName;
- retryLogin = false;
- break;
- }
+ retryLogin = false;
+ break;
+ }
- if (retryLogin)
- {
- /// Close Fluent NHibernate
+ if (retryLogin)
+ {
+ /// Close Fluent NHibernate
MessageBox.Show("Invalid user, password, or bench", "Error", MessageBoxButtons.OK);
- }
- }
- catch (Exception)
- {
- /// Database connect failed, ask what to do
+ }
+ }
+ catch (Exception)
+ {
+ /// Database connect failed, ask what to do
switch ((new Forms.NoBenchOrDatabaseDlg { Message = "Cannot connect to the database.", ShowRetry = true }).ShowDialog())
{
case DialogResult.Abort: return; /// Exit program
@@ -230,10 +239,10 @@ namespace ResultsBrowser
}
}
} // if benchname is OK
- } // for all benches in local settings loop
- } // not Canceled
- } //do
- while (retryLogin);
+ } // for all benches in local settings loop
+ } // not Canceled
+ } //do
+ while (retryLogin);
try
@@ -255,11 +264,11 @@ namespace ResultsBrowser
LocalSettings.Save();
}
- /// Close Fluent NHibernate
- /// Todo
-
+ /// Close Fluent NHibernate
+ /// Todo
+
log.Info("Exiting application.");
- }
+ }
static void MyHandler(object sender, UnhandledExceptionEventArgs args)
{
diff --git a/ResultsBrowser/Properties/AssemblyInfo.cs b/ResultsBrowser/Properties/AssemblyInfo.cs
index 1ccd09c5e..8939989e3 100644
--- a/ResultsBrowser/Properties/AssemblyInfo.cs
+++ b/ResultsBrowser/Properties/AssemblyInfo.cs
@@ -20,7 +20,7 @@ using System.Runtime.InteropServices;
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("52c39793-b492-49c6-aa6a-1820ebef1d6e")]
+[assembly: Guid("3bb098ac-f5d3-4eb1-90ea-7ba296ce8fd7")]
// Version information for an assembly consists of the following four values:
//
diff --git a/ResultsBrowser/Properties/Resources.Designer.cs b/ResultsBrowser/Properties/Resources.Designer.cs
index 84922c9c2..cbf92485c 100644
--- a/ResultsBrowser/Properties/Resources.Designer.cs
+++ b/ResultsBrowser/Properties/Resources.Designer.cs
@@ -8,64 +8,56 @@
//
//------------------------------------------------------------------------------
-namespace ResultsBrowser.Properties
-{
-
-
- ///
- /// A strongly-typed resource class, for looking up localized strings, etc.
- ///
- // This class was auto-generated by the StronglyTypedResourceBuilder
- // class via a tool like ResGen or Visual Studio.
- // To add or remove a member, edit your .ResX file then rerun ResGen
- // with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- internal class Resources
- {
-
- private static global::System.Resources.ResourceManager resourceMan;
-
- private static global::System.Globalization.CultureInfo resourceCulture;
-
- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- internal Resources()
- {
- }
-
- ///
- /// Returns the cached ResourceManager instance used by this class.
- ///
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Resources.ResourceManager ResourceManager
- {
- get
- {
- if ((resourceMan == null))
- {
- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ResultsBrowser.Properties.Resources", typeof(Resources).Assembly);
- resourceMan = temp;
- }
- return resourceMan;
- }
- }
-
- ///
- /// Overrides the current thread's CurrentUICulture property for all
- /// resource lookups using this strongly typed resource class.
- ///
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Globalization.CultureInfo Culture
- {
- get
- {
- return resourceCulture;
- }
- set
- {
- resourceCulture = value;
- }
- }
- }
+namespace ResultsBrowser.Properties {
+ using System;
+
+
+ ///
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ ///
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class Resources {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Resources() {
+ }
+
+ ///
+ /// Returns the cached ResourceManager instance used by this class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ResultsBrowser.Properties.Resources", typeof(Resources).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ ///
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+ }
}
diff --git a/ResultsBrowser/Properties/Settings.Designer.cs b/ResultsBrowser/Properties/Settings.Designer.cs
index e78e8179c..6f19c405e 100644
--- a/ResultsBrowser/Properties/Settings.Designer.cs
+++ b/ResultsBrowser/Properties/Settings.Designer.cs
@@ -8,23 +8,19 @@
//
//------------------------------------------------------------------------------
-namespace ResultsBrowser.Properties
-{
-
-
- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
- internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
- {
-
- private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
- public static Settings Default
- {
- get
- {
- return defaultInstance;
- }
- }
- }
+namespace ResultsBrowser.Properties {
+
+
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
+ internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+
+ private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+ public static Settings Default {
+ get {
+ return defaultInstance;
+ }
+ }
+ }
}
diff --git a/ResultsBrowser/ResultsBrowser.csproj b/ResultsBrowser/ResultsBrowser.csproj
index d0d48d0c9..563588f3d 100644
--- a/ResultsBrowser/ResultsBrowser.csproj
+++ b/ResultsBrowser/ResultsBrowser.csproj
@@ -5,13 +5,14 @@
x86
8.0.30703
2.0
- {890D8E75-F745-407D-9A49-00CBC791D686}
+ {07BA543A-54CA-4A59-9AD9-DDE7038E1BF9}
WinExe
Properties
ResultsBrowser
ResultsBrowser
v4.0
- Client
+
+
512
@@ -20,16 +21,17 @@
full
false
bin\Debug\
- DEBUG;TRACE
+ TRACE;DEBUG;MUNICH
prompt
4
+ false
x86
pdbonly
true
bin\Release\
- TRACE
+ TRACE;MUNICH
prompt
4
@@ -58,6 +60,12 @@
BenchesDlg.cs
+
+ Form
+
+
+ DatabaseSettingsDlg.cs
+
Form
@@ -89,24 +97,18 @@
BenchesDlg.cs
-
- LoginDlg.cs
+
+ DatabaseSettingsDlg.cs
LoginDlg.cs
-
- LoginDlgWithBenchSelection.cs
-
LoginDlgWithBenchSelection.cs
NoBenchOrDatabaseDlg.cs
-
- MainWnd.cs
-
ResXFileCodeGenerator
Resources.Designer.cs
@@ -115,8 +117,10 @@
True
Resources.resx
+ True
+
SettingsSingleFileGenerator
Settings.Designer.cs
diff --git a/ResultsBrowser/app.config b/ResultsBrowser/app.config
new file mode 100644
index 000000000..e36560333
--- /dev/null
+++ b/ResultsBrowser/app.config
@@ -0,0 +1,3 @@
+
+
+
diff --git a/TestBenchFramework.sln b/TestBenchFramework.sln
index 609133a64..0f5847152 100644
--- a/TestBenchFramework.sln
+++ b/TestBenchFramework.sln
@@ -5,12 +5,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TBF", "TestBenchFramework\T
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "TBFSetup", "TBFSetup\TBFSetup.vdproj", "{4890DE5C-9F68-40D7-B075-92C8EAB79833}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResultsBrowser", "ResultsBrowser\ResultsBrowser.csproj", "{890D8E75-F745-407D-9A49-00CBC791D686}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Results", "Results\Results.csproj", "{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Config", "Config\Config.csproj", "{743DF7DB-C7B6-42EB-986D-0F485E5588E4}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResultsBrowser", "ResultsBrowser\ResultsBrowser.csproj", "{07BA543A-54CA-4A59-9AD9-DDE7038E1BF9}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -25,8 +25,8 @@ Global
{8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48}.Debug|Mixed Platforms.Build.0 = Debug|x86
- {8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48}.Debug|x86.ActiveCfg = Debug|x86
- {8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48}.Debug|x86.Build.0 = Debug|x86
+ {8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48}.Debug|x86.Build.0 = Debug|Any CPU
{8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48}.Release|Any CPU.Build.0 = Release|Any CPU
{8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48}.Release|Mixed Platforms.ActiveCfg = Release|x86
@@ -42,16 +42,6 @@ Global
{4890DE5C-9F68-40D7-B075-92C8EAB79833}.Release|Mixed Platforms.ActiveCfg = Release
{4890DE5C-9F68-40D7-B075-92C8EAB79833}.Release|Mixed Platforms.Build.0 = Release
{4890DE5C-9F68-40D7-B075-92C8EAB79833}.Release|x86.ActiveCfg = Release
- {890D8E75-F745-407D-9A49-00CBC791D686}.Debug|Any CPU.ActiveCfg = Debug|x86
- {890D8E75-F745-407D-9A49-00CBC791D686}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
- {890D8E75-F745-407D-9A49-00CBC791D686}.Debug|Mixed Platforms.Build.0 = Debug|x86
- {890D8E75-F745-407D-9A49-00CBC791D686}.Debug|x86.ActiveCfg = Debug|x86
- {890D8E75-F745-407D-9A49-00CBC791D686}.Debug|x86.Build.0 = Debug|x86
- {890D8E75-F745-407D-9A49-00CBC791D686}.Release|Any CPU.ActiveCfg = Release|x86
- {890D8E75-F745-407D-9A49-00CBC791D686}.Release|Mixed Platforms.ActiveCfg = Release|x86
- {890D8E75-F745-407D-9A49-00CBC791D686}.Release|Mixed Platforms.Build.0 = Release|x86
- {890D8E75-F745-407D-9A49-00CBC791D686}.Release|x86.ActiveCfg = Release|x86
- {890D8E75-F745-407D-9A49-00CBC791D686}.Release|x86.Build.0 = Release|x86
{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
@@ -70,6 +60,16 @@ Global
{743DF7DB-C7B6-42EB-986D-0F485E5588E4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{743DF7DB-C7B6-42EB-986D-0F485E5588E4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{743DF7DB-C7B6-42EB-986D-0F485E5588E4}.Release|x86.ActiveCfg = Release|Any CPU
+ {07BA543A-54CA-4A59-9AD9-DDE7038E1BF9}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {07BA543A-54CA-4A59-9AD9-DDE7038E1BF9}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+ {07BA543A-54CA-4A59-9AD9-DDE7038E1BF9}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {07BA543A-54CA-4A59-9AD9-DDE7038E1BF9}.Debug|x86.ActiveCfg = Debug|x86
+ {07BA543A-54CA-4A59-9AD9-DDE7038E1BF9}.Debug|x86.Build.0 = Debug|x86
+ {07BA543A-54CA-4A59-9AD9-DDE7038E1BF9}.Release|Any CPU.ActiveCfg = Release|x86
+ {07BA543A-54CA-4A59-9AD9-DDE7038E1BF9}.Release|Mixed Platforms.ActiveCfg = Release|x86
+ {07BA543A-54CA-4A59-9AD9-DDE7038E1BF9}.Release|Mixed Platforms.Build.0 = Release|x86
+ {07BA543A-54CA-4A59-9AD9-DDE7038E1BF9}.Release|x86.ActiveCfg = Release|x86
+ {07BA543A-54CA-4A59-9AD9-DDE7038E1BF9}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/TestBenchFramework/TBF.csproj b/TestBenchFramework/TBF.csproj
index d545661d7..be57cd5f7 100644
--- a/TestBenchFramework/TBF.csproj
+++ b/TestBenchFramework/TBF.csproj
@@ -43,6 +43,7 @@
prompt
4
true
+ x86
pdbonly
@@ -1659,7 +1660,9 @@
-
+
+ Designer
+
Designer