Make line endings explicit in editorconfig and share in sub projects, also apply editorconfig everywhere and move some namespaces.

This commit is contained in:
Ottermandias 2023-09-18 16:56:16 +02:00
parent 53adb6fa54
commit 2b4a01df06
155 changed files with 1620 additions and 1614 deletions

View file

@ -14,6 +14,7 @@ using Penumbra.Collections.Manager;
using Penumbra.Communication;
using Penumbra.Mods;
using Penumbra.Mods.Manager;
using Penumbra.Mods.Subclasses;
using Penumbra.Services;
using Penumbra.UI.Classes;
using ChatService = Penumbra.Services.ChatService;
@ -376,8 +377,10 @@ public sealed class ModFileSystemSelector : FileSystemSelector<Mod, ModFileSyste
ImGui.BulletText(
"You can drag and drop mods and subfolders into existing folders. Dropping them onto mods is the same as dropping them onto the parent of the mod.");
indent.Push();
ImGui.BulletText("You can select multiple mods and folders by holding Control while clicking them, and then drag all of them at once." );
ImGui.BulletText("Selected mods inside an also selected folder will be ignored when dragging and move inside their folder instead of directly into the target.");
ImGui.BulletText(
"You can select multiple mods and folders by holding Control while clicking them, and then drag all of them at once.");
ImGui.BulletText(
"Selected mods inside an also selected folder will be ignored when dragging and move inside their folder instead of directly into the target.");
indent.Pop(1);
ImGui.BulletText("Right-clicking a folder opens a context menu.");
ImGui.BulletText("Right-clicking empty space allows you to expand or collapse all folders at once.");

View file

@ -3,26 +3,26 @@ namespace Penumbra.UI.ModsTab;
[Flags]
public enum ModFilter
{
Enabled = 1 << 0,
Disabled = 1 << 1,
Favorite = 1 << 2,
NotFavorite = 1 << 3,
NoConflict = 1 << 4,
SolvedConflict = 1 << 5,
UnsolvedConflict = 1 << 6,
Enabled = 1 << 0,
Disabled = 1 << 1,
Favorite = 1 << 2,
NotFavorite = 1 << 3,
NoConflict = 1 << 4,
SolvedConflict = 1 << 5,
UnsolvedConflict = 1 << 6,
HasNoMetaManipulations = 1 << 7,
HasMetaManipulations = 1 << 8,
HasNoFileSwaps = 1 << 9,
HasFileSwaps = 1 << 10,
HasConfig = 1 << 11,
HasNoConfig = 1 << 12,
HasNoFiles = 1 << 13,
HasFiles = 1 << 14,
IsNew = 1 << 15,
NotNew = 1 << 16,
Inherited = 1 << 17,
Uninherited = 1 << 18,
Undefined = 1 << 19,
HasMetaManipulations = 1 << 8,
HasNoFileSwaps = 1 << 9,
HasFileSwaps = 1 << 10,
HasConfig = 1 << 11,
HasNoConfig = 1 << 12,
HasNoFiles = 1 << 13,
HasFiles = 1 << 14,
IsNew = 1 << 15,
NotNew = 1 << 16,
Inherited = 1 << 17,
Uninherited = 1 << 18,
Undefined = 1 << 19,
};
public static class ModFilterExtensions
@ -32,26 +32,26 @@ public static class ModFilterExtensions
public static string ToName(this ModFilter filter)
=> filter switch
{
ModFilter.Enabled => "Enabled",
ModFilter.Disabled => "Disabled",
ModFilter.Favorite => "Favorite",
ModFilter.NotFavorite => "No Favorite",
ModFilter.NoConflict => "No Conflicts",
ModFilter.SolvedConflict => "Solved Conflicts",
ModFilter.UnsolvedConflict => "Unsolved Conflicts",
ModFilter.Enabled => "Enabled",
ModFilter.Disabled => "Disabled",
ModFilter.Favorite => "Favorite",
ModFilter.NotFavorite => "No Favorite",
ModFilter.NoConflict => "No Conflicts",
ModFilter.SolvedConflict => "Solved Conflicts",
ModFilter.UnsolvedConflict => "Unsolved Conflicts",
ModFilter.HasNoMetaManipulations => "No Meta Manipulations",
ModFilter.HasMetaManipulations => "Meta Manipulations",
ModFilter.HasNoFileSwaps => "No File Swaps",
ModFilter.HasFileSwaps => "File Swaps",
ModFilter.HasNoConfig => "No Configuration",
ModFilter.HasConfig => "Configuration",
ModFilter.HasNoFiles => "No Files",
ModFilter.HasFiles => "Files",
ModFilter.IsNew => "Newly Imported",
ModFilter.NotNew => "Not Newly Imported",
ModFilter.Inherited => "Inherited Configuration",
ModFilter.Uninherited => "Own Configuration",
ModFilter.Undefined => "Not Configured",
_ => throw new ArgumentOutOfRangeException(nameof(filter), filter, null),
ModFilter.HasMetaManipulations => "Meta Manipulations",
ModFilter.HasNoFileSwaps => "No File Swaps",
ModFilter.HasFileSwaps => "File Swaps",
ModFilter.HasNoConfig => "No Configuration",
ModFilter.HasConfig => "Configuration",
ModFilter.HasNoFiles => "No Files",
ModFilter.HasFiles => "Files",
ModFilter.IsNew => "Newly Imported",
ModFilter.NotNew => "Not Newly Imported",
ModFilter.Inherited => "Inherited Configuration",
ModFilter.Uninherited => "Own Configuration",
ModFilter.Undefined => "Not Configured",
_ => throw new ArgumentOutOfRangeException(nameof(filter), filter, null),
};
}
}

View file

@ -4,6 +4,7 @@ using ImGuiNET;
using OtterGui;
using OtterGui.Raii;
using Penumbra.Mods;
using Penumbra.Mods.Manager;
using Penumbra.UI.AdvancedWindow;
namespace Penumbra.UI.ModsTab;

View file

@ -12,7 +12,7 @@ namespace Penumbra.UI.ModsTab;
public class ModPanelConflictsTab : ITab
{
private readonly ModFileSystemSelector _selector;
private readonly CollectionManager _collectionManager;
private readonly CollectionManager _collectionManager;
public ModPanelConflictsTab(CollectionManager collectionManager, ModFileSystemSelector selector)
{

View file

@ -3,9 +3,7 @@ using ImGuiNET;
using OtterGui.Raii;
using OtterGui;
using OtterGui.Widgets;
using Penumbra.Mods;
using Penumbra.Mods.Manager;
using Penumbra.UI.Classes;
namespace Penumbra.UI.ModsTab;
@ -13,7 +11,7 @@ public class ModPanelDescriptionTab : ITab
{
private readonly ModFileSystemSelector _selector;
private readonly TutorialService _tutorial;
private readonly ModManager _modManager;
private readonly ModManager _modManager;
private readonly TagButtons _localTags = new();
private readonly TagButtons _modTags = new();

View file

@ -4,10 +4,8 @@ using OtterGui;
using OtterGui.Widgets;
using Penumbra.Api.Enums;
using Penumbra.Collections;
using Penumbra.Mods;
using Penumbra.UI.Classes;
using Dalamud.Interface.Components;
using Dalamud.Interface;
using Penumbra.Collections.Manager;
using Penumbra.Mods.Manager;
using Penumbra.Mods.Subclasses;
@ -192,7 +190,7 @@ public class ModPanelSettingsTab : ITab
_collectionManager.Editor.SetModSetting(_collectionManager.Active.Current, _selector.Selected!, groupIdx, (uint)idx2);
if (option.Description.Length > 0)
ImGuiUtil.SelectableHelpMarker(option.Description);
ImGuiUtil.SelectableHelpMarker(option.Description);
id.Pop();
}

View file

@ -5,6 +5,7 @@ using OtterGui.Raii;
using OtterGui.Widgets;
using Penumbra.Mods;
using Penumbra.Mods.Manager;
using Penumbra.Mods.Subclasses;
using Penumbra.UI.AdvancedWindow;
namespace Penumbra.UI.ModsTab;