From 132d757943766f771ec6c5e48fe81a1efeaeae0b Mon Sep 17 00:00:00 2001 From: Loporrit <141286461+loporrit@users.noreply.github.com> Date: Sat, 28 Jun 2025 17:00:42 +0000 Subject: [PATCH] Character Data Hub branding --- MareSynchronos/UI/CharaDataHubUi.McdOnline.cs | 8 +++---- .../UI/CharaDataHubUi.NearbyPoses.cs | 16 +++++++------- MareSynchronos/UI/CharaDataHubUi.cs | 22 +++++++++---------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/MareSynchronos/UI/CharaDataHubUi.McdOnline.cs b/MareSynchronos/UI/CharaDataHubUi.McdOnline.cs index 0c3d1aa..9ce5e89 100644 --- a/MareSynchronos/UI/CharaDataHubUi.McdOnline.cs +++ b/MareSynchronos/UI/CharaDataHubUi.McdOnline.cs @@ -532,10 +532,10 @@ internal sealed partial class CharaDataHubUi private void DrawMcdOnline() { - _uiSharedService.BigText("Mare Character Data Online"); + _uiSharedService.BigText("Online Character Data"); - DrawHelpFoldout("In this tab you can create, view and edit your own Mare Character Data that is stored on the server." + Environment.NewLine + Environment.NewLine - + "Mare Character Data Online functions similar to the previous MCDF standard for exporting your character, except that you do not have to send a file to the other person but solely a code." + Environment.NewLine + Environment.NewLine + DrawHelpFoldout("In this tab you can create, view and edit your own Character Data that is stored on the server." + Environment.NewLine + Environment.NewLine + + "Character Data Online functions similar to the previous MCDF standard for exporting your character, except that you do not have to send a file to the other person but solely a code." + Environment.NewLine + Environment.NewLine + "There would be a bit too much to explain here on what you can do here in its entirety, however, all elements in this tab have help texts attached what they are used for. Please review them carefully." + Environment.NewLine + Environment.NewLine + "Be mindful that when you share your Character Data with other people there is a chance that, with the help of unsanctioned 3rd party plugins, your appearance could be stolen irreversibly, just like when using MCDF."); @@ -543,7 +543,7 @@ internal sealed partial class CharaDataHubUi using (ImRaii.Disabled((!_charaDataManager.GetAllDataTask?.IsCompleted ?? false) || (_charaDataManager.DataGetTimeoutTask != null && !_charaDataManager.DataGetTimeoutTask.IsCompleted))) { - if (_uiSharedService.IconTextButton(FontAwesomeIcon.ArrowCircleDown, "Download your Character Data from Server")) + if (_uiSharedService.IconTextButton(FontAwesomeIcon.ArrowCircleDown, "Download your Online Character Data from Server")) { _ = _charaDataManager.GetAllData(_disposalCts.Token); } diff --git a/MareSynchronos/UI/CharaDataHubUi.NearbyPoses.cs b/MareSynchronos/UI/CharaDataHubUi.NearbyPoses.cs index 0a78cc3..df1d3f8 100644 --- a/MareSynchronos/UI/CharaDataHubUi.NearbyPoses.cs +++ b/MareSynchronos/UI/CharaDataHubUi.NearbyPoses.cs @@ -16,7 +16,7 @@ internal partial class CharaDataHubUi DrawHelpFoldout("This tab will show you all Shared World Poses nearby you." + Environment.NewLine + Environment.NewLine + "Shared World Poses are poses in character data that have world data attached to them and are set to shared. " + "This means that all data that is in 'Shared with You' that has a pose with world data attached to it will be shown here if you are nearby." + Environment.NewLine - + "By default all poses that are shared will be shown. Poses taken in housing areas will by default only be shown on the correct server and location." + Environment.NewLine + Environment.NewLine + + "By default all poses that are shared will be shown. Poses taken in housing areas will by default only be shown on the correct world and location." + Environment.NewLine + Environment.NewLine + "Shared World Poses will appear in the world as floating wisps, as well as in the list below. You can mouse over a Shared World Pose in the list for it to get highlighted in the world." + Environment.NewLine + Environment.NewLine + "You can apply Shared World Poses to yourself or spawn the associated character to pose with them." + Environment.NewLine + Environment.NewLine + "You can adjust the filter and change further settings in the 'Settings & Filter' foldout."); @@ -29,26 +29,26 @@ internal partial class CharaDataHubUi _charaDataNearbyManager.UserNoteFilter = filterByUser; } bool onlyCurrent = _configService.Current.NearbyOwnServerOnly; - if (ImGui.Checkbox("Only show Poses on current server", ref onlyCurrent)) + if (ImGui.Checkbox("Only show Poses on current world", ref onlyCurrent)) { _configService.Current.NearbyOwnServerOnly = onlyCurrent; _configService.Save(); } - _uiSharedService.DrawHelpText("Toggling this off will show you the location of all shared Poses with World Data from all Servers"); + _uiSharedService.DrawHelpText("Show the location of shared Poses with World Data from current world only"); bool showOwn = _configService.Current.NearbyShowOwnData; if (ImGui.Checkbox("Also show your own data", ref showOwn)) { _configService.Current.NearbyShowOwnData = showOwn; _configService.Save(); } - _uiSharedService.DrawHelpText("Toggling this on will also show you the location of your own Poses"); + _uiSharedService.DrawHelpText("Show your own Poses as well"); bool ignoreHousing = _configService.Current.NearbyIgnoreHousingLimitations; if (ImGui.Checkbox("Ignore Housing Limitations", ref ignoreHousing)) { _configService.Current.NearbyIgnoreHousingLimitations = ignoreHousing; _configService.Save(); } - _uiSharedService.DrawHelpText("This will display all poses in their location regardless of housing limitations. (Ignoring Ward, Plot, Room)" + UiSharedService.TooltipSeparator + _uiSharedService.DrawHelpText("Display all poses in their location regardless of housing limitations. (Ignoring Ward, Plot, Room)" + UiSharedService.TooltipSeparator + "Note: Poses that utilize housing props, furniture, etc. will not be displayed correctly if not spawned in the right location."); bool showWisps = _configService.Current.NearbyDrawWisps; if (ImGui.Checkbox("Show Pose Wisps in the overworld", ref showWisps)) @@ -56,7 +56,7 @@ internal partial class CharaDataHubUi _configService.Current.NearbyDrawWisps = showWisps; _configService.Save(); } - _uiSharedService.DrawHelpText("When enabled, Mare will draw floating wisps where other's poses are in the world."); + _uiSharedService.DrawHelpText("Draw floating wisps where other's poses are in the world."); int poseDetectionDistance = _configService.Current.NearbyDistanceFilter; ImGui.SetNextItemWidth(100); if (ImGui.SliderInt("Detection Distance", ref poseDetectionDistance, 5, 1000)) @@ -64,14 +64,14 @@ internal partial class CharaDataHubUi _configService.Current.NearbyDistanceFilter = poseDetectionDistance; _configService.Save(); } - _uiSharedService.DrawHelpText("This setting allows you to change the maximum distance in which poses will be shown. Set it to the maximum if you want to see all poses on the current map."); + _uiSharedService.DrawHelpText("Maximum distance in which poses will be shown. Set it to the maximum if you want to see all poses on the current map."); bool alwaysShow = _configService.Current.NearbyShowAlways; if (ImGui.Checkbox("Keep active outside Poses Nearby tab", ref alwaysShow)) { _configService.Current.NearbyShowAlways = alwaysShow; _configService.Save(); } - _uiSharedService.DrawHelpText("This will allow Mare to continue the calculation of position of wisps etc. active outside of the 'Poses Nearby' tab." + UiSharedService.TooltipSeparator + _uiSharedService.DrawHelpText("Continue the calculation of position of wisps etc. active outside of the 'Poses Nearby' tab." + UiSharedService.TooltipSeparator + "Note: The wisps etc. will disappear during combat and performing."); }); diff --git a/MareSynchronos/UI/CharaDataHubUi.cs b/MareSynchronos/UI/CharaDataHubUi.cs index 6150375..461eca1 100644 --- a/MareSynchronos/UI/CharaDataHubUi.cs +++ b/MareSynchronos/UI/CharaDataHubUi.cs @@ -76,7 +76,7 @@ internal sealed partial class CharaDataHubUi : WindowMediatorSubscriberBase CharaDataManager charaDataManager, CharaDataNearbyManager charaDataNearbyManager, CharaDataConfigService configService, UiSharedService uiSharedService, ServerConfigurationManager serverConfigurationManager, DalamudUtilService dalamudUtilService, FileDialogManager fileDialogManager, PairManager pairManager) - : base(logger, mediator, "Mare Synchronos Character Data Hub###MareSynchronosCharaDataUI", performanceCollectorService) + : base(logger, mediator, "Loporrit Character Data Hub###LoporritCharaDataUI", performanceCollectorService) { SetWindowSizeConstraints(); @@ -275,7 +275,7 @@ internal sealed partial class CharaDataHubUi : WindowMediatorSubscriberBase flags = ImGuiTabItemFlags.SetSelected; _openMcdOnlineOnNextRun = false; } - using (var mcdOnlineTabItem = ImRaii.TabItem("MCD Online", flags)) + using (var mcdOnlineTabItem = ImRaii.TabItem("Online Data", flags)) { if (mcdOnlineTabItem) { @@ -666,7 +666,7 @@ internal sealed partial class CharaDataHubUi : WindowMediatorSubscriberBase if (yourOwnTabItem) { DrawHelpFoldout("You can apply character data you created yourself in this tab. If the list is not populated press on \"Download your Character Data\"." + Environment.NewLine + Environment.NewLine - + "To create new and edit your existing character data use the \"MCD Online\" tab."); + + "To create new and edit your existing character data use the \"Online Data\" tab."); ImGuiHelpers.ScaledDummy(5); @@ -849,9 +849,9 @@ internal sealed partial class CharaDataHubUi : WindowMediatorSubscriberBase private void DrawMcdfExport() { - _uiSharedService.BigText("Mare Character Data File Export"); + _uiSharedService.BigText("MCDF File Export"); - DrawHelpFoldout("This feature allows you to pack your character into a MCDF file and manually send it to other people. MCDF files can officially only be imported during GPose through Mare. " + + DrawHelpFoldout("This feature allows you to pack your character into a MCDF file and manually send it to other people. MCDF files be imported during GPose. " + "Be aware that the possibility exists that people write unofficial custom exporters to extract the containing data."); ImGuiHelpers.ScaledDummy(5); @@ -907,7 +907,7 @@ internal sealed partial class CharaDataHubUi : WindowMediatorSubscriberBase UiSharedService.ColorText(data.FullId, UiSharedService.GetBoolColor(data.CanBeDownloaded)); if (!data.CanBeDownloaded) { - UiSharedService.AttachToolTip("This data is incomplete on the server and cannot be downloaded. Contact the owner so they can fix it. If you are the owner, review the data in the MCD Online tab."); + UiSharedService.AttachToolTip("This data is incomplete on the server and cannot be downloaded. Contact the owner so they can fix it. If you are the owner, review the data in the Online Data tab."); } var offsetFromRight = availableWidth - _uiSharedService.GetIconData(FontAwesomeIcon.Calendar).X - _uiSharedService.GetIconButtonSize(FontAwesomeIcon.ArrowRight).X @@ -941,7 +941,7 @@ internal sealed partial class CharaDataHubUi : WindowMediatorSubscriberBase { using (ImRaii.Disabled(_isHandlingSelf)) { - if (_uiSharedService.IconTextButton(FontAwesomeIcon.Edit, "Open in MCD Online Editor")) + if (_uiSharedService.IconTextButton(FontAwesomeIcon.Edit, "Open in Online Data Editor")) { SelectedDtoId = data.Id; _openMcdOnlineOnNextRun = true; @@ -949,7 +949,7 @@ internal sealed partial class CharaDataHubUi : WindowMediatorSubscriberBase } if (_isHandlingSelf) { - UiSharedService.AttachToolTip("Cannot use MCD Online while having Character Data applied to self."); + UiSharedService.AttachToolTip("Cannot use Online Data while having Character Data applied to self."); } } @@ -1040,14 +1040,14 @@ internal sealed partial class CharaDataHubUi : WindowMediatorSubscriberBase _configService.Current.OpenMareHubOnGposeStart = openInGpose; _configService.Save(); } - _uiSharedService.DrawHelpText("This will automatically open the import menu when loading into Gpose. If unchecked you can open the menu manually with /mare gpose"); + _uiSharedService.DrawHelpText("This will automatically open the import menu when loading into Gpose. If unchecked you can open the menu manually with /sync gpose"); bool downloadDataOnConnection = _configService.Current.DownloadMcdDataOnConnection; - if (ImGui.Checkbox("Download MCD Online Data on connecting", ref downloadDataOnConnection)) + if (ImGui.Checkbox("Download Online Character Data on connecting", ref downloadDataOnConnection)) { _configService.Current.DownloadMcdDataOnConnection = downloadDataOnConnection; _configService.Save(); } - _uiSharedService.DrawHelpText("This will automatically download MCD Online data (Your Own and Shared with You) once a connection is established to the server."); + _uiSharedService.DrawHelpText("This will automatically download Online Character Data data (Your Own and Shared with You) once a connection is established to the server."); bool showHelpTexts = _configService.Current.ShowHelpTexts; if (ImGui.Checkbox("Show \"What is this? (Explanation / Help)\" foldouts", ref showHelpTexts))