just commit laa_packages + frmMainForm

Common/.vs/config/applicationhost.config

@@ -155,7 +155,7 @@
 			</site>
             <site name="MeterProcessState" id="2">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="D:\Projekte\SENSUS_GitLab\LAA_PRODUCTION\Common\Service\MeterProcessState" />
+                    <virtualDirectory path="/" physicalPath="C:\Users\SZLATEV\source\repos\laa_production\Common\Service\MeterProcessState" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:56011:localhost" />

Common/Ui/GenesisToolBox/frmMainForm.cs

@@ -1,4 +1,7 @@
-namespace Xylem.Common.Ui.GenesisToolBox
+using Xylem.Common.Ui.GenesisToolBox.Ctls;
+using Xylem.Common.Ui.GenesisToolBox.Infrastructure;
+
+namespace Xylem.Common.Ui.GenesisToolBox
 {
     using global::GenesisToolBox;
 
@@ -9,8 +12,6 @@
     using System.Windows.Forms;
 
     using CommonCore.Consts;
-    using Ctls;
-    using Infrastructure;
     using Utils.Logging;
     using System.Collections.Generic;
 
@@ -27,8 +28,8 @@
             InitializeComponent();
             InitializeFormState();
 
-            optionsMenuItem.Text = Software.UserName;
-            Text = $"{Text} {SoftwareVersion.Current.VersionString}";
+            menuItemOptions.Text = Software.UserName;
+            Text = $@"{Text} {SoftwareVersion.Current.VersionString}";
             var logger = NLogHelper.CreateOrGetLogger("GenesisToolBox");
             logger.Info($"GenesisToolBox {SoftwareVersion.Current}");
 
@@ -89,9 +90,8 @@
             }
             catch (Exception ex)
             {
-                MessageBox.Show("GenesisToolBox\n\n" +
-                                "Starting in OfflineMode\n\n" +
-                                "Your version (NA) could not be verified!\n\n" +
+                MessageBox.Show(@"GenesisToolBox\n\n" +
+                                @"Network Connection Error!\n\n" +
                                 ex.Message);
 
                 Close();
@@ -107,8 +107,8 @@
             }
             if (!access)
             {
-                MessageBox.Show("GenesisToolBox\n\n" +
-                                "Your version licence is expired!\n\n" +
+                MessageBox.Show(@"GenesisToolBox\n\n" +
+                                @"Your version licence is expired!\n\n" +
                                 SoftwareVersion.Current);
 
                 Close();
@@ -304,7 +304,7 @@
 
         private void btnLegacyTestApp_Click(Object sender, EventArgs e)
         {
-            var form = new FrmManCalibration();
+            var form = new FrmLegacyTestApp();
             form.Show();
             form.Closed += Form_Closed;
             Hide();
@@ -419,7 +419,9 @@
         /// </summary>
         private void SetSoftwareFunctions()
         {
-            changePassword.Enabled = Software.IsAutenticated;
+            menuItemChangePwd.Enabled = Software.IsAutenticated;
+            menuItemLogout.Enabled = Software.IsAutenticated;
+            menuItemLogin.Enabled = !Software.IsAutenticated;
 
             btnSetup.Tag = SoftwareFunctions.GENERAL_SETUP;
             btnAlarm.Tag = SoftwareFunctions.GENERAL_ALARM;
@@ -452,7 +454,7 @@
             Controls.Add(new Label()
             {
                 Dock = DockStyle.Fill,
-                Text = "Genesis toolbox is currently not available.",
+                Text = @"Genesis toolbox is currently not available.",
                 TextAlign = ContentAlignment.MiddleCenter,
                 Font = new Font(FontFamily.GenericSansSerif, 10, FontStyle.Bold),
                 ForeColor = Color.DarkRed,
@@ -496,7 +498,7 @@
                 }
             }
 
-            optionsMenuItem.Text = Software.UserName;
+            menuItemOptions.Text = Software.UserName;
         }
 
         private void ShowAvailableMenuItems(ToolStripMenuItem toolStripMenuItem)