diff --git a/ResultsBrowser/Properties/AssemblyInfo.cs b/ResultsBrowser/Properties/AssemblyInfo.cs index 9077b9805..b7ef64159 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("2.18.995.0")] -[assembly: AssemblyFileVersion("2.18.995.0")] +[assembly: AssemblyVersion("2.18.1096.0")] +[assembly: AssemblyFileVersion("2.18.1096.0")] diff --git a/TBF/Resources/Strings.Designer.cs b/TBF/Resources/Strings.Designer.cs index 961ee1b2b..dd349c3b7 100644 --- a/TBF/Resources/Strings.Designer.cs +++ b/TBF/Resources/Strings.Designer.cs @@ -3633,6 +3633,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Reload previous results. + /// + internal static string Reload_previous_results { + get { + return ResourceManager.GetString("Reload_previous_results", resourceCulture); + } + } + /// /// Looks up a localized string similar to remaining time. /// diff --git a/TBF/Resources/Strings.de.resx b/TBF/Resources/Strings.de.resx index 4a45c6cb7..b4c216326 100644 --- a/TBF/Resources/Strings.de.resx +++ b/TBF/Resources/Strings.de.resx @@ -1449,4 +1449,7 @@ Drucken Sie OK, wenn Sie fertig sind. + + Vorherige Ergebnisse Herunterladen + \ No newline at end of file diff --git a/TBF/Resources/Strings.resx b/TBF/Resources/Strings.resx index 682ed396e..f7a52ea38 100644 --- a/TBF/Resources/Strings.resx +++ b/TBF/Resources/Strings.resx @@ -1909,4 +1909,7 @@ Error saving parameters of {0} + + Reload previous results + \ No newline at end of file diff --git a/TBF/Screens/ResultsTabPageCtrl.Designer.cs b/TBF/Screens/ResultsTabPageCtrl.Designer.cs index f9813ec82..87f2f65bb 100644 --- a/TBF/Screens/ResultsTabPageCtrl.Designer.cs +++ b/TBF/Screens/ResultsTabPageCtrl.Designer.cs @@ -31,108 +31,108 @@ namespace TBF.Screens /// private void InitializeComponent() { - this.splitContainer = new System.Windows.Forms.SplitContainer(); - this.reloadPreviousResultsButton = new System.Windows.Forms.Button(); - this.columnWidthsButton = new System.Windows.Forms.Button(); - this.showPreviousResultsButton = new System.Windows.Forms.Button(); - this.configureButton = new System.Windows.Forms.Button(); - this.flowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel(); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); - this.splitContainer.Panel1.SuspendLayout(); - this.splitContainer.Panel2.SuspendLayout(); - this.splitContainer.SuspendLayout(); - this.SuspendLayout(); - // - // splitContainer - // - this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; - this.splitContainer.IsSplitterFixed = true; - this.splitContainer.Location = new System.Drawing.Point(0, 0); - this.splitContainer.Name = "splitContainer"; - this.splitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal; - // - // splitContainer.Panel1 - // - this.splitContainer.Panel1.BackColor = System.Drawing.SystemColors.Control; - this.splitContainer.Panel1.Controls.Add(this.reloadPreviousResultsButton); - this.splitContainer.Panel1.Controls.Add(this.columnWidthsButton); - this.splitContainer.Panel1.Controls.Add(this.showPreviousResultsButton); - this.splitContainer.Panel1.Controls.Add(this.configureButton); - // - // splitContainer.Panel2 - // - this.splitContainer.Panel2.Controls.Add(this.flowLayoutPanel); - this.splitContainer.Size = new System.Drawing.Size(1057, 706); - this.splitContainer.SplitterDistance = 42; - this.splitContainer.TabIndex = 0; - // - // reloadPreviousResultsButton - // - this.reloadPreviousResultsButton.Enabled = false; - this.reloadPreviousResultsButton.Location = new System.Drawing.Point(405, 10); - this.reloadPreviousResultsButton.Name = "reloadPreviousResultsButton"; - this.reloadPreviousResultsButton.Size = new System.Drawing.Size(147, 30); - this.reloadPreviousResultsButton.TabIndex = 3; - this.reloadPreviousResultsButton.Text = "Reload previous results"; - this.reloadPreviousResultsButton.UseVisualStyleBackColor = true; - this.reloadPreviousResultsButton.Click += new System.EventHandler(this.reloadPreviousResultsButton_Click); - // - // columnWidthsButton - // - this.columnWidthsButton.Location = new System.Drawing.Point(126, 10); - this.columnWidthsButton.Name = "columnWidthsButton"; - this.columnWidthsButton.Size = new System.Drawing.Size(120, 30); - this.columnWidthsButton.TabIndex = 1; - this.columnWidthsButton.Text = "Save column widths"; - this.columnWidthsButton.UseVisualStyleBackColor = true; - this.columnWidthsButton.Click += new System.EventHandler(this.columnWidthsButton_Click); - // - // showPreviousResultsButton - // - this.showPreviousResultsButton.Location = new System.Drawing.Point(252, 10); - this.showPreviousResultsButton.Name = "showPreviousResultsButton"; - this.showPreviousResultsButton.Size = new System.Drawing.Size(147, 30); - this.showPreviousResultsButton.TabIndex = 2; - this.showPreviousResultsButton.Text = "Show previous results"; - this.showPreviousResultsButton.UseVisualStyleBackColor = true; - this.showPreviousResultsButton.Click += new System.EventHandler(this.showPreviousResultsButton_Click); - // - // configureButton - // - this.configureButton.Location = new System.Drawing.Point(20, 10); - this.configureButton.Name = "configureButton"; - this.configureButton.Size = new System.Drawing.Size(100, 30); - this.configureButton.TabIndex = 0; - this.configureButton.Text = "Configure"; - this.configureButton.UseVisualStyleBackColor = true; - this.configureButton.Click += new System.EventHandler(this.configureButton_Click); - // - // flowLayoutPanel - // - this.flowLayoutPanel.AutoScroll = true; - this.flowLayoutPanel.BackColor = System.Drawing.SystemColors.Control; - this.flowLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.flowLayoutPanel.Location = new System.Drawing.Point(0, 0); - this.flowLayoutPanel.Name = "flowLayoutPanel"; - this.flowLayoutPanel.Size = new System.Drawing.Size(1057, 660); - this.flowLayoutPanel.TabIndex = 0; - // - // ResultsTabPageCtrl - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.Silver; - this.Controls.Add(this.splitContainer); - this.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.Name = "ResultsTabPageCtrl"; - this.Size = new System.Drawing.Size(1057, 706); - this.Load += new System.EventHandler(this.ResultsTabPageCtrl_Load); - this.splitContainer.Panel1.ResumeLayout(false); - this.splitContainer.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit(); - this.splitContainer.ResumeLayout(false); - this.ResumeLayout(false); + this.splitContainer = new System.Windows.Forms.SplitContainer(); + this.reloadPreviousResultsButton = new System.Windows.Forms.Button(); + this.columnWidthsButton = new System.Windows.Forms.Button(); + this.showPreviousResultsButton = new System.Windows.Forms.Button(); + this.configureButton = new System.Windows.Forms.Button(); + this.flowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); + this.splitContainer.Panel1.SuspendLayout(); + this.splitContainer.Panel2.SuspendLayout(); + this.splitContainer.SuspendLayout(); + this.SuspendLayout(); + // + // splitContainer + // + this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer.IsSplitterFixed = true; + this.splitContainer.Location = new System.Drawing.Point(0, 0); + this.splitContainer.Name = "splitContainer"; + this.splitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer.Panel1 + // + this.splitContainer.Panel1.BackColor = System.Drawing.SystemColors.Control; + this.splitContainer.Panel1.Controls.Add(this.reloadPreviousResultsButton); + this.splitContainer.Panel1.Controls.Add(this.columnWidthsButton); + this.splitContainer.Panel1.Controls.Add(this.showPreviousResultsButton); + this.splitContainer.Panel1.Controls.Add(this.configureButton); + // + // splitContainer.Panel2 + // + this.splitContainer.Panel2.Controls.Add(this.flowLayoutPanel); + this.splitContainer.Size = new System.Drawing.Size(1057, 706); + this.splitContainer.SplitterDistance = 42; + this.splitContainer.TabIndex = 0; + // + // reloadPreviousResultsButton + // + this.reloadPreviousResultsButton.Enabled = false; + this.reloadPreviousResultsButton.Location = new System.Drawing.Point(405, 10); + this.reloadPreviousResultsButton.Name = "reloadPreviousResultsButton"; + this.reloadPreviousResultsButton.Size = new System.Drawing.Size(185, 30); + this.reloadPreviousResultsButton.TabIndex = 3; + this.reloadPreviousResultsButton.Text = "Reload previous results"; + this.reloadPreviousResultsButton.UseVisualStyleBackColor = true; + this.reloadPreviousResultsButton.Click += new System.EventHandler(this.reloadPreviousResultsButton_Click); + // + // columnWidthsButton + // + this.columnWidthsButton.Location = new System.Drawing.Point(126, 10); + this.columnWidthsButton.Name = "columnWidthsButton"; + this.columnWidthsButton.Size = new System.Drawing.Size(120, 30); + this.columnWidthsButton.TabIndex = 1; + this.columnWidthsButton.Text = "Save column widths"; + this.columnWidthsButton.UseVisualStyleBackColor = true; + this.columnWidthsButton.Click += new System.EventHandler(this.columnWidthsButton_Click); + // + // showPreviousResultsButton + // + this.showPreviousResultsButton.Location = new System.Drawing.Point(252, 10); + this.showPreviousResultsButton.Name = "showPreviousResultsButton"; + this.showPreviousResultsButton.Size = new System.Drawing.Size(147, 30); + this.showPreviousResultsButton.TabIndex = 2; + this.showPreviousResultsButton.Text = "Show previous results"; + this.showPreviousResultsButton.UseVisualStyleBackColor = true; + this.showPreviousResultsButton.Click += new System.EventHandler(this.showPreviousResultsButton_Click); + // + // configureButton + // + this.configureButton.Location = new System.Drawing.Point(20, 10); + this.configureButton.Name = "configureButton"; + this.configureButton.Size = new System.Drawing.Size(100, 30); + this.configureButton.TabIndex = 0; + this.configureButton.Text = "Configure"; + this.configureButton.UseVisualStyleBackColor = true; + this.configureButton.Click += new System.EventHandler(this.configureButton_Click); + // + // flowLayoutPanel + // + this.flowLayoutPanel.AutoScroll = true; + this.flowLayoutPanel.BackColor = System.Drawing.SystemColors.Control; + this.flowLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.flowLayoutPanel.Location = new System.Drawing.Point(0, 0); + this.flowLayoutPanel.Name = "flowLayoutPanel"; + this.flowLayoutPanel.Size = new System.Drawing.Size(1057, 660); + this.flowLayoutPanel.TabIndex = 0; + // + // ResultsTabPageCtrl + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.Silver; + this.Controls.Add(this.splitContainer); + this.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.Name = "ResultsTabPageCtrl"; + this.Size = new System.Drawing.Size(1057, 706); + this.Load += new System.EventHandler(this.ResultsTabPageCtrl_Load); + this.splitContainer.Panel1.ResumeLayout(false); + this.splitContainer.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit(); + this.splitContainer.ResumeLayout(false); + this.ResumeLayout(false); } diff --git a/TBF/Screens/ResultsTabPageCtrl.cs b/TBF/Screens/ResultsTabPageCtrl.cs index c5fa023cb..d29c75616 100644 --- a/TBF/Screens/ResultsTabPageCtrl.cs +++ b/TBF/Screens/ResultsTabPageCtrl.cs @@ -42,10 +42,6 @@ namespace TBF.Screens { InitializeComponent(); -#if MUNICH - reloadPreviousResultsButton.Visible = false; -#endif - if (Program.LocalSettings != null) { MetersArrangement = Program.LocalSettings.ResultsConfigMeters; @@ -104,6 +100,7 @@ namespace TBF.Screens configureButton.Text = Strings.Configure; columnWidthsButton.Text = Strings.Save_column_widths; showPreviousResultsButton.Text = Strings.Previous_results; + reloadPreviousResultsButton.Text = Strings.Reload_previous_results; RedrawAll(TBF.BenchControl.Sequences.ProcessData.BatchRslts); }