1.12.2 #52

Merged
defnotken merged 47 commits from 1.12.2 into master 2025-10-12 13:33:02 +00:00
2 changed files with 6 additions and 32 deletions
Showing only changes of commit a7475a7007 - Show all commits

View File

@@ -115,11 +115,11 @@ public class LightlessConfig : ILightlessConfiguration
public uint CustomErrorSoundId { get; set; } = 16; // Se15
public uint PairRequestSoundId { get; set; } = 5; // Se5
public uint DownloadSoundId { get; set; } = 15; // Se14
public bool DisableInfoSound { get; set; } = false;
public bool DisableWarningSound { get; set; } = false;
public bool DisableErrorSound { get; set; } = false;
public bool DisablePairRequestSound { get; set; } = false;
public bool DisableDownloadSound { get; set; } = true; // Disabled by default (annoying)
public bool DisableInfoSound { get; set; } = true;
public bool DisableWarningSound { get; set; } = true;
public bool DisableErrorSound { get; set; } = true;
public bool DisablePairRequestSound { get; set; } = true;
public bool DisableDownloadSound { get; set; } = true;
public bool UseFocusTarget { get; set; } = false;
public bool overrideFriendColor { get; set; } = false;
public bool overridePartyColor { get; set; } = false;

View File

@@ -2331,21 +2331,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
_uiShared.ColoredSeparator(UIColors.Get("LightlessPurple"), 1.5f);
ImGui.TreePop();
}
ImGui.Separator();
ImGui.Dummy(new Vector2(10));
_uiShared.BigText("Notifications");
if (_uiShared.MediumTreeNode("Display", UIColors.Get("LightlessPurple")))
{
_uiShared.DrawHelpText(
"Notification settings have been moved to the 'Enhanced Notifications' tab for better organization. You can configure where all notifications appear from there.");
_uiShared.ColoredSeparator(UIColors.Get("LightlessPurple"), 1.5f);
ImGui.TreePop();
}
ImGui.Separator();
}
@@ -3996,18 +3982,6 @@ public class SettingsUi : WindowMediatorSubscriberBase
ImGui.TreePop();
}
// Pairing Request Notifications Section
if (_uiShared.MediumTreeNode("Pairing Request Notifications", UIColors.Get("LightlessBlue")))
{
UiSharedService.ColorTextWrapped(
"Pairing requests always show as interactive notifications with Accept/Decline buttons. Configure the sound in the Sound Settings table above.",
ImGuiColors.DalamudGrey);
ImGuiHelpers.ScaledDummy(3);
_uiShared.ColoredSeparator(UIColors.Get("LightlessBlue"), 1.5f);
ImGui.TreePop();
}
if (_uiShared.MediumTreeNode("System Notifications", UIColors.Get("LightlessYellow")))
{
var disableOptionalPluginWarnings = _configService.Current.DisableOptionalPluginWarnings;