From 9689080387c4bc678a05ed6abe4bd6ba1783380d Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Sun, 13 Dec 2015 09:37:48 +0100 Subject: [PATCH] ResultsBrowser works, MySQL DB opens, Oracle DB in TBF works in 64-bit OS, TBF v.2.0.165. --- Config/Properties/AssemblyInfo.cs | 4 ++-- .../Forms/LoginDlgWithBenchSelection.cs | 15 +++++++++++++-- ResultsBrowser/LocalSettings.cs | 3 +++ ResultsBrowser/Program.cs | 12 ++++++++---- ResultsBrowser/Properties/AssemblyInfo.cs | 4 ++-- ResultsBrowser/ResultsBrowser.csproj | 15 +++++++++++++++ TestBenchFramework/LoginDlgWithBenchSelection.cs | 1 - TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- 8 files changed, 45 insertions(+), 13 deletions(-) diff --git a/Config/Properties/AssemblyInfo.cs b/Config/Properties/AssemblyInfo.cs index f6eff76a0..bb5565c73 100644 --- a/Config/Properties/AssemblyInfo.cs +++ b/Config/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.164.0")] -[assembly: AssemblyFileVersion("2.0.164.0")] +[assembly: AssemblyVersion("2.0.1.0")] +[assembly: AssemblyFileVersion("2.0.1.0")] diff --git a/ResultsBrowser/Forms/LoginDlgWithBenchSelection.cs b/ResultsBrowser/Forms/LoginDlgWithBenchSelection.cs index 89e7b23f4..6348ffb9b 100644 --- a/ResultsBrowser/Forms/LoginDlgWithBenchSelection.cs +++ b/ResultsBrowser/Forms/LoginDlgWithBenchSelection.cs @@ -45,8 +45,7 @@ namespace ResultsBrowser.Forms userNameTextBox.Text = Config.Data.AdminUsername; passwordTextBox.Text = Config.Data.AdminPassword; #endif - int nrOfBenches = Program.LocalSettings.TestBenches == null ? 0 : Program.LocalSettings.TestBenches.GetLength(0); - for (int i = 0; i < nrOfBenches; i++) + for (int i = 0; i < Program.LocalSettings.BenchesCount; i++) { testBenchComboBox.Items.Add(Program.LocalSettings.TestBenches[i].BenchName); if (benchName != null && benchName == Program.LocalSettings.TestBenches[i].BenchName) @@ -54,6 +53,18 @@ namespace ResultsBrowser.Forms testBenchComboBox.Text = benchName; } } + + Localize(); + } + + void Localize() + { + Text = Strings.User_Login; + label1.Text = Strings.Username; + label2.Text = Strings.Password; + label3.Text = Strings.Test_bench; + okButton.Text = Strings.OkBtnText; + cancelButton.Text = Strings.CancelBtnText; } /// diff --git a/ResultsBrowser/LocalSettings.cs b/ResultsBrowser/LocalSettings.cs index c656bfed7..2c161532f 100644 --- a/ResultsBrowser/LocalSettings.cs +++ b/ResultsBrowser/LocalSettings.cs @@ -1,3 +1,6 @@ +/// +/// Copyright (c) 2015 Sensus Metering Systems +/// using System; using System.IO; using System.Text; diff --git a/ResultsBrowser/Program.cs b/ResultsBrowser/Program.cs index 1173a464e..cc0da5671 100644 --- a/ResultsBrowser/Program.cs +++ b/ResultsBrowser/Program.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2015 Sensus Metering Systems /// using System; using System.IO; @@ -170,7 +170,6 @@ namespace ResultsBrowser } else { - for (int i = 0; i < LocalSettings.BenchesCount; i++) { if (LocalSettings.TestBenches[i].BenchName == loginDlgBench.BenchName) @@ -208,6 +207,7 @@ namespace ResultsBrowser /// Save the selection to local settings LocalSettings.LastBenchName = Config.Data.CurrentBench.BenchName; + LocalSettings.Save(); retryLogin = false; break; @@ -224,8 +224,12 @@ namespace ResultsBrowser /// 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 - case DialogResult.Retry: break; /// Retry the loop + case DialogResult.Abort: + return; /// Exit program + /// + case DialogResult.Retry: + break; /// Retry the loop + /// default: /// Open 'DatabaseSetingsDlg' and retry DB connect on OK if (new LoginDlg(true).ShowDialog() == DialogResult.Cancel || diff --git a/ResultsBrowser/Properties/AssemblyInfo.cs b/ResultsBrowser/Properties/AssemblyInfo.cs index 8939989e3..03e41f59c 100644 --- a/ResultsBrowser/Properties/AssemblyInfo.cs +++ b/ResultsBrowser/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("2.0.1.0")] +[assembly: AssemblyFileVersion("2.0.1.0")] diff --git a/ResultsBrowser/ResultsBrowser.csproj b/ResultsBrowser/ResultsBrowser.csproj index 563588f3d..fcffb7d73 100644 --- a/ResultsBrowser/ResultsBrowser.csproj +++ b/ResultsBrowser/ResultsBrowser.csproj @@ -39,9 +39,24 @@ ResultsBrowser.Program + + False + ..\packages\FluentNHibernate.1.3.0.733\lib\FluentNHibernate.dll + + + False + ..\packages\Iesi.Collections.3.2.0.4000\lib\Net35\Iesi.Collections.dll + ..\packages\log4net.2.0.2\lib\net40-full\log4net.dll + + ..\packages\MySql.Data.6.6.5\lib\net20\MySql.Data.dll + + + False + ..\packages\NHibernate.3.3.3.4001\lib\Net35\NHibernate.dll + diff --git a/TestBenchFramework/LoginDlgWithBenchSelection.cs b/TestBenchFramework/LoginDlgWithBenchSelection.cs index 56d31456b..ab9180f56 100644 --- a/TestBenchFramework/LoginDlgWithBenchSelection.cs +++ b/TestBenchFramework/LoginDlgWithBenchSelection.cs @@ -72,7 +72,6 @@ namespace TBF label3.Text = Strings.Test_bench; okButton.Text = Strings.OkBtnText; cancelButton.Text = Strings.CancelBtnText; - } /// diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index ca82a7d54..9e1c12037 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.0.164.1")] -[assembly: AssemblyFileVersion("2.0.164.1")] +[assembly: AssemblyVersion("2.0.165.1")] +[assembly: AssemblyFileVersion("2.0.165.1")]