From 77555aeebfa44c557a3bad554473e54bf72ea552 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Wed, 15 Mar 2017 12:56:53 +0100 Subject: [PATCH] 'EditUsers', 'EditSelectedUser' and 'LoginDlg' moved to 'Users' library --- TestBenchFramework/Forms/ResultsConfig.cs | 8 +- TestBenchFramework/MainWnd.Designer.cs | 1106 ++++++++--------- TestBenchFramework/MainWnd.cs | 2 +- TestBenchFramework/MainWnd.resx | 880 +++++-------- TestBenchFramework/Program.cs | 4 +- TestBenchFramework/Resources/Strings.cs.resx | 15 - TestBenchFramework/Resources/Strings.de.resx | 24 - TestBenchFramework/Resources/Strings.pl.resx | 18 - TestBenchFramework/Resources/Strings.ru.resx | 18 - .../Resources/Strings.zh-CN.resx | 18 - TestBenchFramework/TBF.csproj | 27 - .../UiControls/SharedButtons.cs | 10 +- .../Forms/EditSelectedUser.Designer.cs | 4 +- .../Forms/EditSelectedUser.cs | 13 +- .../Forms/EditSelectedUser.resx | 0 .../Forms/EditUsers.Designer.cs | 4 +- .../Forms/EditUsers.cs | 6 +- .../Forms/EditUsers.resx | 0 .../Forms/LoginDlg.Designer.cs | 4 +- .../Forms/LoginDlg.cs | 11 +- .../Forms/LoginDlg.resx | 0 Users/Resources/Strings.Designer.cs | 261 ++++ Users/Resources/Strings.cs.resx | 186 +++ Users/Resources/Strings.de.resx | 186 +++ Users/Resources/Strings.pl.resx | 186 +++ Users/Resources/Strings.resx | 186 +++ Users/Resources/Strings.ru.resx | 186 +++ Users/Resources/Strings.zh-CN.resx | 186 +++ Users/Users.csproj | 45 + 29 files changed, 2351 insertions(+), 1243 deletions(-) rename {TestBenchFramework => Users}/Forms/EditSelectedUser.Designer.cs (98%) rename {TestBenchFramework => Users}/Forms/EditSelectedUser.cs (95%) rename {TestBenchFramework => Users}/Forms/EditSelectedUser.resx (100%) rename {TestBenchFramework => Users}/Forms/EditUsers.Designer.cs (98%) rename {TestBenchFramework => Users}/Forms/EditUsers.cs (97%) rename {TestBenchFramework => Users}/Forms/EditUsers.resx (100%) rename {TestBenchFramework => Users}/Forms/LoginDlg.Designer.cs (98%) rename {TestBenchFramework => Users}/Forms/LoginDlg.cs (95%) rename {TestBenchFramework => Users}/Forms/LoginDlg.resx (100%) create mode 100644 Users/Resources/Strings.Designer.cs create mode 100644 Users/Resources/Strings.cs.resx create mode 100644 Users/Resources/Strings.de.resx create mode 100644 Users/Resources/Strings.pl.resx create mode 100644 Users/Resources/Strings.resx create mode 100644 Users/Resources/Strings.ru.resx create mode 100644 Users/Resources/Strings.zh-CN.resx diff --git a/TestBenchFramework/Forms/ResultsConfig.cs b/TestBenchFramework/Forms/ResultsConfig.cs index b530fdff8..cacd9c845 100644 --- a/TestBenchFramework/Forms/ResultsConfig.cs +++ b/TestBenchFramework/Forms/ResultsConfig.cs @@ -165,13 +165,17 @@ namespace TBF.Forms { if (!Config.Data.CurrentUser.IsMemberOf(RequiredGroupMembership)) { - if ((new LoginDlg(RequiredGroupMembership)).ShowDialog() != DialogResult.OK) return; + if ((new Users.Forms.LoginDlg(RequiredGroupMembership)).ShowDialog() != DialogResult.OK) + return; } else if (Program.LocalSettings.AlwaysAskPasswdWhenUnlocking) { - if ((new LoginDlg(Config.Data.CurrentUser.UserName, RequiredGroupMembership)).ShowDialog() != DialogResult.OK) return; + if ((new Users.Forms.LoginDlg(Config.Data.CurrentUser.UserName, RequiredGroupMembership)).ShowDialog() != DialogResult.OK) + return; } + if (Program.MainWnd != null) Program.MainWnd.UpdateUser(); + unlocked = true; /// diff --git a/TestBenchFramework/MainWnd.Designer.cs b/TestBenchFramework/MainWnd.Designer.cs index 8410ec96d..aaf33f5c1 100644 --- a/TestBenchFramework/MainWnd.Designer.cs +++ b/TestBenchFramework/MainWnd.Designer.cs @@ -37,488 +37,494 @@ namespace TBF /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainWnd)); - this.topVerticalSplitContainer = new System.Windows.Forms.SplitContainer(); - this.activityGroupBox = new System.Windows.Forms.GroupBox(); - this.messageLabel = new System.Windows.Forms.Label(); - this.activityLabel = new System.Windows.Forms.Label(); - this.topHorizontalSplitContainer = new System.Windows.Forms.SplitContainer(); - this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.procedureGroupBox = new System.Windows.Forms.GroupBox(); - this.procedureComboBox = new System.Windows.Forms.ComboBox(); - this.progressGroupBox = new System.Windows.Forms.GroupBox(); - this.mainProgressBar = new System.Windows.Forms.ProgressBar(); - this.descriptionGroupBox = new System.Windows.Forms.GroupBox(); - this.descriptionLabel = new System.Windows.Forms.Label(); - this.verticalSplitContainer = new System.Windows.Forms.SplitContainer(); - this.horizontalSplitContainer = new System.Windows.Forms.SplitContainer(); - this.mainTabControl = new System.Windows.Forms.TabControl(); - this.homeTabPage = new System.Windows.Forms.TabPage(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainWnd)); + this.topVerticalSplitContainer = new System.Windows.Forms.SplitContainer(); + this.activityGroupBox = new System.Windows.Forms.GroupBox(); + this.messageLabel = new System.Windows.Forms.Label(); + this.activityLabel = new System.Windows.Forms.Label(); + this.topHorizontalSplitContainer = new System.Windows.Forms.SplitContainer(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.procedureGroupBox = new System.Windows.Forms.GroupBox(); + this.procedureComboBox = new System.Windows.Forms.ComboBox(); + this.progressGroupBox = new System.Windows.Forms.GroupBox(); + this.mainProgressBar = new System.Windows.Forms.ProgressBar(); + this.descriptionGroupBox = new System.Windows.Forms.GroupBox(); + this.descriptionLabel = new System.Windows.Forms.Label(); + this.verticalSplitContainer = new System.Windows.Forms.SplitContainer(); + this.horizontalSplitContainer = new System.Windows.Forms.SplitContainer(); + this.mainTabControl = new System.Windows.Forms.TabControl(); + this.homeTabPage = new System.Windows.Forms.TabPage(); this.ctrlBrdComponent = new ControlComponent3Munich.UserControl1(); - this.processTabPage = new System.Windows.Forms.TabPage(); + this.processTabPage = new System.Windows.Forms.TabPage(); this.processTabPageCtrl = new TBF.Screens.ProcessTabPageCtrl6(); - this.insertTabPage = new System.Windows.Forms.TabPage(); - this.resultsTabPage = new System.Windows.Forms.TabPage(); - this.resultsTabPageCtrl = new TBF.Screens.ResultsTabPageCtrl(); - this.logsTabPage = new System.Windows.Forms.TabPage(); - this.logsTabPageCtrl = new TBF.Screens.LogsTabPageCtrl(); - this.picturesTabPage = new System.Windows.Forms.TabPage(); - this.picturesTabPageCtrl1 = new TBF.Screens.PicturesTabPageCtrl(); - this.rightHorizSplitContainer = new System.Windows.Forms.SplitContainer(); - this.progressFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel(); - this.measurementTabPage = new System.Windows.Forms.TabPage(); - this.MeasurementTabPageCtrl = new TBF.Screens.MeasurementTabPageCtrl(); - this.statusStrip1 = new System.Windows.Forms.StatusStrip(); - this.userInfoStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.statusPStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.routeStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.activityStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.benchTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.benchComponentsTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.benchPathsTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.benchTransitionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.benchMetrologyTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.homeTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.resultsTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.logsTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.editTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.usersTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.localSettingsTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.databaseSettingsTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.passwortToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.helpTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.aboutTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.mainMenuStrip = new System.Windows.Forms.MenuStrip(); - this.proceduresToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.processToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.resultsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.printToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.upgradeTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - ((System.ComponentModel.ISupportInitialize)(this.topVerticalSplitContainer)).BeginInit(); - this.topVerticalSplitContainer.Panel1.SuspendLayout(); - this.topVerticalSplitContainer.Panel2.SuspendLayout(); - this.topVerticalSplitContainer.SuspendLayout(); - this.activityGroupBox.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.topHorizontalSplitContainer)).BeginInit(); - this.topHorizontalSplitContainer.Panel1.SuspendLayout(); - this.topHorizontalSplitContainer.Panel2.SuspendLayout(); - this.topHorizontalSplitContainer.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); - this.splitContainer1.Panel1.SuspendLayout(); - this.splitContainer1.Panel2.SuspendLayout(); - this.splitContainer1.SuspendLayout(); - this.procedureGroupBox.SuspendLayout(); - this.progressGroupBox.SuspendLayout(); - this.descriptionGroupBox.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.verticalSplitContainer)).BeginInit(); - this.verticalSplitContainer.Panel1.SuspendLayout(); - this.verticalSplitContainer.Panel2.SuspendLayout(); - this.verticalSplitContainer.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.horizontalSplitContainer)).BeginInit(); - this.horizontalSplitContainer.Panel1.SuspendLayout(); - this.horizontalSplitContainer.Panel2.SuspendLayout(); - this.horizontalSplitContainer.SuspendLayout(); - this.mainTabControl.SuspendLayout(); - this.homeTabPage.SuspendLayout(); - this.processTabPage.SuspendLayout(); - this.resultsTabPage.SuspendLayout(); - this.logsTabPage.SuspendLayout(); - this.picturesTabPage.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.rightHorizSplitContainer)).BeginInit(); - this.rightHorizSplitContainer.Panel1.SuspendLayout(); - this.rightHorizSplitContainer.SuspendLayout(); - this.measurementTabPage.SuspendLayout(); - this.statusStrip1.SuspendLayout(); - this.mainMenuStrip.SuspendLayout(); - this.SuspendLayout(); - // - // topVerticalSplitContainer - // - resources.ApplyResources(this.topVerticalSplitContainer, "topVerticalSplitContainer"); - this.topVerticalSplitContainer.Name = "topVerticalSplitContainer"; - // - // topVerticalSplitContainer.Panel1 - // - this.topVerticalSplitContainer.Panel1.Controls.Add(this.activityGroupBox); - resources.ApplyResources(this.topVerticalSplitContainer.Panel1, "topVerticalSplitContainer.Panel1"); - // - // topVerticalSplitContainer.Panel2 - // - this.topVerticalSplitContainer.Panel2.Controls.Add(this.topHorizontalSplitContainer); - resources.ApplyResources(this.topVerticalSplitContainer.Panel2, "topVerticalSplitContainer.Panel2"); - // - // activityGroupBox - // - this.activityGroupBox.Controls.Add(this.messageLabel); - this.activityGroupBox.Controls.Add(this.activityLabel); - resources.ApplyResources(this.activityGroupBox, "activityGroupBox"); - this.activityGroupBox.Name = "activityGroupBox"; - this.activityGroupBox.TabStop = false; - // - // messageLabel - // - resources.ApplyResources(this.messageLabel, "messageLabel"); - this.messageLabel.Name = "messageLabel"; - // - // activityLabel - // - resources.ApplyResources(this.activityLabel, "activityLabel"); - this.activityLabel.Name = "activityLabel"; - // - // topHorizontalSplitContainer - // - resources.ApplyResources(this.topHorizontalSplitContainer, "topHorizontalSplitContainer"); - this.topHorizontalSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; - this.topHorizontalSplitContainer.Name = "topHorizontalSplitContainer"; - // - // topHorizontalSplitContainer.Panel1 - // - this.topHorizontalSplitContainer.Panel1.Controls.Add(this.splitContainer1); - // - // topHorizontalSplitContainer.Panel2 - // - this.topHorizontalSplitContainer.Panel2.Controls.Add(this.descriptionGroupBox); - // - // splitContainer1 - // - resources.ApplyResources(this.splitContainer1, "splitContainer1"); - this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; - this.splitContainer1.Name = "splitContainer1"; - // - // splitContainer1.Panel1 - // - this.splitContainer1.Panel1.Controls.Add(this.procedureGroupBox); - // - // splitContainer1.Panel2 - // - this.splitContainer1.Panel2.Controls.Add(this.progressGroupBox); - // - // procedureGroupBox - // - this.procedureGroupBox.Controls.Add(this.procedureComboBox); - resources.ApplyResources(this.procedureGroupBox, "procedureGroupBox"); - this.procedureGroupBox.Name = "procedureGroupBox"; - this.procedureGroupBox.TabStop = false; - // - // procedureComboBox - // - resources.ApplyResources(this.procedureComboBox, "procedureComboBox"); - this.procedureComboBox.FormattingEnabled = true; - this.procedureComboBox.Name = "procedureComboBox"; - this.procedureComboBox.SelectedIndexChanged += new System.EventHandler(this.procedureComboBox_SelectedIndexChanged); - // - // progressGroupBox - // - this.progressGroupBox.Controls.Add(this.mainProgressBar); - resources.ApplyResources(this.progressGroupBox, "progressGroupBox"); - this.progressGroupBox.Name = "progressGroupBox"; - this.progressGroupBox.TabStop = false; - // - // mainProgressBar - // - resources.ApplyResources(this.mainProgressBar, "mainProgressBar"); - this.mainProgressBar.Name = "mainProgressBar"; - // - // descriptionGroupBox - // - this.descriptionGroupBox.Controls.Add(this.descriptionLabel); - resources.ApplyResources(this.descriptionGroupBox, "descriptionGroupBox"); - this.descriptionGroupBox.Name = "descriptionGroupBox"; - this.descriptionGroupBox.TabStop = false; - // - // descriptionLabel - // - resources.ApplyResources(this.descriptionLabel, "descriptionLabel"); - this.descriptionLabel.Name = "descriptionLabel"; - // - // verticalSplitContainer - // - resources.ApplyResources(this.verticalSplitContainer, "verticalSplitContainer"); - this.verticalSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; - this.verticalSplitContainer.Name = "verticalSplitContainer"; - // - // verticalSplitContainer.Panel1 - // - this.verticalSplitContainer.Panel1.Controls.Add(this.horizontalSplitContainer); - // - // verticalSplitContainer.Panel2 - // - this.verticalSplitContainer.Panel2.Controls.Add(this.rightHorizSplitContainer); - // - // horizontalSplitContainer - // - resources.ApplyResources(this.horizontalSplitContainer, "horizontalSplitContainer"); - this.horizontalSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; - this.horizontalSplitContainer.Name = "horizontalSplitContainer"; - // - // horizontalSplitContainer.Panel1 - // - this.horizontalSplitContainer.Panel1.BackColor = System.Drawing.SystemColors.Control; - this.horizontalSplitContainer.Panel1.Controls.Add(this.topVerticalSplitContainer); - // - // horizontalSplitContainer.Panel2 - // - this.horizontalSplitContainer.Panel2.Controls.Add(this.mainTabControl); - // - // mainTabControl - // - this.mainTabControl.Controls.Add(this.homeTabPage); - this.mainTabControl.Controls.Add(this.processTabPage); - this.mainTabControl.Controls.Add(this.insertTabPage); - this.mainTabControl.Controls.Add(this.resultsTabPage); - this.mainTabControl.Controls.Add(this.logsTabPage); - this.mainTabControl.Controls.Add(this.picturesTabPage); - resources.ApplyResources(this.mainTabControl, "mainTabControl"); - this.mainTabControl.Name = "mainTabControl"; - this.mainTabControl.SelectedIndex = 0; - this.mainTabControl.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; - // - // homeTabPage - // - this.homeTabPage.BackColor = System.Drawing.SystemColors.Control; - this.homeTabPage.Controls.Add(this.ctrlBrdComponent); - resources.ApplyResources(this.homeTabPage, "homeTabPage"); - this.homeTabPage.Name = "homeTabPage"; - // - // ctrlBrdComponent - // - this.ctrlBrdComponent.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - resources.ApplyResources(this.ctrlBrdComponent, "ctrlBrdComponent"); - this.ctrlBrdComponent.Name = "ctrlBrdComponent"; - // - // processTabPage - // - this.processTabPage.Controls.Add(this.processTabPageCtrl); - resources.ApplyResources(this.processTabPage, "processTabPage"); - this.processTabPage.Name = "processTabPage"; - this.processTabPage.UseVisualStyleBackColor = true; - // - // processTabPageCtrl - // - this.processTabPageCtrl.BackColor = System.Drawing.SystemColors.Control; - resources.ApplyResources(this.processTabPageCtrl, "processTabPageCtrl"); - this.processTabPageCtrl.Name = "processTabPageCtrl"; - // - // insertTabPage - // - this.insertTabPage.BackColor = System.Drawing.Color.Silver; - resources.ApplyResources(this.insertTabPage, "insertTabPage"); - this.insertTabPage.Name = "insertTabPage"; - // - // resultsTabPage - // - this.resultsTabPage.Controls.Add(this.resultsTabPageCtrl); - resources.ApplyResources(this.resultsTabPage, "resultsTabPage"); - this.resultsTabPage.Name = "resultsTabPage"; - this.resultsTabPage.UseVisualStyleBackColor = true; - // - // resultsTabPageCtrl - // - this.resultsTabPageCtrl.BackColor = System.Drawing.SystemColors.Control; - resources.ApplyResources(this.resultsTabPageCtrl, "resultsTabPageCtrl"); - this.resultsTabPageCtrl.Name = "resultsTabPageCtrl"; - // - // logsTabPage - // - this.logsTabPage.Controls.Add(this.logsTabPageCtrl); - resources.ApplyResources(this.logsTabPage, "logsTabPage"); - this.logsTabPage.Name = "logsTabPage"; - this.logsTabPage.UseVisualStyleBackColor = true; - // - // logsTabPageCtrl - // - this.logsTabPageCtrl.BackColor = System.Drawing.SystemColors.Control; - resources.ApplyResources(this.logsTabPageCtrl, "logsTabPageCtrl"); - this.logsTabPageCtrl.Name = "logsTabPageCtrl"; - // - // picturesTabPage - // - this.picturesTabPage.Controls.Add(this.picturesTabPageCtrl1); - resources.ApplyResources(this.picturesTabPage, "picturesTabPage"); - this.picturesTabPage.Name = "picturesTabPage"; - this.picturesTabPage.UseVisualStyleBackColor = true; - // - // picturesTabPageCtrl1 - // - this.picturesTabPageCtrl1.BackColor = System.Drawing.Color.Silver; - resources.ApplyResources(this.picturesTabPageCtrl1, "picturesTabPageCtrl1"); - this.picturesTabPageCtrl1.Name = "picturesTabPageCtrl1"; - // - // rightHorizSplitContainer - // - resources.ApplyResources(this.rightHorizSplitContainer, "rightHorizSplitContainer"); - this.rightHorizSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; - this.rightHorizSplitContainer.Name = "rightHorizSplitContainer"; - // - // rightHorizSplitContainer.Panel1 - // - this.rightHorizSplitContainer.Panel1.Controls.Add(this.progressFlowLayoutPanel); - // - // progressFlowLayoutPanel - // - resources.ApplyResources(this.progressFlowLayoutPanel, "progressFlowLayoutPanel"); - this.progressFlowLayoutPanel.BackColor = System.Drawing.SystemColors.Control; - this.progressFlowLayoutPanel.Name = "progressFlowLayoutPanel"; - // - // measurementTabPage - // - this.measurementTabPage.Controls.Add(this.MeasurementTabPageCtrl); - resources.ApplyResources(this.measurementTabPage, "measurementTabPage"); - this.measurementTabPage.Name = "measurementTabPage"; - this.measurementTabPage.UseVisualStyleBackColor = true; - // - // MeasurementTabPageCtrl - // - this.MeasurementTabPageCtrl.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(150)))), ((int)(((byte)(180)))), ((int)(((byte)(200))))); - resources.ApplyResources(this.MeasurementTabPageCtrl, "MeasurementTabPageCtrl"); - this.MeasurementTabPageCtrl.Name = "MeasurementTabPageCtrl"; - // - // statusStrip1 - // - this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.insertTabPage = new System.Windows.Forms.TabPage(); + this.resultsTabPage = new System.Windows.Forms.TabPage(); + this.resultsTabPageCtrl = new TBF.Screens.ResultsTabPageCtrl(); + this.logsTabPage = new System.Windows.Forms.TabPage(); + this.logsTabPageCtrl = new TBF.Screens.LogsTabPageCtrl(); + this.picturesTabPage = new System.Windows.Forms.TabPage(); + this.picturesTabPageCtrl1 = new TBF.Screens.PicturesTabPageCtrl(); + this.rightHorizSplitContainer = new System.Windows.Forms.SplitContainer(); + this.progressFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel(); + this.measurementTabPage = new System.Windows.Forms.TabPage(); + this.MeasurementTabPageCtrl = new TBF.Screens.MeasurementTabPageCtrl(); + this.statusStrip1 = new System.Windows.Forms.StatusStrip(); + this.userInfoStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.statusPStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.routeStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.activityStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.benchTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.benchComponentsTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.benchPathsTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.benchTransitionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.benchMetrologyTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.homeTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.resultsTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.logsTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.editTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.usersTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.localSettingsTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.databaseSettingsTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.passwortToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.upgradeTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.helpTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.aboutTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mainMenuStrip = new System.Windows.Forms.MenuStrip(); + this.proceduresToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.processToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.resultsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.printToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + ((System.ComponentModel.ISupportInitialize)(this.topVerticalSplitContainer)).BeginInit(); + this.topVerticalSplitContainer.Panel1.SuspendLayout(); + this.topVerticalSplitContainer.Panel2.SuspendLayout(); + this.topVerticalSplitContainer.SuspendLayout(); + this.activityGroupBox.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.topHorizontalSplitContainer)).BeginInit(); + this.topHorizontalSplitContainer.Panel1.SuspendLayout(); + this.topHorizontalSplitContainer.Panel2.SuspendLayout(); + this.topHorizontalSplitContainer.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + this.procedureGroupBox.SuspendLayout(); + this.progressGroupBox.SuspendLayout(); + this.descriptionGroupBox.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.verticalSplitContainer)).BeginInit(); + this.verticalSplitContainer.Panel1.SuspendLayout(); + this.verticalSplitContainer.Panel2.SuspendLayout(); + this.verticalSplitContainer.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.horizontalSplitContainer)).BeginInit(); + this.horizontalSplitContainer.Panel1.SuspendLayout(); + this.horizontalSplitContainer.Panel2.SuspendLayout(); + this.horizontalSplitContainer.SuspendLayout(); + this.mainTabControl.SuspendLayout(); + this.homeTabPage.SuspendLayout(); + this.processTabPage.SuspendLayout(); + this.resultsTabPage.SuspendLayout(); + this.logsTabPage.SuspendLayout(); + this.picturesTabPage.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.rightHorizSplitContainer)).BeginInit(); + this.rightHorizSplitContainer.Panel1.SuspendLayout(); + this.rightHorizSplitContainer.SuspendLayout(); + this.measurementTabPage.SuspendLayout(); + this.statusStrip1.SuspendLayout(); + this.mainMenuStrip.SuspendLayout(); + this.SuspendLayout(); + // + // topVerticalSplitContainer + // + resources.ApplyResources(this.topVerticalSplitContainer, "topVerticalSplitContainer"); + this.topVerticalSplitContainer.Name = "topVerticalSplitContainer"; + // + // topVerticalSplitContainer.Panel1 + // + this.topVerticalSplitContainer.Panel1.Controls.Add(this.activityGroupBox); + resources.ApplyResources(this.topVerticalSplitContainer.Panel1, "topVerticalSplitContainer.Panel1"); + // + // topVerticalSplitContainer.Panel2 + // + this.topVerticalSplitContainer.Panel2.Controls.Add(this.topHorizontalSplitContainer); + resources.ApplyResources(this.topVerticalSplitContainer.Panel2, "topVerticalSplitContainer.Panel2"); + // + // activityGroupBox + // + this.activityGroupBox.Controls.Add(this.messageLabel); + this.activityGroupBox.Controls.Add(this.activityLabel); + resources.ApplyResources(this.activityGroupBox, "activityGroupBox"); + this.activityGroupBox.Name = "activityGroupBox"; + this.activityGroupBox.TabStop = false; + // + // messageLabel + // + resources.ApplyResources(this.messageLabel, "messageLabel"); + this.messageLabel.Name = "messageLabel"; + // + // activityLabel + // + resources.ApplyResources(this.activityLabel, "activityLabel"); + this.activityLabel.Name = "activityLabel"; + // + // topHorizontalSplitContainer + // + resources.ApplyResources(this.topHorizontalSplitContainer, "topHorizontalSplitContainer"); + this.topHorizontalSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.topHorizontalSplitContainer.Name = "topHorizontalSplitContainer"; + // + // topHorizontalSplitContainer.Panel1 + // + this.topHorizontalSplitContainer.Panel1.Controls.Add(this.splitContainer1); + // + // topHorizontalSplitContainer.Panel2 + // + this.topHorizontalSplitContainer.Panel2.Controls.Add(this.descriptionGroupBox); + // + // splitContainer1 + // + resources.ApplyResources(this.splitContainer1, "splitContainer1"); + this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer1.Name = "splitContainer1"; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.procedureGroupBox); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.progressGroupBox); + // + // procedureGroupBox + // + this.procedureGroupBox.Controls.Add(this.procedureComboBox); + resources.ApplyResources(this.procedureGroupBox, "procedureGroupBox"); + this.procedureGroupBox.Name = "procedureGroupBox"; + this.procedureGroupBox.TabStop = false; + // + // procedureComboBox + // + resources.ApplyResources(this.procedureComboBox, "procedureComboBox"); + this.procedureComboBox.FormattingEnabled = true; + this.procedureComboBox.Name = "procedureComboBox"; + this.procedureComboBox.SelectedIndexChanged += new System.EventHandler(this.procedureComboBox_SelectedIndexChanged); + // + // progressGroupBox + // + this.progressGroupBox.Controls.Add(this.mainProgressBar); + resources.ApplyResources(this.progressGroupBox, "progressGroupBox"); + this.progressGroupBox.Name = "progressGroupBox"; + this.progressGroupBox.TabStop = false; + // + // mainProgressBar + // + resources.ApplyResources(this.mainProgressBar, "mainProgressBar"); + this.mainProgressBar.Name = "mainProgressBar"; + // + // descriptionGroupBox + // + this.descriptionGroupBox.Controls.Add(this.descriptionLabel); + resources.ApplyResources(this.descriptionGroupBox, "descriptionGroupBox"); + this.descriptionGroupBox.Name = "descriptionGroupBox"; + this.descriptionGroupBox.TabStop = false; + // + // descriptionLabel + // + resources.ApplyResources(this.descriptionLabel, "descriptionLabel"); + this.descriptionLabel.Name = "descriptionLabel"; + // + // verticalSplitContainer + // + resources.ApplyResources(this.verticalSplitContainer, "verticalSplitContainer"); + this.verticalSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.verticalSplitContainer.Name = "verticalSplitContainer"; + // + // verticalSplitContainer.Panel1 + // + this.verticalSplitContainer.Panel1.Controls.Add(this.horizontalSplitContainer); + // + // verticalSplitContainer.Panel2 + // + this.verticalSplitContainer.Panel2.Controls.Add(this.rightHorizSplitContainer); + // + // horizontalSplitContainer + // + resources.ApplyResources(this.horizontalSplitContainer, "horizontalSplitContainer"); + this.horizontalSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.horizontalSplitContainer.Name = "horizontalSplitContainer"; + // + // horizontalSplitContainer.Panel1 + // + this.horizontalSplitContainer.Panel1.BackColor = System.Drawing.SystemColors.Control; + this.horizontalSplitContainer.Panel1.Controls.Add(this.topVerticalSplitContainer); + // + // horizontalSplitContainer.Panel2 + // + this.horizontalSplitContainer.Panel2.Controls.Add(this.mainTabControl); + // + // mainTabControl + // + this.mainTabControl.Controls.Add(this.homeTabPage); + this.mainTabControl.Controls.Add(this.processTabPage); + this.mainTabControl.Controls.Add(this.insertTabPage); + this.mainTabControl.Controls.Add(this.resultsTabPage); + this.mainTabControl.Controls.Add(this.logsTabPage); + this.mainTabControl.Controls.Add(this.picturesTabPage); + resources.ApplyResources(this.mainTabControl, "mainTabControl"); + this.mainTabControl.Name = "mainTabControl"; + this.mainTabControl.SelectedIndex = 0; + this.mainTabControl.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; + // + // homeTabPage + // + this.homeTabPage.BackColor = System.Drawing.SystemColors.Control; + this.homeTabPage.Controls.Add(this.ctrlBrdComponent); + resources.ApplyResources(this.homeTabPage, "homeTabPage"); + this.homeTabPage.Name = "homeTabPage"; + // + // ctrlBrdComponent + // + this.ctrlBrdComponent.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + resources.ApplyResources(this.ctrlBrdComponent, "ctrlBrdComponent"); + this.ctrlBrdComponent.Name = "ctrlBrdComponent"; + // + // processTabPage + // + this.processTabPage.Controls.Add(this.processTabPageCtrl); + resources.ApplyResources(this.processTabPage, "processTabPage"); + this.processTabPage.Name = "processTabPage"; + this.processTabPage.UseVisualStyleBackColor = true; + // + // processTabPageCtrl + // + this.processTabPageCtrl.BackColor = System.Drawing.SystemColors.Control; + resources.ApplyResources(this.processTabPageCtrl, "processTabPageCtrl"); + this.processTabPageCtrl.Name = "processTabPageCtrl"; + // + // insertTabPage + // + this.insertTabPage.BackColor = System.Drawing.Color.Silver; + resources.ApplyResources(this.insertTabPage, "insertTabPage"); + this.insertTabPage.Name = "insertTabPage"; + // + // resultsTabPage + // + this.resultsTabPage.Controls.Add(this.resultsTabPageCtrl); + resources.ApplyResources(this.resultsTabPage, "resultsTabPage"); + this.resultsTabPage.Name = "resultsTabPage"; + this.resultsTabPage.UseVisualStyleBackColor = true; + // + // resultsTabPageCtrl + // + this.resultsTabPageCtrl.BackColor = System.Drawing.SystemColors.Control; + resources.ApplyResources(this.resultsTabPageCtrl, "resultsTabPageCtrl"); + this.resultsTabPageCtrl.Name = "resultsTabPageCtrl"; + // + // logsTabPage + // + this.logsTabPage.Controls.Add(this.logsTabPageCtrl); + resources.ApplyResources(this.logsTabPage, "logsTabPage"); + this.logsTabPage.Name = "logsTabPage"; + this.logsTabPage.UseVisualStyleBackColor = true; + // + // logsTabPageCtrl + // + this.logsTabPageCtrl.BackColor = System.Drawing.SystemColors.Control; + resources.ApplyResources(this.logsTabPageCtrl, "logsTabPageCtrl"); + this.logsTabPageCtrl.Name = "logsTabPageCtrl"; + // + // picturesTabPage + // + this.picturesTabPage.Controls.Add(this.picturesTabPageCtrl1); + resources.ApplyResources(this.picturesTabPage, "picturesTabPage"); + this.picturesTabPage.Name = "picturesTabPage"; + this.picturesTabPage.UseVisualStyleBackColor = true; + // + // picturesTabPageCtrl1 + // + this.picturesTabPageCtrl1.BackColor = System.Drawing.Color.Silver; + resources.ApplyResources(this.picturesTabPageCtrl1, "picturesTabPageCtrl1"); + this.picturesTabPageCtrl1.Name = "picturesTabPageCtrl1"; + // + // rightHorizSplitContainer + // + resources.ApplyResources(this.rightHorizSplitContainer, "rightHorizSplitContainer"); + this.rightHorizSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.rightHorizSplitContainer.Name = "rightHorizSplitContainer"; + // + // rightHorizSplitContainer.Panel1 + // + this.rightHorizSplitContainer.Panel1.Controls.Add(this.progressFlowLayoutPanel); + // + // progressFlowLayoutPanel + // + resources.ApplyResources(this.progressFlowLayoutPanel, "progressFlowLayoutPanel"); + this.progressFlowLayoutPanel.BackColor = System.Drawing.SystemColors.Control; + this.progressFlowLayoutPanel.Name = "progressFlowLayoutPanel"; + // + // measurementTabPage + // + this.measurementTabPage.Controls.Add(this.MeasurementTabPageCtrl); + resources.ApplyResources(this.measurementTabPage, "measurementTabPage"); + this.measurementTabPage.Name = "measurementTabPage"; + this.measurementTabPage.UseVisualStyleBackColor = true; + // + // MeasurementTabPageCtrl + // + this.MeasurementTabPageCtrl.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(150)))), ((int)(((byte)(180)))), ((int)(((byte)(200))))); + resources.ApplyResources(this.MeasurementTabPageCtrl, "MeasurementTabPageCtrl"); + this.MeasurementTabPageCtrl.Name = "MeasurementTabPageCtrl"; + // + // statusStrip1 + // + this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.userInfoStatusLabel, this.statusPStatusLabel, this.routeStatusLabel, this.activityStatusLabel}); - resources.ApplyResources(this.statusStrip1, "statusStrip1"); - this.statusStrip1.Name = "statusStrip1"; - // - // userInfoStatusLabel - // - this.userInfoStatusLabel.Name = "userInfoStatusLabel"; - resources.ApplyResources(this.userInfoStatusLabel, "userInfoStatusLabel"); - // - // statusPStatusLabel - // - this.statusPStatusLabel.Name = "statusPStatusLabel"; - resources.ApplyResources(this.statusPStatusLabel, "statusPStatusLabel"); - // - // routeStatusLabel - // - this.routeStatusLabel.Name = "routeStatusLabel"; - resources.ApplyResources(this.routeStatusLabel, "routeStatusLabel"); - // - // activityStatusLabel - // - this.activityStatusLabel.Name = "activityStatusLabel"; - resources.ApplyResources(this.activityStatusLabel, "activityStatusLabel"); - // - // benchTSMenuItem - // - this.benchTSMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + resources.ApplyResources(this.statusStrip1, "statusStrip1"); + this.statusStrip1.Name = "statusStrip1"; + // + // userInfoStatusLabel + // + this.userInfoStatusLabel.Name = "userInfoStatusLabel"; + resources.ApplyResources(this.userInfoStatusLabel, "userInfoStatusLabel"); + // + // statusPStatusLabel + // + this.statusPStatusLabel.Name = "statusPStatusLabel"; + resources.ApplyResources(this.statusPStatusLabel, "statusPStatusLabel"); + // + // routeStatusLabel + // + this.routeStatusLabel.Name = "routeStatusLabel"; + resources.ApplyResources(this.routeStatusLabel, "routeStatusLabel"); + // + // activityStatusLabel + // + this.activityStatusLabel.Name = "activityStatusLabel"; + resources.ApplyResources(this.activityStatusLabel, "activityStatusLabel"); + // + // benchTSMenuItem + // + this.benchTSMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.benchComponentsTSMenuItem, this.benchPathsTSMenuItem, this.benchTransitionsToolStripMenuItem, this.benchMetrologyTSMenuItem, this.toolStripSeparator1, this.exitToolStripMenuItem}); - this.benchTSMenuItem.Name = "benchTSMenuItem"; - resources.ApplyResources(this.benchTSMenuItem, "benchTSMenuItem"); - // - // benchComponentsTSMenuItem - // - this.benchComponentsTSMenuItem.Name = "benchComponentsTSMenuItem"; - resources.ApplyResources(this.benchComponentsTSMenuItem, "benchComponentsTSMenuItem"); - this.benchComponentsTSMenuItem.Click += new System.EventHandler(this.benchComponentsTSMItem_Click); - // - // benchPathsTSMenuItem - // - this.benchPathsTSMenuItem.Name = "benchPathsTSMenuItem"; - resources.ApplyResources(this.benchPathsTSMenuItem, "benchPathsTSMenuItem"); - this.benchPathsTSMenuItem.Click += new System.EventHandler(this.benchPathsTSMItem_Click); - // - // benchTransitionsToolStripMenuItem - // - this.benchTransitionsToolStripMenuItem.Name = "benchTransitionsToolStripMenuItem"; - resources.ApplyResources(this.benchTransitionsToolStripMenuItem, "benchTransitionsToolStripMenuItem"); - this.benchTransitionsToolStripMenuItem.Click += new System.EventHandler(this.benchTransitionsTSMItem_Click); - // - // benchMetrologyTSMenuItem - // - this.benchMetrologyTSMenuItem.Name = "benchMetrologyTSMenuItem"; - resources.ApplyResources(this.benchMetrologyTSMenuItem, "benchMetrologyTSMenuItem"); - this.benchMetrologyTSMenuItem.Click += new System.EventHandler(this.benchMetrologyTSMItem_Click); - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1"); - // - // exitToolStripMenuItem - // - this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - resources.ApplyResources(this.exitToolStripMenuItem, "exitToolStripMenuItem"); - this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); - // - // homeTSMenuItem - // - this.homeTSMenuItem.Name = "homeTSMenuItem"; - resources.ApplyResources(this.homeTSMenuItem, "homeTSMenuItem"); - this.homeTSMenuItem.Click += new System.EventHandler(this.homeTSMenuItem_Click); - // - // resultsTSMenuItem - // - this.resultsTSMenuItem.Name = "resultsTSMenuItem"; - resources.ApplyResources(this.resultsTSMenuItem, "resultsTSMenuItem"); - // - // logsTSMenuItem - // - this.logsTSMenuItem.Name = "logsTSMenuItem"; - resources.ApplyResources(this.logsTSMenuItem, "logsTSMenuItem"); - this.logsTSMenuItem.Click += new System.EventHandler(this.logsTSMenuItem_Click); - // - // editTSMenuItem - // - this.editTSMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.benchTSMenuItem.Name = "benchTSMenuItem"; + resources.ApplyResources(this.benchTSMenuItem, "benchTSMenuItem"); + // + // benchComponentsTSMenuItem + // + this.benchComponentsTSMenuItem.Name = "benchComponentsTSMenuItem"; + resources.ApplyResources(this.benchComponentsTSMenuItem, "benchComponentsTSMenuItem"); + this.benchComponentsTSMenuItem.Click += new System.EventHandler(this.benchComponentsTSMItem_Click); + // + // benchPathsTSMenuItem + // + this.benchPathsTSMenuItem.Name = "benchPathsTSMenuItem"; + resources.ApplyResources(this.benchPathsTSMenuItem, "benchPathsTSMenuItem"); + this.benchPathsTSMenuItem.Click += new System.EventHandler(this.benchPathsTSMItem_Click); + // + // benchTransitionsToolStripMenuItem + // + this.benchTransitionsToolStripMenuItem.Name = "benchTransitionsToolStripMenuItem"; + resources.ApplyResources(this.benchTransitionsToolStripMenuItem, "benchTransitionsToolStripMenuItem"); + this.benchTransitionsToolStripMenuItem.Click += new System.EventHandler(this.benchTransitionsTSMItem_Click); + // + // benchMetrologyTSMenuItem + // + this.benchMetrologyTSMenuItem.Name = "benchMetrologyTSMenuItem"; + resources.ApplyResources(this.benchMetrologyTSMenuItem, "benchMetrologyTSMenuItem"); + this.benchMetrologyTSMenuItem.Click += new System.EventHandler(this.benchMetrologyTSMItem_Click); + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1"); + // + // exitToolStripMenuItem + // + this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; + resources.ApplyResources(this.exitToolStripMenuItem, "exitToolStripMenuItem"); + this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); + // + // homeTSMenuItem + // + this.homeTSMenuItem.Name = "homeTSMenuItem"; + resources.ApplyResources(this.homeTSMenuItem, "homeTSMenuItem"); + this.homeTSMenuItem.Click += new System.EventHandler(this.homeTSMenuItem_Click); + // + // resultsTSMenuItem + // + this.resultsTSMenuItem.Name = "resultsTSMenuItem"; + resources.ApplyResources(this.resultsTSMenuItem, "resultsTSMenuItem"); + // + // logsTSMenuItem + // + this.logsTSMenuItem.Name = "logsTSMenuItem"; + resources.ApplyResources(this.logsTSMenuItem, "logsTSMenuItem"); + this.logsTSMenuItem.Click += new System.EventHandler(this.logsTSMenuItem_Click); + // + // editTSMenuItem + // + this.editTSMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.usersTSMenuItem, this.localSettingsTSMenuItem, this.databaseSettingsTSMenuItem, this.passwortToolStripMenuItem, this.upgradeTSMenuItem}); - this.editTSMenuItem.Name = "editTSMenuItem"; - resources.ApplyResources(this.editTSMenuItem, "editTSMenuItem"); - // - // usersTSMenuItem - // - this.usersTSMenuItem.Name = "usersTSMenuItem"; - resources.ApplyResources(this.usersTSMenuItem, "usersTSMenuItem"); - this.usersTSMenuItem.Click += new System.EventHandler(this.usersTSMItem_Click); - // - // localSettingsTSMenuItem - // - this.localSettingsTSMenuItem.Name = "localSettingsTSMenuItem"; - resources.ApplyResources(this.localSettingsTSMenuItem, "localSettingsTSMenuItem"); - this.localSettingsTSMenuItem.Click += new System.EventHandler(this.localSettingsTSMItem_Click); - // - // databaseSettingsTSMenuItem - // - this.databaseSettingsTSMenuItem.Name = "databaseSettingsTSMenuItem"; - resources.ApplyResources(this.databaseSettingsTSMenuItem, "databaseSettingsTSMenuItem"); - this.databaseSettingsTSMenuItem.Click += new System.EventHandler(this.databaseSettingsTSMItem_Click); - // - // passwortToolStripMenuItem - // - this.passwortToolStripMenuItem.Name = "passwortToolStripMenuItem"; - resources.ApplyResources(this.passwortToolStripMenuItem, "passwortToolStripMenuItem"); - // - // helpTSMenuItem - // - this.helpTSMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.editTSMenuItem.Name = "editTSMenuItem"; + resources.ApplyResources(this.editTSMenuItem, "editTSMenuItem"); + // + // usersTSMenuItem + // + this.usersTSMenuItem.Name = "usersTSMenuItem"; + resources.ApplyResources(this.usersTSMenuItem, "usersTSMenuItem"); + this.usersTSMenuItem.Click += new System.EventHandler(this.usersTSMItem_Click); + // + // localSettingsTSMenuItem + // + this.localSettingsTSMenuItem.Name = "localSettingsTSMenuItem"; + resources.ApplyResources(this.localSettingsTSMenuItem, "localSettingsTSMenuItem"); + this.localSettingsTSMenuItem.Click += new System.EventHandler(this.localSettingsTSMItem_Click); + // + // databaseSettingsTSMenuItem + // + this.databaseSettingsTSMenuItem.Name = "databaseSettingsTSMenuItem"; + resources.ApplyResources(this.databaseSettingsTSMenuItem, "databaseSettingsTSMenuItem"); + this.databaseSettingsTSMenuItem.Click += new System.EventHandler(this.databaseSettingsTSMItem_Click); + // + // passwortToolStripMenuItem + // + this.passwortToolStripMenuItem.Name = "passwortToolStripMenuItem"; + resources.ApplyResources(this.passwortToolStripMenuItem, "passwortToolStripMenuItem"); + // + // upgradeTSMenuItem + // + this.upgradeTSMenuItem.Name = "upgradeTSMenuItem"; + resources.ApplyResources(this.upgradeTSMenuItem, "upgradeTSMenuItem"); + this.upgradeTSMenuItem.Click += new System.EventHandler(this.upgradeTSMenuItem_Click); + // + // helpTSMenuItem + // + this.helpTSMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.aboutTSMenuItem}); - this.helpTSMenuItem.Name = "helpTSMenuItem"; - resources.ApplyResources(this.helpTSMenuItem, "helpTSMenuItem"); - // - // aboutTSMenuItem - // - this.aboutTSMenuItem.Name = "aboutTSMenuItem"; - resources.ApplyResources(this.aboutTSMenuItem, "aboutTSMenuItem"); - this.aboutTSMenuItem.Click += new System.EventHandler(this.aboutTSMItem_Click); - // - // mainMenuStrip - // - this.mainMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.helpTSMenuItem.Name = "helpTSMenuItem"; + resources.ApplyResources(this.helpTSMenuItem, "helpTSMenuItem"); + // + // aboutTSMenuItem + // + this.aboutTSMenuItem.Name = "aboutTSMenuItem"; + resources.ApplyResources(this.aboutTSMenuItem, "aboutTSMenuItem"); + this.aboutTSMenuItem.Click += new System.EventHandler(this.aboutTSMItem_Click); + // + // mainMenuStrip + // + this.mainMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.benchTSMenuItem, this.proceduresToolStripMenuItem, this.homeTSMenuItem, @@ -528,95 +534,89 @@ namespace TBF this.logsTSMenuItem, this.editTSMenuItem, this.helpTSMenuItem}); - resources.ApplyResources(this.mainMenuStrip, "mainMenuStrip"); - this.mainMenuStrip.Name = "mainMenuStrip"; - // - // proceduresToolStripMenuItem - // - this.proceduresToolStripMenuItem.Name = "proceduresToolStripMenuItem"; - resources.ApplyResources(this.proceduresToolStripMenuItem, "proceduresToolStripMenuItem"); - this.proceduresToolStripMenuItem.Click += new System.EventHandler(this.proceduresTSMItem_Click); - // - // processToolStripMenuItem - // - this.processToolStripMenuItem.Name = "processToolStripMenuItem"; - resources.ApplyResources(this.processToolStripMenuItem, "processToolStripMenuItem"); - this.processToolStripMenuItem.Click += new System.EventHandler(this.processTSMenuItem_Click); - // - // resultsToolStripMenuItem - // - this.resultsToolStripMenuItem.Name = "resultsToolStripMenuItem"; - resources.ApplyResources(this.resultsToolStripMenuItem, "resultsToolStripMenuItem"); - this.resultsToolStripMenuItem.Click += new System.EventHandler(this.resultsTSMenuItem_Click); - // - // printToolStripMenuItem - // - this.printToolStripMenuItem.Name = "printToolStripMenuItem"; - resources.ApplyResources(this.printToolStripMenuItem, "printToolStripMenuItem"); - this.printToolStripMenuItem.Click += new System.EventHandler(this.printToolStripMenuItem_Click); - // - // upgradeTSMenuItem - // - this.upgradeTSMenuItem.Name = "upgradeTSMenuItem"; - resources.ApplyResources(this.upgradeTSMenuItem, "upgradeTSMenuItem"); - this.upgradeTSMenuItem.Click += new System.EventHandler(this.upgradeTSMenuItem_Click); - // - // MainWnd - // - resources.ApplyResources(this, "$this"); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.verticalSplitContainer); - this.Controls.Add(this.statusStrip1); - this.Controls.Add(this.mainMenuStrip); - this.KeyPreview = true; - this.MainMenuStrip = this.mainMenuStrip; - this.Name = "MainWnd"; - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainWnd_FormClosing); - this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MainWnd_FormClosed); - this.Load += new System.EventHandler(this.MainWnd_Load); - this.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.MainWnd_KeyPress); - this.topVerticalSplitContainer.Panel1.ResumeLayout(false); - this.topVerticalSplitContainer.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.topVerticalSplitContainer)).EndInit(); - this.topVerticalSplitContainer.ResumeLayout(false); - this.activityGroupBox.ResumeLayout(false); - this.activityGroupBox.PerformLayout(); - this.topHorizontalSplitContainer.Panel1.ResumeLayout(false); - this.topHorizontalSplitContainer.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.topHorizontalSplitContainer)).EndInit(); - this.topHorizontalSplitContainer.ResumeLayout(false); - this.splitContainer1.Panel1.ResumeLayout(false); - this.splitContainer1.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); - this.splitContainer1.ResumeLayout(false); - this.procedureGroupBox.ResumeLayout(false); - this.progressGroupBox.ResumeLayout(false); - this.descriptionGroupBox.ResumeLayout(false); - this.descriptionGroupBox.PerformLayout(); - this.verticalSplitContainer.Panel1.ResumeLayout(false); - this.verticalSplitContainer.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.verticalSplitContainer)).EndInit(); - this.verticalSplitContainer.ResumeLayout(false); - this.horizontalSplitContainer.Panel1.ResumeLayout(false); - this.horizontalSplitContainer.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.horizontalSplitContainer)).EndInit(); - this.horizontalSplitContainer.ResumeLayout(false); - this.mainTabControl.ResumeLayout(false); - this.homeTabPage.ResumeLayout(false); - this.processTabPage.ResumeLayout(false); - this.resultsTabPage.ResumeLayout(false); - this.logsTabPage.ResumeLayout(false); - this.picturesTabPage.ResumeLayout(false); - this.rightHorizSplitContainer.Panel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.rightHorizSplitContainer)).EndInit(); - this.rightHorizSplitContainer.ResumeLayout(false); - this.measurementTabPage.ResumeLayout(false); - this.statusStrip1.ResumeLayout(false); - this.statusStrip1.PerformLayout(); - this.mainMenuStrip.ResumeLayout(false); - this.mainMenuStrip.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); + resources.ApplyResources(this.mainMenuStrip, "mainMenuStrip"); + this.mainMenuStrip.Name = "mainMenuStrip"; + // + // proceduresToolStripMenuItem + // + this.proceduresToolStripMenuItem.Name = "proceduresToolStripMenuItem"; + resources.ApplyResources(this.proceduresToolStripMenuItem, "proceduresToolStripMenuItem"); + this.proceduresToolStripMenuItem.Click += new System.EventHandler(this.proceduresTSMItem_Click); + // + // processToolStripMenuItem + // + this.processToolStripMenuItem.Name = "processToolStripMenuItem"; + resources.ApplyResources(this.processToolStripMenuItem, "processToolStripMenuItem"); + this.processToolStripMenuItem.Click += new System.EventHandler(this.processTSMenuItem_Click); + // + // resultsToolStripMenuItem + // + this.resultsToolStripMenuItem.Name = "resultsToolStripMenuItem"; + resources.ApplyResources(this.resultsToolStripMenuItem, "resultsToolStripMenuItem"); + this.resultsToolStripMenuItem.Click += new System.EventHandler(this.resultsTSMenuItem_Click); + // + // printToolStripMenuItem + // + this.printToolStripMenuItem.Name = "printToolStripMenuItem"; + resources.ApplyResources(this.printToolStripMenuItem, "printToolStripMenuItem"); + this.printToolStripMenuItem.Click += new System.EventHandler(this.printToolStripMenuItem_Click); + // + // MainWnd + // + resources.ApplyResources(this, "$this"); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.verticalSplitContainer); + this.Controls.Add(this.statusStrip1); + this.Controls.Add(this.mainMenuStrip); + this.KeyPreview = true; + this.MainMenuStrip = this.mainMenuStrip; + this.Name = "MainWnd"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainWnd_FormClosing); + this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MainWnd_FormClosed); + this.Load += new System.EventHandler(this.MainWnd_Load); + this.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.MainWnd_KeyPress); + this.topVerticalSplitContainer.Panel1.ResumeLayout(false); + this.topVerticalSplitContainer.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.topVerticalSplitContainer)).EndInit(); + this.topVerticalSplitContainer.ResumeLayout(false); + this.activityGroupBox.ResumeLayout(false); + this.activityGroupBox.PerformLayout(); + this.topHorizontalSplitContainer.Panel1.ResumeLayout(false); + this.topHorizontalSplitContainer.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.topHorizontalSplitContainer)).EndInit(); + this.topHorizontalSplitContainer.ResumeLayout(false); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); + this.procedureGroupBox.ResumeLayout(false); + this.progressGroupBox.ResumeLayout(false); + this.descriptionGroupBox.ResumeLayout(false); + this.descriptionGroupBox.PerformLayout(); + this.verticalSplitContainer.Panel1.ResumeLayout(false); + this.verticalSplitContainer.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.verticalSplitContainer)).EndInit(); + this.verticalSplitContainer.ResumeLayout(false); + this.horizontalSplitContainer.Panel1.ResumeLayout(false); + this.horizontalSplitContainer.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.horizontalSplitContainer)).EndInit(); + this.horizontalSplitContainer.ResumeLayout(false); + this.mainTabControl.ResumeLayout(false); + this.homeTabPage.ResumeLayout(false); + this.processTabPage.ResumeLayout(false); + this.resultsTabPage.ResumeLayout(false); + this.logsTabPage.ResumeLayout(false); + this.picturesTabPage.ResumeLayout(false); + this.rightHorizSplitContainer.Panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.rightHorizSplitContainer)).EndInit(); + this.rightHorizSplitContainer.ResumeLayout(false); + this.measurementTabPage.ResumeLayout(false); + this.statusStrip1.ResumeLayout(false); + this.statusStrip1.PerformLayout(); + this.mainMenuStrip.ResumeLayout(false); + this.mainMenuStrip.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); } diff --git a/TestBenchFramework/MainWnd.cs b/TestBenchFramework/MainWnd.cs index 640e8b525..8b24cc978 100644 --- a/TestBenchFramework/MainWnd.cs +++ b/TestBenchFramework/MainWnd.cs @@ -378,7 +378,7 @@ namespace TBF private void proceduresTSMItem_Click(object s, EventArgs e) { Cursor = Cursors.WaitCursor; new ProceduresDlg().ShowDialog(); Cursor = Cursors.Default; } private void localSettingsTSMItem_Click(object s, EventArgs e) { new PreferencesDlg().ShowDialog(); } private void databaseSettingsTSMItem_Click(object s, EventArgs e) { new BenchesDlg().ShowDialog(); } - private void usersTSMItem_Click(object s, EventArgs e) { new Forms.EditUsers().ShowDialog(); } + private void usersTSMItem_Click(object s, EventArgs e) { new Users.Forms.EditUsers().ShowDialog(); } private void aboutTSMItem_Click(object s, EventArgs e) { new Forms.AboutDlg().ShowDialog(); } /// diff --git a/TestBenchFramework/MainWnd.resx b/TestBenchFramework/MainWnd.resx index 2362c63f8..1fc6ba4f0 100644 --- a/TestBenchFramework/MainWnd.resx +++ b/TestBenchFramework/MainWnd.resx @@ -125,6 +125,25 @@ 0, 0 + + + True + + + Verdana, 15.75pt + + + NoControl + + + 6, 68 + + + 0, 25 + + + 1 + messageLabel @@ -137,6 +156,24 @@ 0 + + True + + + Verdana, 15.75pt + + + NoControl + + + 6, 28 + + + 0, 25 + + + 0 + activityLabel @@ -161,7 +198,6 @@ 335, 115 - 18 @@ -216,6 +252,27 @@ 0, 0 + + Fill + + + False + + + Verdana, 15.75pt + + + 13, 23 + + + 23, 3, 3, 3 + + + 389, 33 + + + 6 + procedureComboBox @@ -273,6 +330,18 @@ 0 + + NoControl + + + 6, 23 + + + 237, 33 + + + 0 + mainProgressBar @@ -360,6 +429,21 @@ 0 + + True + + + NoControl + + + 8, 15 + + + 0, 13 + + + 0 + descriptionLabel @@ -465,150 +549,6 @@ 0 - - True - - - Verdana, 15.75pt - - - NoControl - - - 6, 68 - - - 0, 25 - - - 1 - - - messageLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - activityGroupBox - - - 0 - - - True - - - Verdana, 15.75pt - - - NoControl - - - 6, 28 - - - 0, 25 - - - 0 - - - activityLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - activityGroupBox - - - 1 - - - Fill - - - False - - - Verdana, 15.75pt - - - 13, 23 - - - 23, 3, 3, 3 - - - 389, 33 - - - 6 - - - procedureComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - procedureGroupBox - - - 0 - - - NoControl - - - 6, 23 - - - 237, 33 - - - 0 - - - mainProgressBar - - - System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - progressGroupBox - - - 0 - - - True - - - NoControl - - - 8, 15 - - - 0, 13 - - - 0 - - - descriptionLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - descriptionGroupBox - - - 0 - Fill @@ -642,6 +582,42 @@ 0 + + Fill + + + 0, 0 + + + 1012, 523 + + + 1 + + + ctrlBrdComponent + + + ControlComponent3Munich.UserControl1, ControlComponent3Munich, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + homeTabPage + + + 0 + + + 4, 5 + + + 1012, 523 + + + 29 + + + Hydraulics + homeTabPage @@ -654,6 +630,48 @@ 0 + + Fill + + + Microsoft Sans Serif, 8.25pt + + + 0, 0 + + + 4, 4, 4, 4 + + + 1012, 523 + + + 1 + + + processTabPageCtrl + + + TBF.Screens.ProcessTabPageCtrl6, TBF, Version=2.12.497.1, Culture=neutral, PublicKeyToken=null + + + processTabPage + + + 0 + + + 4, 5 + + + 1012, 523 + + + 30 + + + Process + processTabPage @@ -666,6 +684,18 @@ 1 + + 4, 5 + + + 1012, 523 + + + 22 + + + Insert + insertTabPage @@ -678,6 +708,48 @@ 2 + + Fill + + + Microsoft Sans Serif, 8.25pt + + + 0, 0 + + + 4, 4, 4, 4 + + + 1012, 523 + + + 0 + + + resultsTabPageCtrl + + + TBF.Screens.ResultsTabPageCtrl, TBF, Version=2.12.497.1, Culture=neutral, PublicKeyToken=null + + + resultsTabPage + + + 0 + + + 4, 5 + + + 1012, 523 + + + 15 + + + Results + resultsTabPage @@ -690,6 +762,48 @@ 3 + + Fill + + + Microsoft Sans Serif, 8.25pt + + + 0, 0 + + + 4, 4, 4, 4 + + + 1012, 523 + + + 0 + + + logsTabPageCtrl + + + TBF.Screens.LogsTabPageCtrl, TBF, Version=2.12.497.1, Culture=neutral, PublicKeyToken=null + + + logsTabPage + + + 0 + + + 4, 5 + + + 1012, 523 + + + 21 + + + Logs + logsTabPage @@ -702,6 +816,45 @@ 4 + + Fill + + + Microsoft Sans Serif, 8.25pt + + + 0, 0 + + + 1012, 523 + + + 0 + + + picturesTabPageCtrl1 + + + TBF.Screens.PicturesTabPageCtrl, TBF, Version=2.12.497.1, Culture=neutral, PublicKeyToken=null + + + picturesTabPage + + + 0 + + + 4, 5 + + + 1012, 523 + + + 31 + + + Pictures + picturesTabPage @@ -906,356 +1059,29 @@ 0 - - ctrlBrdComponent - - - ControlComponent_Torino2015.UserControl1, ControlComponent3U, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - homeTabPage - - - 0 - - - 4, 5 - - - 1012, 523 - - - 29 - - - Hydraulics - - - homeTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainTabControl - - - 0 - - + Fill - + + Verdana, 11.25pt + + 0, 0 - - 1012, 523 - - - 1 - - - ctrlBrdComponent - - - ControlComponent_Torino2015.UserControl1, ControlComponent3U, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - homeTabPage - - - 0 - - - processTabPageCtrl - - - TBF.Screens.ProcessTabPageCtrl48, TBF, Version=2.9.330.1, Culture=neutral, PublicKeyToken=null - - - processTabPage - - - 0 - - - 4, 5 - - - 1012, 523 - - - 30 - - - Process - - - processTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainTabControl - - - 1 - - - Fill - - - Microsoft Sans Serif, 8.25pt - - - 0, 0 - - + 4, 4, 4, 4 - + 1012, 523 - - 1 - - - processTabPageCtrl - - - TBF.Screens.ProcessTabPageCtrl48, TBF, Version=2.9.330.1, Culture=neutral, PublicKeyToken=null - - - processTabPage - - - 0 - - - 4, 5 - - - 1012, 523 - - - 22 - - - Insert - - - insertTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainTabControl - - - 2 - - - resultsTabPageCtrl - - - TBF.Screens.ResultsTabPageCtrl, TBF, Version=2.9.330.1, Culture=neutral, PublicKeyToken=null - - - resultsTabPage - - - 0 - - - 4, 5 - - - 1012, 523 - - - 15 - - - Results - - - resultsTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainTabControl - - - 3 - - - Fill - - - Microsoft Sans Serif, 8.25pt - - - 0, 0 - - - 4, 4, 4, 4 - - - 1012, 523 - - - 0 - - - resultsTabPageCtrl - - - TBF.Screens.ResultsTabPageCtrl, TBF, Version=2.9.330.1, Culture=neutral, PublicKeyToken=null - - - resultsTabPage - - - 0 - - - logsTabPageCtrl - - - TBF.Screens.LogsTabPageCtrl, TBF, Version=2.9.330.1, Culture=neutral, PublicKeyToken=null - - - logsTabPage - - - 0 - - - 4, 5 - - - 1012, 523 - - - 21 - - - Logs - - - logsTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainTabControl - - - 4 - - - Fill - - - Microsoft Sans Serif, 8.25pt - - - 0, 0 - - - 4, 4, 4, 4 - - - 1012, 523 - - - 0 - - - logsTabPageCtrl - - - TBF.Screens.LogsTabPageCtrl, TBF, Version=2.9.330.1, Culture=neutral, PublicKeyToken=null - - - logsTabPage - - - 0 - - - picturesTabPageCtrl1 - - - TBF.Screens.PicturesTabPageCtrl, TBF, Version=2.9.330.1, Culture=neutral, PublicKeyToken=null - - - picturesTabPage - - - 0 - - - 4, 5 - - - 1012, 523 - - - 31 - - - Pictures - - - picturesTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainTabControl - - - 5 - - - Fill - - - Microsoft Sans Serif, 8.25pt - - - 0, 0 - - - 1012, 523 - - - 0 - - - picturesTabPageCtrl1 - - - TBF.Screens.PicturesTabPageCtrl, TBF, Version=2.9.330.1, Culture=neutral, PublicKeyToken=null - - - picturesTabPage - - + 0 MeasurementTabPageCtrl - TBF.Screens.MeasurementTabPageCtrl, TBF, Version=2.9.330.1, Culture=neutral, PublicKeyToken=null + TBF.Screens.MeasurementTabPageCtrl, TBF, Version=2.12.497.1, Culture=neutral, PublicKeyToken=null measurementTabPage @@ -1281,39 +1107,21 @@ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Fill - - - Verdana, 11.25pt - - - 0, 0 - - - 4, 4, 4, 4 - - - 1012, 523 - - - 0 - - - MeasurementTabPageCtrl - - - TBF.Screens.MeasurementTabPageCtrl, TBF, Version=2.9.330.1, Culture=neutral, PublicKeyToken=null - - - measurementTabPage - - - 0 - 152, 17 + + 0, 17 + + + 0, 17 + + + 0, 17 + + + 0, 17 + 0, 680 @@ -1338,24 +1146,6 @@ 1 - - 0, 17 - - - 0, 17 - - - 0, 17 - - - 0, 17 - - - 52, 20 - - - Bench - 143, 22 @@ -1389,6 +1179,12 @@ Exit + + 52, 20 + + + Bench + 52, 20 @@ -1443,18 +1239,18 @@ Settings - - 44, 20 - - - Help - 107, 22 About + + 44, 20 + + + Help + 17, 17 @@ -1510,7 +1306,7 @@ True - 25 + 40 6, 13 @@ -1635,6 +1431,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + upgradeTSMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + helpTSMenuItem @@ -1671,12 +1473,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - upgradeTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - MainWnd diff --git a/TestBenchFramework/Program.cs b/TestBenchFramework/Program.cs index 72a111096..f9414e11f 100644 --- a/TestBenchFramework/Program.cs +++ b/TestBenchFramework/Program.cs @@ -165,7 +165,7 @@ namespace TBF /// Ask what to do, ask for the password, open 'DatabaseSetingsDlg' and continue on OK if ((new Forms.NoBenchOrDatabaseDlg { Message = Strings.NoBenchMsg }.ShowDialog() != DialogResult.OK) || - (new LoginDlg(true).ShowDialog() == DialogResult.Cancel) || + (new Users.Forms.LoginDlg(true).ShowDialog() == DialogResult.Cancel) || (new BenchesDlg().ShowDialog() == DialogResult.Cancel)) { return; /// Exit program @@ -356,7 +356,7 @@ namespace TBF case DialogResult.Retry: break; /// Retry the loop default: /// Open 'DatabaseSetingsDlg' and retry DB connect on OK - if (new LoginDlg(true).ShowDialog() == DialogResult.Cancel || + if (new Users.Forms.LoginDlg(true).ShowDialog() == DialogResult.Cancel || new BenchesDlg().ShowDialog() == DialogResult.Cancel) { return; /// Exit program diff --git a/TestBenchFramework/Resources/Strings.cs.resx b/TestBenchFramework/Resources/Strings.cs.resx index d2723eda7..ad3b454c8 100644 --- a/TestBenchFramework/Resources/Strings.cs.resx +++ b/TestBenchFramework/Resources/Strings.cs.resx @@ -363,9 +363,6 @@ Doba [s] - - Uživatelská editace - Editace @@ -456,9 +453,6 @@ Získat hmotnost vody v nádrži - - Skupiny - Vedoucí laboratoře @@ -483,9 +477,6 @@ Neplatné uživatelské jméno, heslo, nebo stolice - - Neplatné uživatelské jméno či heslo - iPERL Komunikace probíhá @@ -525,9 +516,6 @@ Hmotnost [kg] - - (max. _X_ alfanumerické znaky) - Změřte hmotnost @@ -1071,9 +1059,6 @@ Uživatelský login - - Správa uživatelů - Uživatelské jméno diff --git a/TestBenchFramework/Resources/Strings.de.resx b/TestBenchFramework/Resources/Strings.de.resx index 4228201db..ba185180e 100644 --- a/TestBenchFramework/Resources/Strings.de.resx +++ b/TestBenchFramework/Resources/Strings.de.resx @@ -150,12 +150,6 @@ Warnung - - (maximal _X_ alphanumerische Zeichen) - - - Dieser Benutzername ist bereits vergeben. Bitte wählen Sie einen anderen. - geschl. @@ -408,9 +402,6 @@ Ungültiges Passwort - - Ungültiger Benutzername oder Passwort - Abschließen @@ -972,15 +963,6 @@ Version {0} - - Benutzer einrichten - - - Gruppen - - - Benutzerverwaltung - Ein Ausnahmefehler ist aufgetreten! @@ -1407,10 +1389,4 @@ Prüfpunktvolumen uberschritt Behalter - - Passwort wiederholen - - - Felder 'Password' und 'Passwort wiederholen' sind anders, wiederholen sie bitte. - \ No newline at end of file diff --git a/TestBenchFramework/Resources/Strings.pl.resx b/TestBenchFramework/Resources/Strings.pl.resx index 49fb0bdff..ee886f3c5 100644 --- a/TestBenchFramework/Resources/Strings.pl.resx +++ b/TestBenchFramework/Resources/Strings.pl.resx @@ -435,9 +435,6 @@ Nieprawidłowy użytkownik, hasło lub stanowisko - - Nieprawidłowa nazwa użytkownika lub hasło - Mniej @@ -468,9 +465,6 @@ Masa [kg] - - (max. _X_ znaków alfanumerycznych) - Pomiar masy @@ -990,9 +984,6 @@ Nazwa Użytkownika - - Ta Nazwa użytkownika jest już zajęta. Proszę wybrać inną. - Użytkownicy i grupy @@ -1131,15 +1122,6 @@ Prawa autorskie © 2013 - {0} - - Edytuj użytkownika - - - Grupy - - - Uprawnienia użytkownika - Wystąpił nieobsługiwany błąd diff --git a/TestBenchFramework/Resources/Strings.ru.resx b/TestBenchFramework/Resources/Strings.ru.resx index 76818631b..45dc7bf9b 100644 --- a/TestBenchFramework/Resources/Strings.ru.resx +++ b/TestBenchFramework/Resources/Strings.ru.resx @@ -159,12 +159,6 @@ Предупреждение - - (Макс. _X_ Буквенно-цифровых символов) - - - Это Имя пользователя уже принято. Пожалуйста, выберите другое. - закрыть @@ -291,9 +285,6 @@ Давление [бар] - - Неправильное имя пользователя или пароль - Имя пользователя @@ -1092,15 +1083,6 @@ Версия {0} - - Редактировать пользователя - - - Группы - - - Управление пользователями - Произошла необрабатываемая ошибка diff --git a/TestBenchFramework/Resources/Strings.zh-CN.resx b/TestBenchFramework/Resources/Strings.zh-CN.resx index 903fae3f7..845847b7a 100644 --- a/TestBenchFramework/Resources/Strings.zh-CN.resx +++ b/TestBenchFramework/Resources/Strings.zh-CN.resx @@ -360,9 +360,6 @@ 持续时间[秒] - - 编辑用户 - 编辑 Edit @@ -453,9 +450,6 @@ 从水箱中获取水的质量 - - 组别 - 实验室负责人 @@ -480,9 +474,6 @@ 无效的用户名，密码，或工作台 - - 无效的用户名或密码 - 正在进行Iperl通信 @@ -522,9 +513,6 @@ 质量[kg] - - （最大_X_字母数字字符） - 测量质量 @@ -1071,18 +1059,12 @@ 用户登录 - - 用户管理 - 用户名 用户名 - - 此用户名已被占用。请选择另外一个。 - 用户和组别 diff --git a/TestBenchFramework/TBF.csproj b/TestBenchFramework/TBF.csproj index d5e9ef0a6..c9347a73d 100644 --- a/TestBenchFramework/TBF.csproj +++ b/TestBenchFramework/TBF.csproj @@ -858,12 +858,6 @@ DatabaseSettingsDlg.cs - - Form - - - LoginDlg.cs - Form @@ -1405,18 +1399,6 @@ BenchesDlg.cs - - Form - - - EditUsers.cs - - - Form - - - EditSelectedUser.cs - Form @@ -2089,9 +2071,6 @@ EmergencyStopForm.cs - - LoginDlg.cs - LoginDlgWithBenchSelection.cs @@ -2198,12 +2177,6 @@ Designer BenchesDlg.cs - - EditUsers.cs - - - EditSelectedUser.cs - ErrorDlg.cs diff --git a/TestBenchFramework/UiControls/SharedButtons.cs b/TestBenchFramework/UiControls/SharedButtons.cs index 878dddc7e..7de7b634e 100644 --- a/TestBenchFramework/UiControls/SharedButtons.cs +++ b/TestBenchFramework/UiControls/SharedButtons.cs @@ -232,14 +232,18 @@ namespace TBF.UiControls { if (!Config.Data.CurrentUser.IsMemberOf(RequiredGroupMembership)) { - if ((new Forms.LoginDlg(RequiredGroupMembership)).ShowDialog() != DialogResult.OK) return; + if ((new Users.Forms.LoginDlg(RequiredGroupMembership)).ShowDialog() != DialogResult.OK) + return; } else if (Program.LocalSettings.AlwaysAskPasswdWhenUnlocking) { - if ((new Forms.LoginDlg(Config.Data.CurrentUser.UserName, RequiredGroupMembership)).ShowDialog() != DialogResult.OK) return; + if ((new Users.Forms.LoginDlg(Config.Data.CurrentUser.UserName, RequiredGroupMembership)).ShowDialog() != DialogResult.OK) + return; } - UnlockButtons(); + if (Program.MainWnd != null) Program.MainWnd.UpdateUser(); + + UnlockButtons(); if (Unlocked != null) Unlocked(sender, e); } diff --git a/TestBenchFramework/Forms/EditSelectedUser.Designer.cs b/Users/Forms/EditSelectedUser.Designer.cs similarity index 98% rename from TestBenchFramework/Forms/EditSelectedUser.Designer.cs rename to Users/Forms/EditSelectedUser.Designer.cs index 88b825077..3930d7a4e 100644 --- a/TestBenchFramework/Forms/EditSelectedUser.Designer.cs +++ b/Users/Forms/EditSelectedUser.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2017 Sensus Metering Systems /// -namespace TBF.Forms +namespace Users.Forms { partial class EditSelectedUser { diff --git a/TestBenchFramework/Forms/EditSelectedUser.cs b/Users/Forms/EditSelectedUser.cs similarity index 95% rename from TestBenchFramework/Forms/EditSelectedUser.cs rename to Users/Forms/EditSelectedUser.cs index 13e54b6ff..901ef3f24 100644 --- a/TestBenchFramework/Forms/EditSelectedUser.cs +++ b/Users/Forms/EditSelectedUser.cs @@ -1,14 +1,15 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2017 Sensus Metering Systems /// using System; using System.Collections.Generic; +using System.Text; using System.Windows.Forms; using NHibernate; using Config.Entities; -using TBF.Resources; +using Users.Resources; -namespace TBF.Forms +namespace Users.Forms { public partial class EditSelectedUser : Form { @@ -18,7 +19,7 @@ namespace TBF.Forms public EditSelectedUser() { InitializeComponent(); - this.toolTip1.SetToolTip(this.txtName, Strings.MaxChars.Replace("_X_", Convert.ToString(20))); + this.toolTip1.SetToolTip(this.txtName, string.Format(Strings.max_0_alphanum_chars, 20)); btnOk.Enabled = false; } @@ -123,7 +124,8 @@ namespace TBF.Forms IList ListOfUsers = User.GetAllUsers(); foreach (var person in ListOfUsers) { - if (person.Id != CurrentEditUser.Id) { + if (person.Id != CurrentEditUser.Id) + { // other user if (person.UserName.ToLower() == Username.ToLower()) { @@ -150,7 +152,6 @@ namespace TBF.Forms } - private void CheckIfFormCanBeSubmitted() { btnOk.Enabled = false; diff --git a/TestBenchFramework/Forms/EditSelectedUser.resx b/Users/Forms/EditSelectedUser.resx similarity index 100% rename from TestBenchFramework/Forms/EditSelectedUser.resx rename to Users/Forms/EditSelectedUser.resx diff --git a/TestBenchFramework/Forms/EditUsers.Designer.cs b/Users/Forms/EditUsers.Designer.cs similarity index 98% rename from TestBenchFramework/Forms/EditUsers.Designer.cs rename to Users/Forms/EditUsers.Designer.cs index c017219cc..4a1a35a7b 100644 --- a/TestBenchFramework/Forms/EditUsers.Designer.cs +++ b/Users/Forms/EditUsers.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2017 Sensus Metering Systems /// -namespace TBF.Forms +namespace Users.Forms { partial class EditUsers { diff --git a/TestBenchFramework/Forms/EditUsers.cs b/Users/Forms/EditUsers.cs similarity index 97% rename from TestBenchFramework/Forms/EditUsers.cs rename to Users/Forms/EditUsers.cs index 22fabca2e..6cfe8e205 100644 --- a/TestBenchFramework/Forms/EditUsers.cs +++ b/Users/Forms/EditUsers.cs @@ -1,15 +1,15 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2017 Sensus Metering Systems /// using System; using System.Collections.Generic; using System.Windows.Forms; using NHibernate; using Config.Entities; -using TBF.Resources; +using Users.Resources; -namespace TBF.Forms +namespace Users.Forms { public partial class EditUsers: Form { diff --git a/TestBenchFramework/Forms/EditUsers.resx b/Users/Forms/EditUsers.resx similarity index 100% rename from TestBenchFramework/Forms/EditUsers.resx rename to Users/Forms/EditUsers.resx diff --git a/TestBenchFramework/Forms/LoginDlg.Designer.cs b/Users/Forms/LoginDlg.Designer.cs similarity index 98% rename from TestBenchFramework/Forms/LoginDlg.Designer.cs rename to Users/Forms/LoginDlg.Designer.cs index 22d9dcce5..8f047efc4 100644 --- a/TestBenchFramework/Forms/LoginDlg.Designer.cs +++ b/Users/Forms/LoginDlg.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2016 Sensus Metering Systems +/// Copyright (c) 2017 Sensus Metering Systems /// -namespace TBF.Forms +namespace Users.Forms { partial class LoginDlg { diff --git a/TestBenchFramework/Forms/LoginDlg.cs b/Users/Forms/LoginDlg.cs similarity index 95% rename from TestBenchFramework/Forms/LoginDlg.cs rename to Users/Forms/LoginDlg.cs index ff87d96af..91c3e5855 100644 --- a/TestBenchFramework/Forms/LoginDlg.cs +++ b/Users/Forms/LoginDlg.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2016 Sensus Metering Systems +/// Copyright (c) 2017 Sensus Metering Systems /// using System; using System.Collections.Generic; @@ -8,9 +8,9 @@ using System.Data; using System.Drawing; using System.Text; using System.Windows.Forms; -using TBF.Resources; +using Users.Resources; -namespace TBF.Forms +namespace Users.Forms { /// /// Provides login dialog as well as user authorization using TBF.User.Authorize(...) @@ -24,7 +24,9 @@ namespace TBF.Forms Config.Grp.GID requiredGroupMembership = Config.Grp.GID.Invalid; bool noDatabase; + Config.Entities.LoginMethod method; + public string VersionString; /// @@ -86,7 +88,7 @@ namespace TBF.Forms void Localize() { - Text = Strings.User_Login + " TBF v." + Program.Version; + Text = Strings.User_Login + (string.IsNullOrEmpty(VersionString) ? "" : (" " + VersionString)); aliasLabel.Text = GetAliasLabel(); passwordLabel.Text = Strings.Password; okButton.Text = Strings.OkBtnText; @@ -141,7 +143,6 @@ namespace TBF.Forms { DialogResult = DialogResult.OK; Close(); - if (Program.MainWnd != null) Program.MainWnd.UpdateUser(); return; } diff --git a/TestBenchFramework/Forms/LoginDlg.resx b/Users/Forms/LoginDlg.resx similarity index 100% rename from TestBenchFramework/Forms/LoginDlg.resx rename to Users/Forms/LoginDlg.resx diff --git a/Users/Resources/Strings.Designer.cs b/Users/Resources/Strings.Designer.cs new file mode 100644 index 000000000..d390b608d --- /dev/null +++ b/Users/Resources/Strings.Designer.cs @@ -0,0 +1,261 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Users.Resources { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Strings { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Strings() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Users.Resources.Strings", typeof(Strings).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to Add. + /// + internal static string AddBtnText { + get { + return ResourceManager.GetString("AddBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Cancel. + /// + internal static string CancelBtnText { + get { + return ResourceManager.GetString("CancelBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Description. + /// + internal static string DescriptionColHdr { + get { + return ResourceManager.GetString("DescriptionColHdr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Edit User. + /// + internal static string Edit_User { + get { + return ResourceManager.GetString("Edit_User", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Edit. + /// + internal static string EditBtnText { + get { + return ResourceManager.GetString("EditBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Error. + /// + internal static string Error { + get { + return ResourceManager.GetString("Error", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Name and Surname. + /// + internal static string Full_name { + get { + return ResourceManager.GetString("Full_name", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Groups. + /// + internal static string Groups { + get { + return ResourceManager.GetString("Groups", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ID. + /// + internal static string ID { + get { + return ResourceManager.GetString("ID", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Invalid username or password. + /// + internal static string Invalid_username_or_password { + get { + return ResourceManager.GetString("Invalid_username_or_password", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to (max. {0} alphanumeric characters). + /// + internal static string max_0_alphanum_chars { + get { + return ResourceManager.GetString("max_0_alphanum_chars", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Name. + /// + internal static string Name { + get { + return ResourceManager.GetString("Name", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to OK. + /// + internal static string OkBtnText { + get { + return ResourceManager.GetString("OkBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Password. + /// + internal static string Password { + get { + return ResourceManager.GetString("Password", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Fields 'Password' and 'Repeat password' are different. Retype them please.. + /// + internal static string Passwords_different { + get { + return ResourceManager.GetString("Passwords_different", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Remove. + /// + internal static string RemoveBtnText { + get { + return ResourceManager.GetString("RemoveBtnText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Repeat password. + /// + internal static string Repeat_password { + get { + return ResourceManager.GetString("Repeat_password", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to User code. + /// + internal static string User_code { + get { + return ResourceManager.GetString("User_code", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to User Login. + /// + internal static string User_Login { + get { + return ResourceManager.GetString("User_Login", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to User Management. + /// + internal static string User_Management { + get { + return ResourceManager.GetString("User_Management", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to User name. + /// + internal static string User_name { + get { + return ResourceManager.GetString("User_name", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to This Username has already been taken. Please choose another one.. + /// + internal static string Username_taken { + get { + return ResourceManager.GetString("Username_taken", resourceCulture); + } + } + } +} diff --git a/Users/Resources/Strings.cs.resx b/Users/Resources/Strings.cs.resx new file mode 100644 index 000000000..411c9a30d --- /dev/null +++ b/Users/Resources/Strings.cs.resx @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Přidat + + + Zrušit + + + Popis + + + Editovat + + + Editace uživatele + + + Chyba + + + Jméno a příjmení + + + Skupiny + + + ID + + + Neplatné uživatelské jméno či heslo + + + (max. {0} alfanumerických znaků) + + + Jméno + + + OK + + + Heslo + + + 'Heslo' a 'Zopakujte heslo' jsou rozličné. Opravte je prosím. + + + Odstranit + + + Zopakujte heslo + + + Toto uživatelské jméno již bylo použito. Prosím, vyberte jiné. + + + Kód uživatele + + + Uživatelský login + + + Správa uživatelů + + + Uživatelské jméno + + \ No newline at end of file diff --git a/Users/Resources/Strings.de.resx b/Users/Resources/Strings.de.resx new file mode 100644 index 000000000..d5266fee8 --- /dev/null +++ b/Users/Resources/Strings.de.resx @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Neu + + + Abbrechen + + + Beschreibung + + + Bearbeiten + + + Benutzer einrichten + + + Fehler + + + Vorname und Nachname + + + Gruppen + + + ID + + + Ungültiger Benutzername oder Passwort + + + (maximal {0} alphanumerische Zeichen) + + + Name + + + OK + + + Passwort + + + Felder 'Password' und 'Passwort wiederholen' sind anders, wiederholen sie bitte. + + + Tabelle entfernen + + + Passwort wiederholen + + + Dieser Benutzername ist bereits vergeben. Bitte wählen Sie einen anderen. + + + Benutzernummer + + + Anmelden + + + Benutzerverwaltung + + + Benutzername + + \ No newline at end of file diff --git a/Users/Resources/Strings.pl.resx b/Users/Resources/Strings.pl.resx new file mode 100644 index 000000000..61cb9b154 --- /dev/null +++ b/Users/Resources/Strings.pl.resx @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Dodaj + + + Anuluj + + + Opis + + + Edycja + + + Edytuj użytkownika + + + Błąd + + + Imię i Nazwisko + + + Grupy + + + ID + + + Nieprawidłowa nazwa użytkownika lub hasło + + + (max. {0} znaków alfanumerycznych) + + + Nazwa + + + OK + + + Hasło + + + Hasło != Hasło 2 + + + Usuń + + + Hasło 2 + + + Ta Nazwa użytkownika jest już zajęta. Proszę wybrać inną. + + + Kod użytkownika + + + Login użytkownika + + + Uprawnienia użytkownika + + + Nazwa użytkownika + + \ No newline at end of file diff --git a/Users/Resources/Strings.resx b/Users/Resources/Strings.resx new file mode 100644 index 000000000..4775be9f9 --- /dev/null +++ b/Users/Resources/Strings.resx @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Add + + + Cancel + + + Description + + + Edit + + + Edit User + + + Error + + + Name and Surname + + + Groups + + + ID + + + Invalid username or password + + + (max. {0} alphanumeric characters) + + + Name + + + OK + + + Password + + + Fields 'Password' and 'Repeat password' are different. Retype them please. + + + Remove + + + Repeat password + + + This Username has already been taken. Please choose another one. + + + User code + + + User Login + + + User Management + + + User name + + \ No newline at end of file diff --git a/Users/Resources/Strings.ru.resx b/Users/Resources/Strings.ru.resx new file mode 100644 index 000000000..7a6e58049 --- /dev/null +++ b/Users/Resources/Strings.ru.resx @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Добавить + + + Отмена + + + Описание + + + Редактировать + + + Редактировать пользователя + + + Ошибка + + + Имя и фамилия + + + Группы + + + ID + + + Неправильное имя пользователя или пароль + + + (макс. {0} вуквенно-цифровых символов) + + + Имя + + + OK + + + Пароль + + + Пароль != Пароль 2 + + + Удалить + + + Пароль 2 + + + Это Имя пользователя уже принято. Пожалуйста, выберите другое. + + + Код пользователя + + + Логин пользователя + + + Управление пользователями + + + Имя пользователя + + \ No newline at end of file diff --git a/Users/Resources/Strings.zh-CN.resx b/Users/Resources/Strings.zh-CN.resx new file mode 100644 index 000000000..254986fc2 --- /dev/null +++ b/Users/Resources/Strings.zh-CN.resx @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + 添加 Add + + + 取消 Cancel + + + 描述 + + + 编辑 Edit + + + 编辑用户 + + + 错误 Error + + + + + + 组别 + + + ID + + + 无效的用户名或密码 + + + （最大 {0} 字母数字字符） + + + 名称 + + + 好 OK + + + 密码 + + + 密码 != 密码2 + + + 删除 Remove + + + 密码2 + + + 此用户名已被占用。请选择另外一个。 + + + + + + 用户登录 + + + 用户管理 + + + 用户名 + + \ No newline at end of file diff --git a/Users/Users.csproj b/Users/Users.csproj index 22c2c6b19..824bd31fb 100644 --- a/Users/Users.csproj +++ b/Users/Users.csproj @@ -48,6 +48,8 @@ + + @@ -58,9 +60,32 @@ + + Form + + + EditSelectedUser.cs + + + Form + + + EditUsers.cs + + + Form + + + LoginDlg.cs + + + True + True + Strings.resx + @@ -69,6 +94,26 @@ Config + + + EditSelectedUser.cs + + + EditUsers.cs + + + LoginDlg.cs + + + + + + ResXFileCodeGenerator + Strings.Designer.cs + + + +