anna
/
NoSoliciting
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: use consistent window/tab ids 

Also rename and remove some configuration properties.
This commit is contained in:
Anna 2021-04-28 12:50:26 -04:00
parent 3cc41e647e
commit 4ee93627ec
4 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NoSoliciting/Filter.PartyFinder.cs
View File

@ -17,7 +17,7 @@ namespace NoSoliciting {
msg = NoSolUtil.Normalise(msg); msg = NoSolUtil.Normalise(msg);
return config.ValidPfSubstrings.Any(needle => msg.ContainsIgnoreCase(needle)) return config.ValidPfSubstrings.Any(needle => msg.ContainsIgnoreCase(needle))
|| config.CompiledPFRegexes.Any(needle => needle.IsMatch(msg)); || config.CompiledPfRegexes.Any(needle => needle.IsMatch(msg));
} }
} }
} }

6
NoSoliciting/Interface/Report.cs
View File

@ -85,8 +85,7 @@ namespace NoSoliciting.Interface {
} }
private void ChatTab() { private void ChatTab() {
var tabTitle = Language.ReportChatTab; if (!ImGui.BeginTabItem($"{Language.ReportChatTab}###chat-report")) {
if (!ImGui.BeginTabItem($"{tabTitle}##chat-report")) {
return; return;
} }
@ -134,8 +133,7 @@ namespace NoSoliciting.Interface {
} }
private void PartyFinderTab() { private void PartyFinderTab() {
var tabTitle = Language.ReportPartyFinderTab; if (!ImGui.BeginTabItem($"{Language.ReportPartyFinderTab}###pf-report")) {
if (!ImGui.BeginTabItem($"{tabTitle}##pf-report")) {
return; return;
} }

10
NoSoliciting/Interface/Settings.cs
View File

@ -82,7 +82,7 @@ namespace NoSoliciting.Interface {
this.DrawBasicMachineLearningConfig(); this.DrawBasicMachineLearningConfig();
} }
if (!ImGui.BeginTabItem(Language.ModelTab)) { if (!ImGui.BeginTabItem($"{Language.ModelTab}###model-tab")) {
return; return;
} }
@ -107,7 +107,7 @@ namespace NoSoliciting.Interface {
} }
private void DrawBasicMachineLearningConfig() { private void DrawBasicMachineLearningConfig() {
if (!ImGui.BeginTabItem(Language.FiltersTab)) { if (!ImGui.BeginTabItem($"{Language.FiltersTab}###filters-tab")) {
return; return;
} }
@ -138,7 +138,7 @@ namespace NoSoliciting.Interface {
} }
private void DrawAdvancedMachineLearningConfig() { private void DrawAdvancedMachineLearningConfig() {
if (!ImGui.BeginTabItem(Language.FiltersTab)) { if (!ImGui.BeginTabItem($"{Language.FiltersTab}###filters-tab")) {
return; return;
} }
@ -190,7 +190,7 @@ namespace NoSoliciting.Interface {
#region Other config #region Other config
private void DrawOtherFilters() { private void DrawOtherFilters() {
if (!ImGui.BeginTabItem(Language.OtherFiltersTab)) { if (!ImGui.BeginTabItem($"{Language.OtherFiltersTab}###other-filters-tab")) {
return; return;
} }
@ -316,7 +316,7 @@ namespace NoSoliciting.Interface {
#endregion #endregion
private void DrawOtherTab() { private void DrawOtherTab() {
if (!ImGui.BeginTabItem(Language.OtherTab)) { if (!ImGui.BeginTabItem($"{Language.OtherTab}###other-tab")) {
return; return;
} }

23
NoSoliciting/PluginConfiguration.cs
View File

@ -14,24 +14,7 @@ namespace NoSoliciting {
private DalamudPluginInterface Interface { get; set; } = null!; private DalamudPluginInterface Interface { get; set; } = null!;
public int Version { get; set; } = 1; public int Version { get; set; } = 2;
[Obsolete("Use FilterStatus")]
public bool FilterChat { get; set; } = true;
[Obsolete("Use FilterStatus")]
public bool FilterFCRecruitments { get; set; } = false;
[Obsolete("Use FilterStatus")]
public bool FilterChatRPAds { get; set; } = false;
[Obsolete("Use FilterStatus")]
public bool FilterPartyFinder { get; set; } = true;
[Obsolete("Use FilterStatus")]
public bool FilterPartyFinderRPAds { get; set; } = false;
public Dictionary<string, bool> FilterStatus { get; private set; } = new();
public bool AdvancedMode { get; set; } public bool AdvancedMode { get; set; }
@ -47,7 +30,7 @@ namespace NoSoliciting {
public List<string> PFRegexes { get; } = new(); public List<string> PFRegexes { get; } = new();
[JsonIgnore] [JsonIgnore]
public List<Regex> CompiledPFRegexes { get; private set; } = new(); public List<Regex> CompiledPfRegexes { get; private set; } = new();
public bool FilterHugeItemLevelPFs { get; set; } public bool FilterHugeItemLevelPFs { get; set; }
@ -116,7 +99,7 @@ namespace NoSoliciting {
.Where(reg => !string.IsNullOrWhiteSpace(reg)) .Where(reg => !string.IsNullOrWhiteSpace(reg))
.Select(reg => new Regex(reg, RegexOptions.Compiled)) .Select(reg => new Regex(reg, RegexOptions.Compiled))
.ToList(); .ToList();
this.CompiledPFRegexes = this.PFRegexes this.CompiledPfRegexes = this.PFRegexes
.Where(reg => !string.IsNullOrWhiteSpace(reg)) .Where(reg => !string.IsNullOrWhiteSpace(reg))
.Select(reg => new Regex(reg, RegexOptions.Compiled)) .Select(reg => new Regex(reg, RegexOptions.Compiled))
.ToList(); .ToList();