From db5cd16ccf0aaaae4678535161ab377a1017aebb Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Sun, 12 Nov 2017 00:36:27 -0500 Subject: [PATCH] Various Control Panel fixes Readded calls to Init* functions Fixes trying to get service version from ITGSService Removes calls Load* function in Init* functions --- TGControlPanel/ControlPanel/ByondPage.cs | 4 +--- TGControlPanel/ControlPanel/ControlPanel.cs | 6 +++++- TGControlPanel/ControlPanel/RepoPage.cs | 1 - TGControlPanel/ControlPanel/ServerPage.cs | 1 - 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/TGControlPanel/ControlPanel/ByondPage.cs b/TGControlPanel/ControlPanel/ByondPage.cs index df284edc12..1e65d7daa2 100644 --- a/TGControlPanel/ControlPanel/ByondPage.cs +++ b/TGControlPanel/ControlPanel/ByondPage.cs @@ -30,7 +30,7 @@ namespace TGControlPanel } } - var latestVer = Interface.GetComponent().GetVersion(ByondVersion.Latest); + var latestVer = BYOND.GetVersion(ByondVersion.Latest); LatestVersionLabel.Text = latestVer; try @@ -41,8 +41,6 @@ namespace TGControlPanel MajorVersionNumeric.Value = maj; } catch { } - - UpdateBYONDButtons(); } private void UpdateButton_Click(object sender, EventArgs e) { diff --git a/TGControlPanel/ControlPanel/ControlPanel.cs b/TGControlPanel/ControlPanel/ControlPanel.cs index dfdc564de0..228de517b7 100644 --- a/TGControlPanel/ControlPanel/ControlPanel.cs +++ b/TGControlPanel/ControlPanel/ControlPanel.cs @@ -33,7 +33,7 @@ namespace TGControlPanel Interface = I; if (Interface.IsRemoteConnection) { - var splits = Interface.GetComponent().Version().Split(' '); + var splits = Interface.GetServiceComponent().Version().Split(' '); Text = String.Format("TGS {0}: {1}:{2}", splits[splits.Length - 1], Interface.HTTPSURL, Interface.HTTPSPort); } Text += " Instance: " + I.InstanceName; @@ -44,6 +44,10 @@ namespace TGControlPanel } Panels.SelectedIndexChanged += Panels_SelectedIndexChanged; Panels.SelectedIndex += Math.Min(Properties.Settings.Default.LastPageIndex, Panels.TabCount - 1); + InitRepoPage(); + InitBYONDPage(); + InitServerPage(); + InitStaticPage(); UpdateSelectedPanel(); InstancesInUse.Add(I.InstanceName, this); } diff --git a/TGControlPanel/ControlPanel/RepoPage.cs b/TGControlPanel/ControlPanel/RepoPage.cs index fd4d775e9a..6e99c62277 100644 --- a/TGControlPanel/ControlPanel/RepoPage.cs +++ b/TGControlPanel/ControlPanel/RepoPage.cs @@ -33,7 +33,6 @@ namespace TGControlPanel RepoBGW.RunWorkerCompleted += RepoBGW_RunWorkerCompleted; RepoBGW.DoWork += RepoBGW_DoWork; BackupTagsList.MouseDoubleClick += BackupTagsList_MouseDoubleClick; - PopulateRepoFields(); } private void BackupTagsList_MouseDoubleClick(object sender, MouseEventArgs e) diff --git a/TGControlPanel/ControlPanel/ServerPage.cs b/TGControlPanel/ControlPanel/ServerPage.cs index 895f3d87ac..88fb0b7ca0 100644 --- a/TGControlPanel/ControlPanel/ServerPage.cs +++ b/TGControlPanel/ControlPanel/ServerPage.cs @@ -24,7 +24,6 @@ namespace TGControlPanel void InitServerPage() { - LoadServerPage(); FullUpdateWorker.RunWorkerCompleted += FullUpdateWorker_RunWorkerCompleted; projectNameText.LostFocus += ProjectNameText_LostFocus; projectNameText.KeyDown += ProjectNameText_KeyDown;