Rename "Default profile", hide character controls when profile is set…

… as default
Aether-Tools · Jun 17, 2024 · 8229955 · 8229955
1 parent 6a55ccc
commit 8229955
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 22 deletions.
diff --git a/CustomizePlus/Profiles/ProfileManager.cs b/CustomizePlus/Profiles/ProfileManager.cs
@@ -505,6 +505,10 @@ public IEnumerable<Profile> GetEnabledProfilesByActor(ActorIdentifier actorIdent
 
         bool IsProfileAppliesToCurrentActor(Profile profile)
         {
+            //default profile check is done later
+            if (profile == DefaultProfile)
+                return false;
+
             return profile.CharacterName.Text == name &&
                 (!profile.LimitLookupToOwnedObjects ||
                     (actorIdentifier.Type == IdentifierType.Owned &&

diff --git a/CustomizePlus/UI/Windows/MainWindow/Tabs/Profiles/ProfilePanel.cs b/CustomizePlus/UI/Windows/MainWindow/Tabs/Profiles/ProfilePanel.cs
@@ -162,16 +162,16 @@ private void DrawEnabledSetting()
             {
                 if (ImGui.Checkbox("##DefaultProfile", ref isDefault))
                     _manager.SetDefaultProfile(isDefault ? _selector.Selected! : null);
-                ImGuiUtil.LabeledHelpMarker("Default profile (Players and Retainers only)",
-                    "Whether the templates in this profile are applied to all players and retainers without a specific profile. Only one profile can be default at the same time.");
+                ImGuiUtil.LabeledHelpMarker("Apply to all players and retainers",
+                    "Whether the templates in this profile are applied to all players and retainers without a specific profile. This setting cannot be applied to multiple profiles.");
             }
             if(isDefaultOrCurrentProfilesEnabled)
             {
                 ImGui.SameLine();
                 ImGui.PushStyleColor(ImGuiCol.Text, Constants.Colors.Warning);
                 ImGuiUtil.PrintIcon(FontAwesomeIcon.ExclamationTriangle);
                 ImGui.PopStyleColor();
-                ImGuiUtil.HoverTooltip("Can only be changed when currently selected and the default profiles are disabled.");
+                ImGuiUtil.HoverTooltip("Can only be changed when both currently selected and profile where this checkbox is checked are disabled.");
             }
         }
     }
@@ -217,30 +217,35 @@ private void DrawBasicSettings()
                 name = _newCharacterName ?? _selector.Selected!.CharacterName;
                 ImGui.SetNextItemWidth(width.X);
 
-                if (!_selector.IncognitoMode)
+                if(_manager.DefaultProfile != _selector.Selected)
                 {
-                    if (ImGui.InputText("##CharacterName", ref name, 128))
+                    if (!_selector.IncognitoMode)
                     {
-                        _newCharacterName = name;
-                        _changedProfile = _selector.Selected;
-                    }
-
-                    if (ImGui.IsItemDeactivatedAfterEdit() && _changedProfile != null)
-                    {
-                        _manager.ChangeCharacterName(_changedProfile, name);
-                        _newCharacterName = null;
-                        _changedProfile = null;
+                        if (ImGui.InputText("##CharacterName", ref name, 128))
+                        {
+                            _newCharacterName = name;
+                            _changedProfile = _selector.Selected;
+                        }
+
+                        if (ImGui.IsItemDeactivatedAfterEdit() && _changedProfile != null)
+                        {
+                            _manager.ChangeCharacterName(_changedProfile, name);
+                            _newCharacterName = null;
+                            _changedProfile = null;
+                        }
                     }
+                    else
+                        ImGui.TextUnformatted("Incognito active");
+
+                    ImGui.SameLine();
+                    var enabled = _selector.Selected?.LimitLookupToOwnedObjects ?? false;
+                    if (ImGui.Checkbox("##LimitLookupToOwnedObjects", ref enabled))
+                        _manager.SetLimitLookupToOwned(_selector.Selected!, enabled);
+                    ImGuiUtil.LabeledHelpMarker("Limit to my creatures",
+                        "When enabled limits the character search to only your own summons, mounts and minions.\nUseful when there is possibility there will be another character with that name owned by another player.\n* For battle chocobo use \"Chocobo\" as character name.");
                 }
                 else
-                    ImGui.TextUnformatted("Incognito active");
-
-                ImGui.SameLine();
-                var enabled = _selector.Selected?.LimitLookupToOwnedObjects ?? false;
-                if (ImGui.Checkbox("##LimitLookupToOwnedObjects", ref enabled))
-                    _manager.SetLimitLookupToOwned(_selector.Selected!, enabled);
-                ImGuiUtil.LabeledHelpMarker("Limit to my creatures",
-                    "When enabled limits the character search to only your own summons, mounts and minions.\nUseful when there is possibility there will be another character with that name owned by another player.\n* For battle chocobo use \"Chocobo\" as character name.");
+                    ImGui.TextUnformatted("All players and retainers");
             }
         }
     }