AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-19 04:07:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

GUI: Fix ampersands not showing in 'insert token' popup dialog

Browse Source
This commit is contained in:
UnknownShadow200 2021-05-16 22:05:26 +10:00
parent ff11c110f4
commit 1a4ccea029
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
GUI/Popups/TokenSelector.cs
View File

@ -37,9 +37,10 @@ namespace MCGalaxy.Gui.Popups {
btn.TabIndex = index; btn.TabIndex = index;
toolTip.SetToolTip(btn, token.Description); toolTip.SetToolTip(btn, token.Description);
btn.Text = token.Trigger; btn.Text = token.Trigger;
btn.Click += delegate { Token = token.Trigger; DialogResult = DialogResult.OK; Close(); }; btn.Click += delegate { Token = token.Trigger; DialogResult = DialogResult.OK; Close(); };
btn.Margin = new Padding(0); btn.Margin = new Padding(0);
btn.UseMnemonic = false;
btn.UseVisualStyleBackColor = false; btn.UseVisualStyleBackColor = false;
btn.Font = new Font("Microsoft Sans Serif", 9.5F, FontStyle.Regular, GraphicsUnit.Point, 0); btn.Font = new Font("Microsoft Sans Serif", 9.5F, FontStyle.Regular, GraphicsUnit.Point, 0);
Controls.Add(btn); Controls.Add(btn);

4
MCGalaxy/Server/Maintenance/Updater.cs
View File

@ -31,7 +31,7 @@ namespace MCGalaxy {
public const string BaseURL = "https://raw.githubusercontent.com/UnknownShadow200/MCGalaxy/master/"; public const string BaseURL = "https://raw.githubusercontent.com/UnknownShadow200/MCGalaxy/master/";
public const string UploadsURL = "https://github.com/UnknownShadow200/MCGalaxy/tree/master/Uploads"; public const string UploadsURL = "https://github.com/UnknownShadow200/MCGalaxy/tree/master/Uploads";
const string CurrentVersionFile = BaseURL + "Uploads/current_version.txt"; const string CurrentVersionURL = BaseURL + "Uploads/current_version.txt";
#if TEN_BIT_BLOCKS #if TEN_BIT_BLOCKS
const string dllURL = BaseURL + "Uploads/MCGalaxy_infid.dll?raw=true"; const string dllURL = BaseURL + "Uploads/MCGalaxy_infid.dll?raw=true";
#else #else
@ -53,7 +53,7 @@ namespace MCGalaxy {
WebClient client = HttpUtil.CreateWebClient(); WebClient client = HttpUtil.CreateWebClient();
try { try {
string latest = client.DownloadString(CurrentVersionFile); string latest = client.DownloadString(CurrentVersionURL);
if (new Version(Server.Version) >= new Version(latest)) { if (new Version(Server.Version) >= new Version(latest)) {
Logger.Log(LogType.SystemActivity, "No update found!"); Logger.Log(LogType.SystemActivity, "No update found!");