ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-14 12:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Protect users from themselves

Browse source 
Add checks for adding blank and duplicate repos
This commit is contained in:
Cara 2021-01-14 00:33:13 +10:30
parent f5d2093db9
commit 4576a2977e
1 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Dalamud/Interface/DalamudSettingsWindow.cs
View file

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Linq; using System.Linq;
using System.Numerics; using System.Numerics;
using System.Threading.Tasks;
using System.Windows.Forms.VisualStyles; using System.Windows.Forms.VisualStyles;
using CheapLoc; using CheapLoc;
using Dalamud.Configuration; using Dalamud.Configuration;
@ -95,6 +96,7 @@ namespace Dalamud.Interface
private bool autoUpdatePlugins; private bool autoUpdatePlugins;
private string thirdRepoTempUrl = string.Empty; private string thirdRepoTempUrl = string.Empty;
private string thirdRepoAddError = string.Empty;
#region Experimental #region Experimental
@ -205,7 +207,6 @@ namespace Dalamud.Interface
ImGui.Columns(3); ImGui.Columns(3);
ImGui.SetColumnWidth(0, ImGui.GetWindowWidth() - 350); ImGui.SetColumnWidth(0, ImGui.GetWindowWidth() - 350);
ImGui.SetColumnWidth(1, 60); ImGui.SetColumnWidth(1, 60);
ImGui.SetColumnWidth(2, 60);
ImGui.Separator(); ImGui.Separator();
@ -229,7 +230,7 @@ namespace Dalamud.Interface
foreach (var thirdRepoSetting in this.thirdRepoList) { foreach (var thirdRepoSetting in this.thirdRepoList) {
var isEnabled = thirdRepoSetting.IsEnabled; var isEnabled = thirdRepoSetting.IsEnabled;
ImGui.PushID(thirdRepoSetting.Url); ImGui.PushID($"thirdRepo_{thirdRepoSetting.Url}");
ImGui.Text(thirdRepoSetting.Url); ImGui.Text(thirdRepoSetting.Url);
ImGui.NextColumn(); ImGui.NextColumn();
@ -250,20 +251,30 @@ namespace Dalamud.Interface
this.thirdRepoList.Remove(toRemove); this.thirdRepoList.Remove(toRemove);
} }
ImGui.SetNextItemWidth(-1);
ImGui.InputText("##thirdRepoUrlInput", ref this.thirdRepoTempUrl, 300); ImGui.InputText("##thirdRepoUrlInput", ref this.thirdRepoTempUrl, 300);
ImGui.NextColumn(); ImGui.NextColumn();
ImGui.NextColumn(); ImGui.NextColumn();
ImGui.PushFont(InterfaceManager.IconFont); ImGui.PushFont(InterfaceManager.IconFont);
if (ImGui.Button(FontAwesomeIcon.Plus.ToIconString())) { if (!string.IsNullOrEmpty(this.thirdRepoTempUrl) && ImGui.Button(FontAwesomeIcon.Plus.ToIconString())) {
this.thirdRepoList.Add(new ThirdRepoSetting { if (this.thirdRepoList.Any(r => string.Equals(r.Url, this.thirdRepoTempUrl, StringComparison.InvariantCultureIgnoreCase))) {
Url = this.thirdRepoTempUrl, this.thirdRepoAddError = Loc.Localize("DalamudThirdRepoExists", "Repo already exists.");
IsEnabled = true Task.Delay(5000).ContinueWith(t => this.thirdRepoAddError = string.Empty);
}); } else {
this.thirdRepoList.Add(new ThirdRepoSetting {
Url = this.thirdRepoTempUrl,
IsEnabled = true
});
this.thirdRepoTempUrl = string.Empty; this.thirdRepoTempUrl = string.Empty;
}
} }
ImGui.PopFont(); ImGui.PopFont();
if (!string.IsNullOrEmpty(this.thirdRepoAddError)) {
ImGui.SameLine();
ImGui.TextColored(new Vector4(1, 0, 0, 1), this.thirdRepoAddError);
}
ImGui.Columns(1); ImGui.Columns(1);
ImGui.EndTabItem(); ImGui.EndTabItem();