Merge upstream

This commit is contained in:
Cyberboss
2017-11-12 00:39:22 -05:00
4 changed files with 6 additions and 6 deletions
+1 -3
View File
@@ -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)
{
+5 -1
View File
@@ -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);
}
-1
View File
@@ -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;