GenesisToolBox: - using UserAccessCtrl
This commit is contained in:
Thomas Wiedebusch
parent
ba22c23286
commit
195992e542
@ -354,6 +354,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LaaPackages.Extensions", "L
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LaaProductionWeb.Resources", "LaaPackages\LaaProductionWeb.Resources\LaaProductionWeb.Resources.csproj", "{9E070488-15DE-418A-8606-5B79056C6E9F}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UserAccessCtrl", "Utils\UserAccessCtrl\UserAccessCtrl.csproj", "{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassAccess", "Utils\ClassAccess\ClassAccess.csproj", "{30BF7357-0B6C-498D-8123-5AACC66B3E5F}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SharedMSBuildProjectFiles) = preSolution
|
||||
Utils\DateTimeServerShared\DateTimeServerShared.projitems*{4806d89a-fbfb-41bc-aaa7-2242444bf55a}*SharedItemsImports = 4
|
||||
@ -5572,6 +5576,134 @@ Global
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.XP32bit|x64.Build.0 = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.XP32bit|x86.ActiveCfg = Release|Any CPU
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F}.XP32bit|x86.Build.0 = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}._MANUAL_CONTROL|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}._MANUAL_CONTROL|Any CPU.Build.0 = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}._MANUAL_CONTROL|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}._MANUAL_CONTROL|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}._MANUAL_CONTROL|x64.ActiveCfg = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}._MANUAL_CONTROL|x64.Build.0 = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}._MANUAL_CONTROL|x86.ActiveCfg = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}._MANUAL_CONTROL|x86.Build.0 = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.COM|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.COM|Any CPU.Build.0 = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.COM|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.COM|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.COM|x64.ActiveCfg = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.COM|x64.Build.0 = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.COM|x86.ActiveCfg = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.COM|x86.Build.0 = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.GenesisDisplayTool_V01|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.GenesisDisplayTool_V01|Any CPU.Build.0 = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.GenesisDisplayTool_V01|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.GenesisDisplayTool_V01|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.GenesisDisplayTool_V01|x64.ActiveCfg = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.GenesisDisplayTool_V01|x64.Build.0 = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.GenesisDisplayTool_V01|x86.ActiveCfg = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.GenesisDisplayTool_V01|x86.Build.0 = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.PerformTest|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.PerformTest|Any CPU.Build.0 = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.PerformTest|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.PerformTest|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.PerformTest|x64.ActiveCfg = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.PerformTest|x64.Build.0 = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.PerformTest|x86.ActiveCfg = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.PerformTest|x86.Build.0 = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.Release|x64.Build.0 = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.Release|x86.Build.0 = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.ReleaseTest|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.ReleaseTest|Any CPU.Build.0 = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.ReleaseTest|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.ReleaseTest|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.ReleaseTest|x64.ActiveCfg = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.ReleaseTest|x64.Build.0 = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.ReleaseTest|x86.ActiveCfg = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.ReleaseTest|x86.Build.0 = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.XP32bit|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.XP32bit|Any CPU.Build.0 = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.XP32bit|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.XP32bit|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.XP32bit|x64.ActiveCfg = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.XP32bit|x64.Build.0 = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.XP32bit|x86.ActiveCfg = Release|Any CPU
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90}.XP32bit|x86.Build.0 = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}._MANUAL_CONTROL|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}._MANUAL_CONTROL|Any CPU.Build.0 = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}._MANUAL_CONTROL|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}._MANUAL_CONTROL|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}._MANUAL_CONTROL|x64.ActiveCfg = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}._MANUAL_CONTROL|x64.Build.0 = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}._MANUAL_CONTROL|x86.ActiveCfg = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}._MANUAL_CONTROL|x86.Build.0 = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.COM|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.COM|Any CPU.Build.0 = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.COM|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.COM|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.COM|x64.ActiveCfg = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.COM|x64.Build.0 = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.COM|x86.ActiveCfg = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.COM|x86.Build.0 = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.GenesisDisplayTool_V01|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.GenesisDisplayTool_V01|Any CPU.Build.0 = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.GenesisDisplayTool_V01|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.GenesisDisplayTool_V01|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.GenesisDisplayTool_V01|x64.ActiveCfg = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.GenesisDisplayTool_V01|x64.Build.0 = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.GenesisDisplayTool_V01|x86.ActiveCfg = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.GenesisDisplayTool_V01|x86.Build.0 = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.PerformTest|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.PerformTest|Any CPU.Build.0 = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.PerformTest|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.PerformTest|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.PerformTest|x64.ActiveCfg = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.PerformTest|x64.Build.0 = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.PerformTest|x86.ActiveCfg = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.PerformTest|x86.Build.0 = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.Release|x64.Build.0 = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.Release|x86.Build.0 = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.ReleaseTest|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.ReleaseTest|Any CPU.Build.0 = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.ReleaseTest|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.ReleaseTest|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.ReleaseTest|x64.ActiveCfg = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.ReleaseTest|x64.Build.0 = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.ReleaseTest|x86.ActiveCfg = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.ReleaseTest|x86.Build.0 = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.XP32bit|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.XP32bit|Any CPU.Build.0 = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.XP32bit|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.XP32bit|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.XP32bit|x64.ActiveCfg = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.XP32bit|x64.Build.0 = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.XP32bit|x86.ActiveCfg = Release|Any CPU
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F}.XP32bit|x86.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
@ -5716,6 +5848,8 @@ Global
|
||||
{8BEFD3AC-BB21-4B62-8D9A-CF8CBFD439EB} = {2E31C385-4FFC-473E-9C00-D7DC48140704}
|
||||
{15A06398-ECB6-49C9-ACB4-52A495A886A6} = {2E31C385-4FFC-473E-9C00-D7DC48140704}
|
||||
{9E070488-15DE-418A-8606-5B79056C6E9F} = {2E31C385-4FFC-473E-9C00-D7DC48140704}
|
||||
{2D55BBD1-5373-484C-8781-C6ECEAFC2A90} = {7A0EE7B8-6B7E-41E9-B679-319C8CA48CF1}
|
||||
{30BF7357-0B6C-498D-8123-5AACC66B3E5F} = {7A0EE7B8-6B7E-41E9-B679-319C8CA48CF1}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {4BCB7B69-696C-436A-86F7-C91EA5588164}
|
||||
|
||||
@ -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" +
|
||||
@"Network Connection Error!" +
|
||||
ex.Message);
|
||||
|
||||
Close();
|
||||
@ -107,8 +107,8 @@
|
||||
}
|
||||
if (!access)
|
||||
{
|
||||
MessageBox.Show("GenesisToolBox\n\n" +
|
||||
"Your version licence is expired!\n\n" +
|
||||
MessageBox.Show(@"GenesisToolBox" +
|
||||
@"Your version licence is expired!" +
|
||||
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)
|
||||
|
||||
58
Common/Ui/GenesisToolBox/frmMainForm.Designer.cs
generated
58
Common/Ui/GenesisToolBox/frmMainForm.Designer.cs
generated
@ -51,10 +51,10 @@
|
||||
this.btnFiles = new System.Windows.Forms.Button();
|
||||
this.btnLegacyTestApp = new System.Windows.Forms.Button();
|
||||
this.menu = new System.Windows.Forms.MenuStrip();
|
||||
this.optionsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.loginMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.logoutMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.changePassword = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.menuItemOptions = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.menuItemLogin = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.menuItemLogout = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.menuItemChangePwd = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.gpGerneral.SuspendLayout();
|
||||
this.gpLAA.SuspendLayout();
|
||||
this.gbDeveloper.SuspendLayout();
|
||||
@ -324,7 +324,7 @@
|
||||
//
|
||||
this.menu.AutoSize = false;
|
||||
this.menu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||
this.optionsMenuItem});
|
||||
this.menuItemOptions});
|
||||
this.menu.Location = new System.Drawing.Point(0, 0);
|
||||
this.menu.Name = "menu";
|
||||
this.menu.Size = new System.Drawing.Size(361, 24);
|
||||
@ -333,35 +333,35 @@
|
||||
//
|
||||
// optionsMenuItem
|
||||
//
|
||||
this.optionsMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||
this.loginMenuItem,
|
||||
this.logoutMenuItem,
|
||||
this.changePassword});
|
||||
this.optionsMenuItem.Name = "optionsMenuItem";
|
||||
this.optionsMenuItem.Size = new System.Drawing.Size(61, 20);
|
||||
this.optionsMenuItem.Text = "Options";
|
||||
this.optionsMenuItem.TextDirection = System.Windows.Forms.ToolStripTextDirection.Horizontal;
|
||||
this.menuItemOptions.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||
this.menuItemLogin,
|
||||
this.menuItemLogout,
|
||||
this.menuItemChangePwd});
|
||||
this.menuItemOptions.Name = "menuItemOptions";
|
||||
this.menuItemOptions.Size = new System.Drawing.Size(61, 20);
|
||||
this.menuItemOptions.Text = "Options";
|
||||
this.menuItemOptions.TextDirection = System.Windows.Forms.ToolStripTextDirection.Horizontal;
|
||||
//
|
||||
// loginMenuItem
|
||||
//
|
||||
this.loginMenuItem.Name = "loginMenuItem";
|
||||
this.loginMenuItem.Size = new System.Drawing.Size(180, 22);
|
||||
this.loginMenuItem.Text = "Login";
|
||||
this.loginMenuItem.Click += new System.EventHandler(this.OnLoginClick);
|
||||
this.menuItemLogin.Name = "menuItemLogin";
|
||||
this.menuItemLogin.Size = new System.Drawing.Size(180, 22);
|
||||
this.menuItemLogin.Text = "Login";
|
||||
this.menuItemLogin.Click += new System.EventHandler(this.OnLoginClick);
|
||||
//
|
||||
// logoutMenuItem
|
||||
//
|
||||
this.logoutMenuItem.Name = "logoutMenuItem";
|
||||
this.logoutMenuItem.Size = new System.Drawing.Size(180, 22);
|
||||
this.logoutMenuItem.Text = "Logout";
|
||||
this.logoutMenuItem.Click += new System.EventHandler(this.OnLogoutClick);
|
||||
this.menuItemLogout.Name = "menuItemLogout";
|
||||
this.menuItemLogout.Size = new System.Drawing.Size(180, 22);
|
||||
this.menuItemLogout.Text = "Logout";
|
||||
this.menuItemLogout.Click += new System.EventHandler(this.OnLogoutClick);
|
||||
//
|
||||
// resetPasswordMenuItem
|
||||
//
|
||||
this.changePassword.Name = "resetPasswordMenuItem";
|
||||
this.changePassword.Size = new System.Drawing.Size(180, 22);
|
||||
this.changePassword.Text = "Change Password";
|
||||
this.changePassword.Click += new System.EventHandler(this.OnChangePasswordClick);
|
||||
this.menuItemChangePwd.Name = "resetPasswordMenuItem";
|
||||
this.menuItemChangePwd.Size = new System.Drawing.Size(180, 22);
|
||||
this.menuItemChangePwd.Text = "Change Password";
|
||||
this.menuItemChangePwd.Click += new System.EventHandler(this.OnChangePasswordClick);
|
||||
//
|
||||
// FrmMainForm
|
||||
//
|
||||
@ -416,10 +416,10 @@
|
||||
private System.Windows.Forms.Button button1;
|
||||
private System.Windows.Forms.Button btnLowLevelTools;
|
||||
private System.Windows.Forms.MenuStrip menu;
|
||||
private System.Windows.Forms.ToolStripMenuItem optionsMenuItem;
|
||||
private System.Windows.Forms.ToolStripMenuItem loginMenuItem;
|
||||
private System.Windows.Forms.ToolStripMenuItem logoutMenuItem;
|
||||
private System.Windows.Forms.ToolStripMenuItem changePassword;
|
||||
private System.Windows.Forms.ToolStripMenuItem menuItemOptions;
|
||||
private System.Windows.Forms.ToolStripMenuItem menuItemLogin;
|
||||
private System.Windows.Forms.ToolStripMenuItem menuItemLogout;
|
||||
private System.Windows.Forms.ToolStripMenuItem menuItemChangePwd;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user