diff --git a/ResultsBrowser/Forms/ResultsConfig.Designer.cs b/ResultsBrowser/Forms/ResultsConfig.Designer.cs
deleted file mode 100644
index 165e74d07..000000000
--- a/ResultsBrowser/Forms/ResultsConfig.Designer.cs
+++ /dev/null
@@ -1,237 +0,0 @@
-///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
-///
-namespace ResultsBrowser.Forms
-{
- partial class ResultsConfig
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- this.okButton = new System.Windows.Forms.Button();
- this.cancelButton = new System.Windows.Forms.Button();
- this.availableResultsListBox = new System.Windows.Forms.ListBox();
- this.selectedResultsListBox = new System.Windows.Forms.ListBox();
- this.availableResultsLabel = new System.Windows.Forms.Label();
- this.selectedResultsLabel = new System.Windows.Forms.Label();
- this.removeAllButton = new System.Windows.Forms.Button();
- this.removeButton = new System.Windows.Forms.Button();
- this.addButton = new System.Windows.Forms.Button();
- this.unlockButton = new System.Windows.Forms.Button();
- this.singleRadioButton = new System.Windows.Forms.RadioButton();
- this.combinedRadioButton = new System.Windows.Forms.RadioButton();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.groupBox1.SuspendLayout();
- this.SuspendLayout();
- //
- // okButton
- //
- this.okButton.Location = new System.Drawing.Point(283, 57);
- this.okButton.Name = "okButton";
- this.okButton.Size = new System.Drawing.Size(104, 30);
- this.okButton.TabIndex = 4;
- this.okButton.Text = "Close";
- this.okButton.UseVisualStyleBackColor = true;
- this.okButton.Click += new System.EventHandler(this.okButton_Click);
- //
- // cancelButton
- //
- this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.cancelButton.Location = new System.Drawing.Point(283, 94);
- this.cancelButton.Name = "cancelButton";
- this.cancelButton.Size = new System.Drawing.Size(104, 30);
- this.cancelButton.TabIndex = 5;
- this.cancelButton.Text = "Cancel";
- this.cancelButton.UseVisualStyleBackColor = true;
- this.cancelButton.Visible = false;
- //
- // availableResultsListBox
- //
- this.availableResultsListBox.Enabled = false;
- this.availableResultsListBox.FormattingEnabled = true;
- this.availableResultsListBox.Location = new System.Drawing.Point(12, 162);
- this.availableResultsListBox.Name = "availableResultsListBox";
- this.availableResultsListBox.Size = new System.Drawing.Size(135, 186);
- this.availableResultsListBox.TabIndex = 6;
- this.availableResultsListBox.DoubleClick += new System.EventHandler(this.availableResultsListBox_DoubleClick);
- //
- // selectedResultsListBox
- //
- this.selectedResultsListBox.Enabled = false;
- this.selectedResultsListBox.FormattingEnabled = true;
- this.selectedResultsListBox.Location = new System.Drawing.Point(252, 162);
- this.selectedResultsListBox.Name = "selectedResultsListBox";
- this.selectedResultsListBox.Size = new System.Drawing.Size(135, 186);
- this.selectedResultsListBox.TabIndex = 7;
- this.selectedResultsListBox.DoubleClick += new System.EventHandler(this.selectedResultsListBox_DoubleClick);
- //
- // availableResultsLabel
- //
- this.availableResultsLabel.AutoSize = true;
- this.availableResultsLabel.Location = new System.Drawing.Point(12, 140);
- this.availableResultsLabel.Name = "availableResultsLabel";
- this.availableResultsLabel.Size = new System.Drawing.Size(86, 13);
- this.availableResultsLabel.TabIndex = 8;
- this.availableResultsLabel.Text = "Available results:";
- //
- // selectedResultsLabel
- //
- this.selectedResultsLabel.AutoSize = true;
- this.selectedResultsLabel.Location = new System.Drawing.Point(249, 140);
- this.selectedResultsLabel.Name = "selectedResultsLabel";
- this.selectedResultsLabel.Size = new System.Drawing.Size(85, 13);
- this.selectedResultsLabel.TabIndex = 9;
- this.selectedResultsLabel.Text = "Selected results:";
- //
- // removeAllButton
- //
- this.removeAllButton.Anchor = System.Windows.Forms.AnchorStyles.None;
- this.removeAllButton.Enabled = false;
- this.removeAllButton.Location = new System.Drawing.Point(153, 273);
- this.removeAllButton.Name = "removeAllButton";
- this.removeAllButton.Size = new System.Drawing.Size(94, 30);
- this.removeAllButton.TabIndex = 46;
- this.removeAllButton.Text = "<< R&emove all";
- this.removeAllButton.UseVisualStyleBackColor = true;
- this.removeAllButton.Click += new System.EventHandler(this.removeAllButton_Click);
- //
- // removeButton
- //
- this.removeButton.Anchor = System.Windows.Forms.AnchorStyles.None;
- this.removeButton.Enabled = false;
- this.removeButton.Location = new System.Drawing.Point(153, 238);
- this.removeButton.Name = "removeButton";
- this.removeButton.Size = new System.Drawing.Size(93, 30);
- this.removeButton.TabIndex = 45;
- this.removeButton.Text = "< &Remove";
- this.removeButton.UseVisualStyleBackColor = true;
- this.removeButton.Click += new System.EventHandler(this.removeButton_Click);
- //
- // addButton
- //
- this.addButton.Anchor = System.Windows.Forms.AnchorStyles.None;
- this.addButton.Enabled = false;
- this.addButton.Location = new System.Drawing.Point(153, 203);
- this.addButton.Name = "addButton";
- this.addButton.Size = new System.Drawing.Size(93, 30);
- this.addButton.TabIndex = 44;
- this.addButton.Text = "&Add >";
- this.addButton.UseVisualStyleBackColor = true;
- this.addButton.Click += new System.EventHandler(this.addButton_Click);
- //
- // unlockButton
- //
- this.unlockButton.Location = new System.Drawing.Point(283, 21);
- this.unlockButton.Name = "unlockButton";
- this.unlockButton.Size = new System.Drawing.Size(104, 30);
- this.unlockButton.TabIndex = 47;
- this.unlockButton.Text = "Unlock";
- this.unlockButton.UseVisualStyleBackColor = true;
- this.unlockButton.Click += new System.EventHandler(this.unlockButton_Click);
- //
- // singleRadioButton
- //
- this.singleRadioButton.Appearance = System.Windows.Forms.Appearance.Button;
- this.singleRadioButton.AutoSize = true;
- this.singleRadioButton.Checked = true;
- this.singleRadioButton.Location = new System.Drawing.Point(19, 24);
- this.singleRadioButton.Name = "singleRadioButton";
- this.singleRadioButton.Size = new System.Drawing.Size(46, 23);
- this.singleRadioButton.TabIndex = 48;
- this.singleRadioButton.TabStop = true;
- this.singleRadioButton.Text = "Single";
- this.singleRadioButton.UseVisualStyleBackColor = true;
- this.singleRadioButton.CheckedChanged += new System.EventHandler(this.singleRadioButton_CheckedChanged);
- //
- // combinedRadioButton
- //
- this.combinedRadioButton.Appearance = System.Windows.Forms.Appearance.Button;
- this.combinedRadioButton.AutoSize = true;
- this.combinedRadioButton.Location = new System.Drawing.Point(71, 24);
- this.combinedRadioButton.Name = "combinedRadioButton";
- this.combinedRadioButton.Size = new System.Drawing.Size(64, 23);
- this.combinedRadioButton.TabIndex = 49;
- this.combinedRadioButton.Text = "Combined";
- this.combinedRadioButton.UseVisualStyleBackColor = true;
- this.combinedRadioButton.CheckedChanged += new System.EventHandler(this.combinedRadioButton_CheckedChanged);
- //
- // groupBox1
- //
- this.groupBox1.Controls.Add(this.combinedRadioButton);
- this.groupBox1.Controls.Add(this.singleRadioButton);
- this.groupBox1.Location = new System.Drawing.Point(12, 21);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(153, 60);
- this.groupBox1.TabIndex = 52;
- this.groupBox1.TabStop = false;
- this.groupBox1.Text = "Water Meter";
- //
- // ResultsConfig
- //
- 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(399, 358);
- this.Controls.Add(this.groupBox1);
- this.Controls.Add(this.unlockButton);
- this.Controls.Add(this.removeAllButton);
- this.Controls.Add(this.removeButton);
- this.Controls.Add(this.addButton);
- this.Controls.Add(this.selectedResultsLabel);
- this.Controls.Add(this.availableResultsLabel);
- this.Controls.Add(this.selectedResultsListBox);
- this.Controls.Add(this.availableResultsListBox);
- this.Controls.Add(this.cancelButton);
- this.Controls.Add(this.okButton);
- this.Name = "ResultsConfig";
- this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "ResultsConfig";
- this.Load += new System.EventHandler(this.ResultsConfig_Load);
- this.groupBox1.ResumeLayout(false);
- this.groupBox1.PerformLayout();
- this.ResumeLayout(false);
- this.PerformLayout();
-
- }
-
- #endregion
-
- private System.Windows.Forms.Button okButton;
- private System.Windows.Forms.Button cancelButton;
- private System.Windows.Forms.ListBox availableResultsListBox;
- private System.Windows.Forms.ListBox selectedResultsListBox;
- private System.Windows.Forms.Label availableResultsLabel;
- private System.Windows.Forms.Label selectedResultsLabel;
- private System.Windows.Forms.Button removeAllButton;
- private System.Windows.Forms.Button removeButton;
- private System.Windows.Forms.Button addButton;
- private System.Windows.Forms.Button unlockButton;
- private System.Windows.Forms.RadioButton singleRadioButton;
- private System.Windows.Forms.RadioButton combinedRadioButton;
- private System.Windows.Forms.GroupBox groupBox1;
- }
-}
\ No newline at end of file
diff --git a/ResultsBrowser/Forms/ResultsConfig.cs b/ResultsBrowser/Forms/ResultsConfig.cs
deleted file mode 100644
index b56f07523..000000000
--- a/ResultsBrowser/Forms/ResultsConfig.cs
+++ /dev/null
@@ -1,219 +0,0 @@
-///
-/// Copyright (c) 2015 Sensus Metering Systems
-///
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-using Results.Entities;
-using ResultsBrowser.Resources;
-
-namespace ResultsBrowser.Forms
-{
- public partial class ResultsConfig : Form
- {
- ///
- /// Required access rights to make changes with this form
- ///
- const Users.Grp.GID RequiredGroupMembership = Users.Grp.GID.Metrologists;
- public Config.Entities.TestsArrangement TestsArrangement;
- public Config.Entities.MetersArrangement MetersArrangement;
- public int NrMetersInOneGroup;
-
- public IList currentlyAvailableItems;
- public IList ReportItems_Single;
- public IList ReportItems_Compound;
-
- bool combined; /// false = single meter items, true = combined meter items
- Config.Entities.Device device; /// Screen, Printer or Disk
- bool unlocked; /// true = changes enabled
-
- public ResultsConfig(bool combined)
- {
- InitializeComponent();
-
- this.combined = combined;
- device = Config.Entities.Device.Screen;
- unlocked = false;
- cancelButton.Visible = false;
- }
-
- void Localize()
- {
- Text = Strings.Configuration;
- groupBox1.Text = Strings.Water_Meter;
- singleRadioButton.Text = Strings.SingleBtnText;
- combinedRadioButton.Text = Strings.CombinedBtnText;
- availableResultsLabel.Text = Strings.Available_results;
- selectedResultsLabel.Text = Strings.Selected_results;
- addButton.Text = Strings.Add;
- removeButton.Text = Strings.Remove;
- removeAllButton.Text = Strings.Remove_all;
- unlockButton.Text = Strings.UnlockBtnText;
- okButton.Text = Strings.CloseBtnText;
- cancelButton.Text = Strings.CancelBtnText;
- }
-
- void ResultsConfig_Load(object sender, EventArgs e)
- {
- Localize();
-
- singleRadioButton.Checked = !combined;
- combinedRadioButton.Checked = combined;
-
- RedrawAvailable();
- RedrawSelected();
- }
-
- ///
- /// Gets the list of selected items based on watermeter type and device selections
- ///
- /// List of selected result items
- IList GetSelectedItems()
- {
- if (combined)
- {
- return ReportItems_Compound;
- }
- else
- {
- return ReportItems_Single;
- }
- }
-
- ///
- /// Redraw selected items (right hand side)
- ///
- void RedrawAvailable()
- {
- availableResultsListBox.Items.Clear();
- currentlyAvailableItems = new List();
- foreach (var item in Results.ItemSpec.AllItems)
- {
- if (!GetSelectedItems().Contains(item) && (combined ? item.CanPrintCompoundMeter : item.CanPrintSingle))
- {
- currentlyAvailableItems.Add(item);
- availableResultsListBox.Items.Add(item.Name);
- }
- }
- }
-
- ///
- /// Redraw selected items (right hand side)
- ///
- void RedrawSelected()
- {
- selectedResultsListBox.Items.Clear();
- foreach (var item in GetSelectedItems())
- {
- selectedResultsListBox.Items.Add(item.Name);
- }
- }
-
- void unlockButton_Click(object sender, EventArgs e)
- {
- if (!unlocked)
- {
- //if (!User.CurrentUser.IsMemberOf(RequiredGroupMembership))
- //{
- // if ((new LoginDlg(RequiredGroupMembership)).ShowDialog() != DialogResult.OK) return;
- //}
-
- unlocked = true;
-
- ///
- /// Unlock user interface controls
- ///
- unlockButton.Enabled = false;
- okButton.Text = Strings.OkBtnText;
- cancelButton.Visible = true;
- availableResultsListBox.Enabled = true;
- selectedResultsListBox.Enabled = true;
- addButton.Enabled = true;
- removeButton.Enabled = true;
- removeAllButton.Enabled = true;
- }
- }
-
- void okButton_Click(object sender, EventArgs e)
- {
- DialogResult = DialogResult.OK;
- Close();
- }
-
- void availableResultsListBox_DoubleClick(object sender, EventArgs e)
- {
- /// Double click works when just one item is selected
- IList itemsToRemove = new List();
- if (availableResultsListBox.SelectedIndices.Count == 1)
- {
- var item = currentlyAvailableItems[availableResultsListBox.SelectedIndices[0]];
- GetSelectedItems().Add(item);
- RedrawAvailable();
- RedrawSelected();
- }
- }
-
- void addButton_Click(object sender, EventArgs e)
- {
- /// Append at the end, this code supports multiple selected items,
- /// although ListBox control settings may limit the max.number of selected items to one.
-
- for (int i = availableResultsListBox.SelectedIndices.Count - 1; i >= 0; i--)
- {
- var item = currentlyAvailableItems[availableResultsListBox.SelectedIndices[i]];
- GetSelectedItems().Add(item);
- }
- RedrawAvailable();
- RedrawSelected();
- }
-
- private void selectedResultsListBox_DoubleClick(object sender, EventArgs e)
- {
- /// Double click works when just one item is selected
-
- if (selectedResultsListBox.SelectedIndices.Count == 1)
- {
- GetSelectedItems().RemoveAt(selectedResultsListBox.SelectedIndices[0]);
- RedrawAvailable();
- RedrawSelected();
- }
- }
-
- void removeButton_Click(object sender, EventArgs e)
- {
- /// Remove from the list (the last selected item first so that the indexes are not affected)
-
- for (int i = selectedResultsListBox.SelectedIndices.Count - 1; i >= 0; i--)
- {
- GetSelectedItems().RemoveAt(selectedResultsListBox.SelectedIndices[i]);
- }
- RedrawAvailable();
- RedrawSelected();
- }
-
- void removeAllButton_Click(object sender, EventArgs e)
- {
- /// Remove all items from 'Selected' list
-
- GetSelectedItems().Clear();
- RedrawAvailable();
- RedrawSelected();
- }
-
- private void singleRadioButton_CheckedChanged(object sender, EventArgs e)
- {
- }
-
- private void combinedRadioButton_CheckedChanged(object sender, EventArgs e)
- {
- combined = combinedRadioButton.Checked;
- RedrawAvailable();
- RedrawSelected();
- }
- }
-}
diff --git a/ResultsBrowser/Forms/ResultsConfig.resx b/ResultsBrowser/Forms/ResultsConfig.resx
deleted file mode 100644
index 1af7de150..000000000
--- a/ResultsBrowser/Forms/ResultsConfig.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/ResultsBrowser.csproj b/ResultsBrowser/ResultsBrowser.csproj
index cb844d5b6..1431a07a4 100644
--- a/ResultsBrowser/ResultsBrowser.csproj
+++ b/ResultsBrowser/ResultsBrowser.csproj
@@ -125,12 +125,6 @@
NoBenchOrDatabaseDlg.cs
-
- Form
-
-
- ResultsConfig.cs
-
Form
@@ -188,9 +182,6 @@
NoBenchOrDatabaseDlg.cs
-
- ResultsConfig.cs
-
StatisticsDlg.cs
diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index 6d5cdbb8f..3e890bbfa 100644
--- a/TBF/Properties/AssemblyInfo.cs
+++ b/TBF/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
-[assembly: AssemblyVersion("2.18.811.0")]
-[assembly: AssemblyFileVersion("2.18.811.0")]
+[assembly: AssemblyVersion("2.18.812.0")]
+[assembly: AssemblyFileVersion("2.18.812.0")]
diff --git a/TBF/Resources/Strings.pl.resx b/TBF/Resources/Strings.pl.resx
index 070f4bffd..35d04d25a 100644
--- a/TBF/Resources/Strings.pl.resx
+++ b/TBF/Resources/Strings.pl.resx
@@ -1629,4 +1629,7 @@
Korekta
+
+ Uruchom stanowisko pomiarowe
+
\ No newline at end of file