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

Merge pull request #153 from pohky/master

Browse source
This commit is contained in:
goaaats 2020-08-11 15:26:04 +02:00 • committed by GitHub
commit 87919a097d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Dalamud/Configuration/DalamudConfiguration.cs
View file

@ -30,6 +30,7 @@ namespace Dalamud
public Dictionary<int, PreferredRole> PreferredRoleReminders { get; set; } public Dictionary<int, PreferredRole> PreferredRoleReminders { get; set; }
public bool DutyFinderTaskbarFlash { get; set; } = true; public bool DutyFinderTaskbarFlash { get; set; } = true;
public bool DutyFinderChatMessage { get; set; } = true;
public string LanguageOverride { get; set; } public string LanguageOverride { get; set; }

3
Dalamud/Game/Network/NetworkHandlers.cs
View file

@ -81,7 +81,8 @@ namespace Dalamud.Game.Network {
} }
Task.Run(async () => { Task.Run(async () => {
this.dalamud.Framework.Gui.Chat.Print("Duty pop: " + contentFinderCondition.Name); if(this.dalamud.Configuration.DutyFinderChatMessage)
this.dalamud.Framework.Gui.Chat.Print("Duty pop: " + contentFinderCondition.Name);
await this.ProcessCfPop?.Invoke(contentFinderCondition); await this.ProcessCfPop?.Invoke(contentFinderCondition);
}); });

7
Dalamud/Interface/DalamudSettingsWindow.cs
View file

@ -27,6 +27,7 @@ namespace Dalamud.Interface
this.dalamudMessagesChatType = (int) this.dalamud.Configuration.GeneralChatType; this.dalamudMessagesChatType = (int) this.dalamud.Configuration.GeneralChatType;
this.doCfTaskBarFlash = this.dalamud.Configuration.DutyFinderTaskbarFlash; this.doCfTaskBarFlash = this.dalamud.Configuration.DutyFinderTaskbarFlash;
this.doCfChatMessage = this.dalamud.Configuration.DutyFinderChatMessage;
this.globalUiScale = this.dalamud.Configuration.GlobalUiScale; this.globalUiScale = this.dalamud.Configuration.GlobalUiScale;
@ -47,6 +48,7 @@ namespace Dalamud.Interface
private int dalamudMessagesChatType; private int dalamudMessagesChatType;
private bool doCfTaskBarFlash; private bool doCfTaskBarFlash;
private bool doCfChatMessage;
private const float MinScale = 0.3f; private const float MinScale = 0.3f;
private const float MaxScale = 2.0f; private const float MaxScale = 2.0f;
@ -90,6 +92,10 @@ namespace Dalamud.Interface
ImGui.Checkbox(Loc.Localize("DalamudSettingsFlash", "Flash FFXIV window on duty pop"), ref this.doCfTaskBarFlash); ImGui.Checkbox(Loc.Localize("DalamudSettingsFlash", "Flash FFXIV window on duty pop"), ref this.doCfTaskBarFlash);
ImGui.TextColored(this.hintTextColor, Loc.Localize("DalamudSettingsFlashHint", "Select, if the FFXIV window should be flashed in your task bar when a duty is ready.")); ImGui.TextColored(this.hintTextColor, Loc.Localize("DalamudSettingsFlashHint", "Select, if the FFXIV window should be flashed in your task bar when a duty is ready."));
ImGui.Checkbox(Loc.Localize("DalamudSettingsDutyFinderMessage", "Chatlog message on duty pop"), ref this.doCfChatMessage);
ImGui.TextColored(this.hintTextColor, Loc.Localize("DalamudSettingsDutyFinderMessageHint", "Select, if a message should be sent in the FFXIV chat when a duty is ready."));
ImGui.EndTabItem(); ImGui.EndTabItem();
} }
@ -143,6 +149,7 @@ namespace Dalamud.Interface
this.dalamud.Configuration.GeneralChatType = (XivChatType) this.dalamudMessagesChatType; this.dalamud.Configuration.GeneralChatType = (XivChatType) this.dalamudMessagesChatType;
this.dalamud.Configuration.DutyFinderTaskbarFlash = this.doCfTaskBarFlash; this.dalamud.Configuration.DutyFinderTaskbarFlash = this.doCfTaskBarFlash;
this.dalamud.Configuration.DutyFinderChatMessage = this.doCfChatMessage;
this.dalamud.Configuration.GlobalUiScale = this.globalUiScale; this.dalamud.Configuration.GlobalUiScale = this.globalUiScale;