diff --git a/ResultsBrowser/Forms/DatabaseSettingsDlg.Designer.cs b/ResultsBrowser/Forms/DatabaseSettingsDlg.Designer.cs
index 01533910b..649a1d897 100644
--- a/ResultsBrowser/Forms/DatabaseSettingsDlg.Designer.cs
+++ b/ResultsBrowser/Forms/DatabaseSettingsDlg.Designer.cs
@@ -48,13 +48,19 @@
this.connectionStringTextBox4 = new System.Windows.Forms.TextBox();
this.benchNameTextBox6 = new System.Windows.Forms.TextBox();
this.connectionStringTextBox6 = new System.Windows.Forms.TextBox();
+ this.benchNameTextBox9 = new System.Windows.Forms.TextBox();
+ this.connectionStringTextBox9 = new System.Windows.Forms.TextBox();
+ this.benchNameTextBox8 = new System.Windows.Forms.TextBox();
+ this.benchNameTextBox7 = new System.Windows.Forms.TextBox();
+ this.connectionStringTextBox8 = new System.Windows.Forms.TextBox();
+ this.connectionStringTextBox7 = 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.Size = new System.Drawing.Size(713, 20);
this.connectionStringTextBox1.TabIndex = 3;
//
// benchNameLabel
@@ -79,20 +85,20 @@
//
this.connectionStringTextBox2.Location = new System.Drawing.Point(157, 69);
this.connectionStringTextBox2.Name = "connectionStringTextBox2";
- this.connectionStringTextBox2.Size = new System.Drawing.Size(555, 20);
+ this.connectionStringTextBox2.Size = new System.Drawing.Size(713, 20);
this.connectionStringTextBox2.TabIndex = 5;
//
// connectionStringTextBox3
//
this.connectionStringTextBox3.Location = new System.Drawing.Point(157, 93);
this.connectionStringTextBox3.Name = "connectionStringTextBox3";
- this.connectionStringTextBox3.Size = new System.Drawing.Size(555, 20);
+ this.connectionStringTextBox3.Size = new System.Drawing.Size(713, 20);
this.connectionStringTextBox3.TabIndex = 7;
//
// okButton
//
this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.okButton.Location = new System.Drawing.Point(506, 250);
+ this.okButton.Location = new System.Drawing.Point(664, 326);
this.okButton.Name = "okButton";
this.okButton.Size = new System.Drawing.Size(95, 38);
this.okButton.TabIndex = 18;
@@ -104,7 +110,7 @@
//
this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.cancelButton.Location = new System.Drawing.Point(617, 250);
+ this.cancelButton.Location = new System.Drawing.Point(775, 326);
this.cancelButton.Name = "cancelButton";
this.cancelButton.Size = new System.Drawing.Size(95, 38);
this.cancelButton.TabIndex = 19;
@@ -137,7 +143,7 @@
//
this.languageLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.languageLabel.AutoSize = true;
- this.languageLabel.Location = new System.Drawing.Point(26, 245);
+ this.languageLabel.Location = new System.Drawing.Point(26, 317);
this.languageLabel.Name = "languageLabel";
this.languageLabel.Size = new System.Drawing.Size(55, 13);
this.languageLabel.TabIndex = 14;
@@ -146,7 +152,7 @@
// languageTextBox
//
this.languageTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.languageTextBox.Location = new System.Drawing.Point(29, 263);
+ this.languageTextBox.Location = new System.Drawing.Point(29, 335);
this.languageTextBox.Name = "languageTextBox";
this.languageTextBox.Size = new System.Drawing.Size(100, 20);
this.languageTextBox.TabIndex = 15;
@@ -155,7 +161,7 @@
//
this.formatLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.formatLabel.AutoSize = true;
- this.formatLabel.Location = new System.Drawing.Point(26, 196);
+ this.formatLabel.Location = new System.Drawing.Point(26, 268);
this.formatLabel.Name = "formatLabel";
this.formatLabel.Size = new System.Drawing.Size(94, 13);
this.formatLabel.TabIndex = 12;
@@ -164,9 +170,9 @@
// timePeriodFormatTextBox
//
this.timePeriodFormatTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.timePeriodFormatTextBox.Location = new System.Drawing.Point(29, 215);
+ this.timePeriodFormatTextBox.Location = new System.Drawing.Point(29, 287);
this.timePeriodFormatTextBox.Name = "timePeriodFormatTextBox";
- this.timePeriodFormatTextBox.Size = new System.Drawing.Size(683, 20);
+ this.timePeriodFormatTextBox.Size = new System.Drawing.Size(841, 20);
this.timePeriodFormatTextBox.TabIndex = 13;
//
// benchNameTextBox5
@@ -187,14 +193,14 @@
//
this.connectionStringTextBox5.Location = new System.Drawing.Point(157, 141);
this.connectionStringTextBox5.Name = "connectionStringTextBox5";
- this.connectionStringTextBox5.Size = new System.Drawing.Size(555, 20);
+ this.connectionStringTextBox5.Size = new System.Drawing.Size(713, 20);
this.connectionStringTextBox5.TabIndex = 11;
//
// connectionStringTextBox4
//
this.connectionStringTextBox4.Location = new System.Drawing.Point(157, 117);
this.connectionStringTextBox4.Name = "connectionStringTextBox4";
- this.connectionStringTextBox4.Size = new System.Drawing.Size(555, 20);
+ this.connectionStringTextBox4.Size = new System.Drawing.Size(713, 20);
this.connectionStringTextBox4.TabIndex = 9;
//
// benchNameTextBox6
@@ -208,16 +214,64 @@
//
this.connectionStringTextBox6.Location = new System.Drawing.Point(157, 165);
this.connectionStringTextBox6.Name = "connectionStringTextBox6";
- this.connectionStringTextBox6.Size = new System.Drawing.Size(555, 20);
+ this.connectionStringTextBox6.Size = new System.Drawing.Size(713, 20);
this.connectionStringTextBox6.TabIndex = 21;
//
+ // benchNameTextBox9
+ //
+ this.benchNameTextBox9.Location = new System.Drawing.Point(29, 237);
+ this.benchNameTextBox9.Name = "benchNameTextBox9";
+ this.benchNameTextBox9.Size = new System.Drawing.Size(100, 20);
+ this.benchNameTextBox9.TabIndex = 26;
+ //
+ // connectionStringTextBox9
+ //
+ this.connectionStringTextBox9.Location = new System.Drawing.Point(157, 237);
+ this.connectionStringTextBox9.Name = "connectionStringTextBox9";
+ this.connectionStringTextBox9.Size = new System.Drawing.Size(713, 20);
+ this.connectionStringTextBox9.TabIndex = 27;
+ //
+ // benchNameTextBox8
+ //
+ this.benchNameTextBox8.Location = new System.Drawing.Point(29, 213);
+ this.benchNameTextBox8.Name = "benchNameTextBox8";
+ this.benchNameTextBox8.Size = new System.Drawing.Size(100, 20);
+ this.benchNameTextBox8.TabIndex = 24;
+ //
+ // benchNameTextBox7
+ //
+ this.benchNameTextBox7.Location = new System.Drawing.Point(29, 189);
+ this.benchNameTextBox7.Name = "benchNameTextBox7";
+ this.benchNameTextBox7.Size = new System.Drawing.Size(100, 20);
+ this.benchNameTextBox7.TabIndex = 22;
+ //
+ // connectionStringTextBox8
+ //
+ this.connectionStringTextBox8.Location = new System.Drawing.Point(157, 213);
+ this.connectionStringTextBox8.Name = "connectionStringTextBox8";
+ this.connectionStringTextBox8.Size = new System.Drawing.Size(713, 20);
+ this.connectionStringTextBox8.TabIndex = 25;
+ //
+ // connectionStringTextBox7
+ //
+ this.connectionStringTextBox7.Location = new System.Drawing.Point(157, 189);
+ this.connectionStringTextBox7.Name = "connectionStringTextBox7";
+ this.connectionStringTextBox7.Size = new System.Drawing.Size(713, 20);
+ this.connectionStringTextBox7.TabIndex = 23;
+ //
// DatabaseSettingsDlg
//
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, 310);
+ this.ClientSize = new System.Drawing.Size(901, 382);
+ this.Controls.Add(this.benchNameTextBox9);
+ this.Controls.Add(this.connectionStringTextBox9);
+ this.Controls.Add(this.benchNameTextBox8);
+ this.Controls.Add(this.benchNameTextBox7);
+ this.Controls.Add(this.connectionStringTextBox8);
+ this.Controls.Add(this.connectionStringTextBox7);
this.Controls.Add(this.benchNameTextBox6);
this.Controls.Add(this.connectionStringTextBox6);
this.Controls.Add(this.benchNameTextBox5);
@@ -269,5 +323,11 @@
private System.Windows.Forms.TextBox connectionStringTextBox4;
private System.Windows.Forms.TextBox benchNameTextBox6;
private System.Windows.Forms.TextBox connectionStringTextBox6;
+ private System.Windows.Forms.TextBox benchNameTextBox9;
+ private System.Windows.Forms.TextBox connectionStringTextBox9;
+ private System.Windows.Forms.TextBox benchNameTextBox8;
+ private System.Windows.Forms.TextBox benchNameTextBox7;
+ private System.Windows.Forms.TextBox connectionStringTextBox8;
+ private System.Windows.Forms.TextBox connectionStringTextBox7;
}
}
\ No newline at end of file
diff --git a/ResultsBrowser/Forms/DatabaseSettingsDlg.cs b/ResultsBrowser/Forms/DatabaseSettingsDlg.cs
index f5def967a..bbabfacc4 100644
--- a/ResultsBrowser/Forms/DatabaseSettingsDlg.cs
+++ b/ResultsBrowser/Forms/DatabaseSettingsDlg.cs
@@ -21,6 +21,9 @@ namespace ResultsBrowser.Forms
benchNameTextBox4.Text = Program.LocalSettings.Bench4;
benchNameTextBox5.Text = Program.LocalSettings.Bench5;
benchNameTextBox6.Text = Program.LocalSettings.Bench6;
+ benchNameTextBox7.Text = Program.LocalSettings.Bench7;
+ benchNameTextBox8.Text = Program.LocalSettings.Bench8;
+ benchNameTextBox9.Text = Program.LocalSettings.Bench9;
connectionStringTextBox1.Text = Program.LocalSettings.ConnectionString1;
connectionStringTextBox2.Text = Program.LocalSettings.ConnectionString2;
@@ -28,6 +31,9 @@ namespace ResultsBrowser.Forms
connectionStringTextBox4.Text = Program.LocalSettings.ConnectionString4;
connectionStringTextBox5.Text = Program.LocalSettings.ConnectionString5;
connectionStringTextBox6.Text = Program.LocalSettings.ConnectionString6;
+ connectionStringTextBox7.Text = Program.LocalSettings.ConnectionString7;
+ connectionStringTextBox8.Text = Program.LocalSettings.ConnectionString8;
+ connectionStringTextBox9.Text = Program.LocalSettings.ConnectionString9;
timePeriodFormatTextBox.Text = Program.LocalSettings.TimePeriodFormat;
@@ -53,6 +59,9 @@ namespace ResultsBrowser.Forms
Program.LocalSettings.Bench4 = benchNameTextBox4.Text;
Program.LocalSettings.Bench5 = benchNameTextBox5.Text;
Program.LocalSettings.Bench6 = benchNameTextBox6.Text;
+ Program.LocalSettings.Bench7 = benchNameTextBox7.Text;
+ Program.LocalSettings.Bench8 = benchNameTextBox8.Text;
+ Program.LocalSettings.Bench9 = benchNameTextBox9.Text;
Program.LocalSettings.ConnectionString1 = connectionStringTextBox1.Text;
Program.LocalSettings.ConnectionString2 = connectionStringTextBox2.Text;
@@ -60,6 +69,9 @@ namespace ResultsBrowser.Forms
Program.LocalSettings.ConnectionString4 = connectionStringTextBox4.Text;
Program.LocalSettings.ConnectionString5 = connectionStringTextBox5.Text;
Program.LocalSettings.ConnectionString6 = connectionStringTextBox6.Text;
+ Program.LocalSettings.ConnectionString7 = connectionStringTextBox7.Text;
+ Program.LocalSettings.ConnectionString8 = connectionStringTextBox8.Text;
+ Program.LocalSettings.ConnectionString9 = connectionStringTextBox9.Text;
Program.LocalSettings.TimePeriodFormat = timePeriodFormatTextBox.Text;
diff --git a/ResultsBrowser/LocalSettings.cs b/ResultsBrowser/LocalSettings.cs
index bbe657959..8252560dd 100644
--- a/ResultsBrowser/LocalSettings.cs
+++ b/ResultsBrowser/LocalSettings.cs
@@ -30,6 +30,9 @@ namespace ResultsBrowser
public string Bench4;
public string Bench5;
public string Bench6;
+ public string Bench7;
+ public string Bench8;
+ public string Bench9;
/// Database settings of servers.
public string ConnectionString1;
@@ -38,6 +41,9 @@ namespace ResultsBrowser
public string ConnectionString4;
public string ConnectionString5;
public string ConnectionString6;
+ public string ConnectionString7;
+ public string ConnectionString8;
+ public string ConnectionString9;
public bool Bench1Selected;
public bool Bench2Selected;
@@ -45,6 +51,9 @@ namespace ResultsBrowser
public bool Bench4Selected;
public bool Bench5Selected;
public bool Bench6Selected;
+ public bool Bench7Selected;
+ public bool Bench8Selected;
+ public bool Bench9Selected;
public string TimePeriodFormat;
@@ -115,14 +124,16 @@ namespace ResultsBrowser
Bench3 = "WR13";
Bench4 = "WR14";
Bench5 = "WR15";
- Bench6 = "PT7";
- ConnectionString1 = "SERVER=10.42.130.69; DATABASE=st-wr10-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;";
- ConnectionString2 = "SERVER=10.42.129.27; DATABASE=st-wr11-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;";
- ConnectionString3 = "SERVER=10.42.128.61; DATABASE=st-wr13-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;";
- ConnectionString4 = "SERVER=10.42.130.72; DATABASE=st-wr14-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;";
- ConnectionString5 = "SERVER=10.42.130.71; DATABASE=st-wr15-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;";
- ConnectionString6 = "SERVER=10.42.129.26; DATABASE=iperlspecial-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;";
- Language = "SK";
+ Bench6 = "WR18";
+ Bench7 = "WR19";
+ ConnectionString1 = "SERVER=10.42.129.253; DATABASE=st-wr10-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;";
+ ConnectionString2 = "SERVER=10.42.129.27; DATABASE=st-wr11-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;";
+ ConnectionString3 = "SERVER=10.42.128.138; DATABASE=st-wr13-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;";
+ ConnectionString4 = "SERVER=10.42.128.146; DATABASE=st-wr14-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;";
+ ConnectionString5 = "SERVER=10.42.130.97; DATABASE=st-wr15-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;";
+ ConnectionString6 = "SERVER=10.42.130.165; DATABASE=st-wr18-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;";
+ ConnectionString7 = "SERVER=10.42.128.159; DATABASE=st-wr19-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;";
+ Language = "EN";
#endif
}
diff --git a/ResultsBrowser/Program.cs b/ResultsBrowser/Program.cs
index 321861847..96aac852c 100644
--- a/ResultsBrowser/Program.cs
+++ b/ResultsBrowser/Program.cs
@@ -42,7 +42,7 @@ namespace ResultsBrowser
/// Local program configuration directory including the trailing backslash
ExecutableDirectory = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
-#if false
+#if true
/// Config directory is a sibling directory of the executable directory
ConfigDirectory = Path.Combine(ExecutableDirectory, "..", string.Format("Cfg{0}", (args.Length >= 1) ? args[0] : string.Empty));
LogDirectory = Path.Combine(ExecutableDirectory, "..\\Log\\");
diff --git a/ResultsBrowser/ResultsBrowser.csproj b/ResultsBrowser/ResultsBrowser.csproj
index 8ac660f95..cf5048501 100644
--- a/ResultsBrowser/ResultsBrowser.csproj
+++ b/ResultsBrowser/ResultsBrowser.csproj
@@ -21,7 +21,7 @@
full
false
bin\Debug\
- TRACE;DEBUG;MANAGED;ORACLE_DB
+ TRACE;DEBUG;MANAGED;ORACLE_DB;TURA_IPERL
prompt
4
false