mirror of
https://github.com/tgstation/tgstation-server.git
synced 2026-08-26 14:37:44 +01:00
Merge upstream
This commit is contained in:
@@ -30,7 +30,7 @@ namespace TGControlPanel
|
||||
}
|
||||
}
|
||||
|
||||
var latestVer = Interface.GetComponent<ITGByond>().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)
|
||||
{
|
||||
|
||||
@@ -33,7 +33,7 @@ namespace TGControlPanel
|
||||
Interface = I;
|
||||
if (Interface.IsRemoteConnection)
|
||||
{
|
||||
var splits = Interface.GetComponent<ITGSService>().Version().Split(' ');
|
||||
var splits = Interface.GetServiceComponent<ITGLanding>().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);
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -21,7 +21,6 @@ namespace TGControlPanel
|
||||
|
||||
void InitServerPage()
|
||||
{
|
||||
LoadServerPage();
|
||||
projectNameText.LostFocus += ProjectNameText_LostFocus;
|
||||
projectNameText.KeyDown += ProjectNameText_KeyDown;
|
||||
ServerStartBGW.RunWorkerCompleted += ServerStartBGW_RunWorkerCompleted;
|
||||
|
||||
Reference in New Issue
Block a user