Pilzinsel64/PlayerTags
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI and string tweaks

Browse Source
This commit is contained in:
r00telement
2021-12-12 08:36:34 +00:00
parent 1129168ccd
commit 1cce0f2fa2
4 changed files with 70 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
PlayerTags/Configuration/PluginConfigurationUI.cs
View File

@@ -55,27 +55,21 @@ namespace PlayerTags.Configuration
{
ImGui.Spacing();
ImGui.Spacing();
ImGui.TreePush();
DrawCheckbox(nameof(m_PluginConfiguration.IsCustomTagsContextMenuEnabled), true, ref m_PluginConfiguration.IsCustomTagsContextMenuEnabled, () => m_PluginConfiguration.Save(m_PluginData));
ImGui.TreePop();
ImGui.Spacing();
ImGui.Spacing();
DrawHeading(Strings.Loc_Static_Nameplates);
ImGui.TreePush();
DrawComboBox(true, true, false, ref m_PluginConfiguration.NameplateFreeCompanyVisibility, () => m_PluginConfiguration.Save(m_PluginData));
DrawComboBox(true, true, false, ref m_PluginConfiguration.NameplateTitleVisibility, () => m_PluginConfiguration.Save(m_PluginData));
DrawComboBox(true, true, false, ref m_PluginConfiguration.NameplateTitlePosition, () => m_PluginConfiguration.Save(m_PluginData));
ImGui.TreePop();
ImGui.Spacing();
ImGui.Spacing();
DrawHeading(Strings.Loc_Static_Development);
ImGui.TreePush();
DrawCheckbox(nameof(m_PluginConfiguration.IsPlayerNameRandomlyGenerated), true, ref m_PluginConfiguration.IsPlayerNameRandomlyGenerated, () => m_PluginConfiguration.Save(m_PluginData));
ImGui.TreePop();
ImGui.EndTabItem();
}
@@ -84,7 +78,6 @@ namespace PlayerTags.Configuration
{
ImGui.Spacing();
ImGui.Spacing();
ImGui.TreePush();
DrawCheckbox(nameof(m_PluginConfiguration.IsShowInheritedPropertiesEnabled), true, ref m_PluginConfiguration.IsShowInheritedPropertiesEnabled, () => m_PluginConfiguration.Save(m_PluginData));
ImGui.BeginGroup();
ImGui.Columns(2);
@@ -103,7 +96,6 @@ namespace PlayerTags.Configuration
}
ImGui.EndGroup();
ImGui.TreePop();
ImGui.Columns(1);
ImGui.EndTabItem();
@@ -113,7 +105,6 @@ namespace PlayerTags.Configuration
{
ImGui.Spacing();
ImGui.Spacing();
ImGui.TreePush();
DrawCheckbox(nameof(m_PluginConfiguration.IsPlayersTabOrderedByProximity), true, ref m_PluginConfiguration.IsPlayersTabOrderedByProximity, () => m_PluginConfiguration.Save(m_PluginData));
DrawCheckbox(nameof(m_PluginConfiguration.IsPlayersTabSelfVisible), true, ref m_PluginConfiguration.IsPlayersTabSelfVisible, () => m_PluginConfiguration.Save(m_PluginData));
DrawCheckbox(nameof(m_PluginConfiguration.IsPlayersTabFriendsVisible), true, ref m_PluginConfiguration.IsPlayersTabFriendsVisible, () => m_PluginConfiguration.Save(m_PluginData));
@@ -187,7 +178,6 @@ namespace PlayerTags.Configuration
ImGui.EndTable();
}
ImGui.TreePop();
ImGui.EndTabItem();
}
@@ -196,7 +186,6 @@ namespace PlayerTags.Configuration
{
ImGui.Spacing();
ImGui.Spacing();
ImGui.TreePush();
if (ImGui.BeginTable("##TaggedPlayersTable", 1 + m_PluginData.CustomTags.Count))
{
ImGui.TableHeader(Strings.Loc_Static_PlayerName);
@@ -224,7 +213,6 @@ namespace PlayerTags.Configuration
ImGui.EndTable();
}
ImGui.TreePop();
ImGui.EndTabItem();
}
@@ -467,7 +455,6 @@ namespace PlayerTags.Configuration
public void DrawControls(Tag tag)
{
ImGui.PushID(tag.GetHashCode().ToString());
//ImGui.TreePush();
// Render the add property override button and popup
if (ImGui.IsPopupOpen("AddPopup"))
@@ -536,7 +523,6 @@ namespace PlayerTags.Configuration
DrawHeading(Localizer.GetString(inheritableGroup.Key, false));
}
ImGui.TreePush();
foreach (var selectedInheritable in inheritableGroup)
{
bool isSelected = false;
@@ -563,7 +549,6 @@ namespace PlayerTags.Configuration
ImGui.SetTooltip(Localizer.GetString(selectedInheritable.Inheritable.Key, true));
}
}
ImGui.TreePop();
}
ImGui.EndListBox();
@@ -623,7 +608,6 @@ namespace PlayerTags.Configuration
DrawHeading(Localizer.GetString(inheritableGroup.Key, false));
}
ImGui.TreePush();
foreach (var selectedInheritable in inheritableGroup)
{
if (selectedInheritable.Inheritable.Value is InheritableValue<bool> inheritableBool)
@@ -655,11 +639,9 @@ namespace PlayerTags.Configuration
PluginLog.Warning($"Rendering for inheritable option not implemented: {selectedInheritable.Inheritable.Key}");
}
}
ImGui.TreePop();
}
//ImGui.TreePop();
ImGui.PopID();
}

44
PlayerTags/Data/Tag.cs
View File

@@ -84,54 +84,54 @@ namespace PlayerTags.Data
public InheritableValue<bool> IsSelected = new InheritableValue<bool>(false);
public InheritableValue<bool> IsExpanded = new InheritableValue<bool>(false);
[InheritableCategory("General")]
[InheritableCategory("GeneralCategory")]
public InheritableReference<string> GameObjectNamesToApplyTo = new InheritableReference<string>("");
[InheritableCategory("Icon")]
[InheritableCategory("IconCategory")]
public InheritableValue<BitmapFontIcon> Icon = new InheritableValue<BitmapFontIcon>(BitmapFontIcon.Aethernet);
[InheritableCategory("Icon")]
[InheritableCategory("IconCategory")]
public InheritableValue<bool> IsIconVisibleInChat = new InheritableValue<bool>(false);
[InheritableCategory("Icon")]
[InheritableCategory("IconCategory")]
public InheritableValue<bool> IsIconVisibleInNameplates = new InheritableValue<bool>(false);
[InheritableCategory("Text")]
[InheritableCategory("TextCategory")]
public InheritableReference<string> Text = new InheritableReference<string>("");
[InheritableCategory("Text")]
[InheritableCategory("TextCategory")]
public InheritableValue<ushort> TextColor = new InheritableValue<ushort>(6);
[InheritableCategory("Text")]
[InheritableCategory("TextCategory")]
public InheritableValue<ushort> TextGlowColor = new InheritableValue<ushort>(6);
[InheritableCategory("Text")]
[InheritableCategory("TextCategory")]
public InheritableValue<bool> IsTextItalic = new InheritableValue<bool>(false);
[InheritableCategory("Text")]
[InheritableCategory("TextCategory")]
public InheritableValue<bool> IsTextVisibleInChat = new InheritableValue<bool>(false);
[InheritableCategory("Text")]
[InheritableCategory("TextCategory")]
public InheritableValue<bool> IsTextVisibleInNameplates = new InheritableValue<bool>(false);
[InheritableCategory("Position")]
[InheritableCategory("PositionCategory")]
public InheritableValue<TagPosition> TagPositionInChat = new InheritableValue<TagPosition>(TagPosition.Before);
[InheritableCategory("Position")]
[InheritableCategory("PositionCategory")]
public InheritableValue<TagPosition> TagPositionInNameplates = new InheritableValue<TagPosition>(TagPosition.Before);
[InheritableCategory("Position")]
[InheritableCategory("PositionCategory")]
public InheritableValue<NameplateElement> TagTargetInNameplates = new InheritableValue<NameplateElement>(NameplateElement.Name);
[InheritableCategory("ActivityVisibility")]
[InheritableCategory("ActivityCategory")]
public InheritableValue<bool> IsVisibleInPveDuties = new InheritableValue<bool>(false);
[InheritableCategory("ActivityVisibility")]
[InheritableCategory("ActivityCategory")]
public InheritableValue<bool> IsVisibleInPvpDuties = new InheritableValue<bool>(false);
[InheritableCategory("ActivityVisibility")]
[InheritableCategory("ActivityCategory")]
public InheritableValue<bool> IsVisibleInOverworld = new InheritableValue<bool>(false);
[InheritableCategory("PlayerVisibility")]
[InheritableCategory("PlayerCategory")]
public InheritableValue<bool> IsVisibleForSelf = new InheritableValue<bool>(false);
[InheritableCategory("PlayerVisibility")]
[InheritableCategory("PlayerCategory")]
public InheritableValue<bool> IsVisibleForFriendPlayers = new InheritableValue<bool>(false);
[InheritableCategory("PlayerVisibility")]
[InheritableCategory("PlayerCategory")]
public InheritableValue<bool> IsVisibleForPartyPlayers = new InheritableValue<bool>(false);
[InheritableCategory("PlayerVisibility")]
[InheritableCategory("PlayerCategory")]
public InheritableValue<bool> IsVisibleForAlliancePlayers = new InheritableValue<bool>(false);
[InheritableCategory("PlayerVisibility")]
[InheritableCategory("PlayerCategory")]
public InheritableValue<bool> IsVisibleForEnemyPlayers = new InheritableValue<bool>(false);
[InheritableCategory("PlayerVisibility")]
[InheritableCategory("PlayerCategory")]
public InheritableValue<bool> IsVisibleForOtherPlayers = new InheritableValue<bool>(false);
public string[] SplitGameObjectNamesToApplyTo

46
PlayerTags/Resources/Strings.Designer.cs generated
View File

@@ -61,11 +61,11 @@ namespace PlayerTags.Resources {
}
/// <summary>
/// Looks up a localized string similar to Activities.
/// Looks up a localized string similar to Activity properties.
/// </summary>
public static string Loc_ActivityVisibility {
public static string Loc_ActivityCategory {
get {
return ResourceManager.GetString("Loc_ActivityVisibility", resourceCulture);
return ResourceManager.GetString("Loc_ActivityCategory", resourceCulture);
}
}
@@ -124,11 +124,11 @@ namespace PlayerTags.Resources {
}
/// <summary>
/// Looks up a localized string similar to General.
/// Looks up a localized string similar to General properties.
/// </summary>
public static string Loc_General {
public static string Loc_GeneralCategory {
get {
return ResourceManager.GetString("Loc_General", resourceCulture);
return ResourceManager.GetString("Loc_GeneralCategory", resourceCulture);
}
}
@@ -150,6 +150,15 @@ namespace PlayerTags.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Icon properties.
/// </summary>
public static string Loc_IconCategory {
get {
return ResourceManager.GetString("Loc_IconCategory", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Context menu integration.
/// </summary>
@@ -394,7 +403,7 @@ namespace PlayerTags.Resources {
}
/// <summary>
/// Looks up a localized string similar to Inherited properties from parent tags will be shown in the property override editor..
/// Looks up a localized string similar to Properties inherited from parent nodes will be shown in the editor..
/// </summary>
public static string Loc_IsShowInheritedPropertiesEnabled_Description {
get {
@@ -403,7 +412,7 @@ namespace PlayerTags.Resources {
}
/// <summary>
/// Looks up a localized string similar to Text italic.
/// Looks up a localized string similar to Italic.
/// </summary>
public static string Loc_IsTextItalic {
get {
@@ -862,20 +871,20 @@ namespace PlayerTags.Resources {
}
/// <summary>
/// Looks up a localized string similar to Players.
/// Looks up a localized string similar to Player properties.
/// </summary>
public static string Loc_PlayerVisibility {
public static string Loc_PlayerCategory {
get {
return ResourceManager.GetString("Loc_PlayerVisibility", resourceCulture);
return ResourceManager.GetString("Loc_PlayerCategory", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Position.
/// Looks up a localized string similar to Position properties.
/// </summary>
public static string Loc_Position {
public static string Loc_PositionCategory {
get {
return ResourceManager.GetString("Loc_Position", resourceCulture);
return ResourceManager.GetString("Loc_PositionCategory", resourceCulture);
}
}
@@ -1203,6 +1212,15 @@ namespace PlayerTags.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Text properties.
/// </summary>
public static string Loc_TextCategory {
get {
return ResourceManager.GetString("Loc_TextCategory", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Color.
/// </summary>

26
PlayerTags/Resources/Strings.resx
View File

@@ -166,7 +166,7 @@
<value>Show inherited properties</value>
</data>
<data name="Loc_IsShowInheritedPropertiesEnabled_Description" xml:space="preserve">
<value>Inherited properties from parent tags will be shown in the property override editor.</value>
<value>Properties inherited from parent nodes will be shown in the editor.</value>
</data>
<data name="Loc_NameplateFreeCompanyVisibility" xml:space="preserve">
<value>Free company visibility</value>
@@ -341,7 +341,7 @@
<value>The glow color of the text.</value>
</data>
<data name="Loc_IsTextItalic" xml:space="preserve">
<value>Text italic</value>
<value>Italic</value>
</data>
<data name="Loc_IsTextItalic_Description" xml:space="preserve">
<value>Whether the text will be italic.</value>
@@ -408,17 +408,23 @@
<value>Enabled</value>
</data>
<data name="Loc_Position" xml:space="preserve">
<value>Position</value>
<data name="Loc_GeneralCategory" xml:space="preserve">
<value>General properties</value>
</data>
<data name="Loc_General" xml:space="preserve">
<value>General</value>
<data name="Loc_IconCategory" xml:space="preserve">
<value>Icon properties</value>
</data>
<data name="Loc_ActivityVisibility" xml:space="preserve">
<value>Activities</value>
<data name="Loc_TextCategory" xml:space="preserve">
<value>Text properties</value>
</data>
<data name="Loc_PlayerVisibility" xml:space="preserve">
<value>Players</value>
<data name="Loc_PositionCategory" xml:space="preserve">
<value>Position properties</value>
</data>
<data name="Loc_ActivityCategory" xml:space="preserve">
<value>Activity properties</value>
</data>
<data name="Loc_PlayerCategory" xml:space="preserve">
<value>Player properties</value>
</data>
<data name="Loc_IsVisibleInPveDuties" xml:space="preserve">