From c3075876ce6d12f58c7fbb57730b53d33ac4f1e1 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Wed, 1 Nov 2017 13:48:33 -0400 Subject: [PATCH] Cleans up TextPrompt() --- TGControlPanel/Program.cs | 4 +++- TGServerService/Service.cs | 2 +- TGServiceInterface/Interface.cs | 8 ++------ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/TGControlPanel/Program.cs b/TGControlPanel/Program.cs index a8150bc85d..1b96f7ff6d 100644 --- a/TGControlPanel/Program.cs +++ b/TGControlPanel/Program.cs @@ -57,7 +57,9 @@ namespace TGControlPanel Height = 150, FormBorderStyle = FormBorderStyle.FixedDialog, Text = caption, - StartPosition = FormStartPosition.CenterScreen + StartPosition = FormStartPosition.CenterScreen, + MaximizeBox = false, + MinimizeBox = false, }; Label textLabel = new Label() { Left = 50, Top = 20, Text = text, AutoSize = true }; TextBox textBox = new TextBox() { Left = 50, Top = 50, Width = 400 }; diff --git a/TGServerService/Service.cs b/TGServerService/Service.cs index 7e96ab951e..bdbc576208 100644 --- a/TGServerService/Service.cs +++ b/TGServerService/Service.cs @@ -230,7 +230,7 @@ namespace TGServerService /// void SetupService() { - serviceHost = CreateHost(this, Interface.ServiceInterfaceName); + serviceHost = CreateHost(this, Interface.MasterInterfaceName); AddEndpoint(serviceHost, typeof(ITGSService)); AddEndpoint(serviceHost, typeof(ITGConnectivity)); serviceHost.Authorization.ServiceAuthorizationManager = new AdministrativeAuthorizationManager(); //only admins can diddle us diff --git a/TGServiceInterface/Interface.cs b/TGServiceInterface/Interface.cs index 654b8102a3..9a84730eff 100644 --- a/TGServiceInterface/Interface.cs +++ b/TGServiceInterface/Interface.cs @@ -34,11 +34,7 @@ namespace TGServiceInterface /// /// Base name of communication URLs /// - const string MasterInterfaceName = "TGStationServerService"; - /// - /// Base name of the root service URLs - /// - public const string ServiceInterfaceName = MasterInterfaceName + "/Service"; + public const string MasterInterfaceName = "TGStationServerService"; /// /// Base name of instance URLs /// @@ -323,7 +319,7 @@ namespace TGServiceInterface /// Thrown if isn't a valid component ChannelFactory CreateChannel(string instanceName) { - var accessPath = instanceName == null ? ServiceInterfaceName : String.Format("{0}/{1}", InstanceInterfaceName, instanceName); + var accessPath = instanceName == null ? MasterInterfaceName : String.Format("{0}/{1}", InstanceInterfaceName, instanceName); var InterfaceName = typeof(T).Name; if (HTTPSURL == null)