michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ResultsBrowser works, MySQL DB opens, Oracle DB in TBF works in 64-bit OS, TBF v.2.0.165.

Browse Source
This commit is contained in:
Milan Hanajik 2015-12-13 09:37:48 +01:00
parent 6ecddf07f6
commit 9689080387
8 changed files with 45 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Config/Properties/AssemblyInfo.cs
View File

@ -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")]

15
ResultsBrowser/Forms/LoginDlgWithBenchSelection.cs
View File

@ -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;
}
/// <summary>

3
ResultsBrowser/LocalSettings.cs
View File

@ -1,3 +1,6 @@
///
/// Copyright (c) 2015 Sensus Metering Systems
///
using System;
using System.IO;
using System.Text;

12
ResultsBrowser/Program.cs
View File

@ -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 ||

4
ResultsBrowser/Properties/AssemblyInfo.cs
View File

@ -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")]

15
ResultsBrowser/ResultsBrowser.csproj
View File

@ -39,9 +39,24 @@
<StartupObject>ResultsBrowser.Program</StartupObject>
</PropertyGroup>
<ItemGroup>
<Reference Include="FluentNHibernate, Version=1.3.0.733, Culture=neutral, PublicKeyToken=8aa435e3cb308880, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\FluentNHibernate.1.3.0.733\lib\FluentNHibernate.dll</HintPath>
</Reference>
<Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Iesi.Collections.3.2.0.4000\lib\Net35\Iesi.Collections.dll</HintPath>
</Reference>
<Reference Include="log4net">
<HintPath>..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
</Reference>
<Reference Include="MySql.Data">
<HintPath>..\packages\MySql.Data.6.6.5\lib\net20\MySql.Data.dll</HintPath>
</Reference>
<Reference Include="NHibernate, Version=3.3.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NHibernate.3.3.3.4001\lib\Net35\NHibernate.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />

1
TestBenchFramework/LoginDlgWithBenchSelection.cs
View File

@ -72,7 +72,6 @@ namespace TBF
label3.Text = Strings.Test_bench;
okButton.Text = Strings.OkBtnText;
cancelButton.Text = Strings.CancelBtnText;
}
/// <summary>

4
TestBenchFramework/Properties/AssemblyInfo.cs
View File

@ -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")]