Skip to content

Commit b4e66d6

Browse files
committed
wording pass, fix UI oversights
1 parent 4a52cba commit b4e66d6

29 files changed

Lines changed: 613 additions & 104 deletions

Snowcloak.Core/Snowcloak.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ItemGroup>
1010
<PackageReference Include="ElezenTools.Core" Version="15.5.5" />
1111
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.10" />
12-
<PackageReference Include="Snowcloak.API" Version="3.99.23" />
12+
<PackageReference Include="Snowcloak.API" Version="3.99.24" />
1313
<PackageReference Update="Meziantou.Analyzer" Version="3.0.124">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

Snowcloak/Services/UiFactory.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,13 @@ public SyncshellAdminUI CreateSyncshellAdminUi(GroupFullInfoDto dto)
7676
{
7777
return new SyncshellAdminUI(_loggerFactory.CreateLogger<SyncshellAdminUI>(), _snowMediator,
7878
_apiController, _configService, _fontService, _pairManager, dto, _performanceCollectorService, _syncshellBudgetService,
79-
_dalamudUtilService);
79+
_dalamudUtilService, _fileDialogManager, _imageTransferService);
8080
}
8181

8282
public SyncshellEventsWindow CreateSyncshellEventsUi(GroupFullInfoDto dto)
8383
{
8484
return new SyncshellEventsWindow(_loggerFactory.CreateLogger<SyncshellEventsWindow>(), _snowMediator,
85-
_apiController, _pairManager, _dalamudUtilService, _textureService, _imageTransferService, dto,
85+
_apiController, _pairManager, _dalamudUtilService, _textureService, _imageTransferService, _fileDialogManager, dto,
8686
_performanceCollectorService);
8787
}
8888

@@ -126,7 +126,7 @@ public RoomAdministrationWindow CreateRoomAdministrationWindow(string roomId)
126126
{
127127
return new RoomAdministrationWindow(_loggerFactory.CreateLogger<RoomAdministrationWindow>(), _snowMediator,
128128
_apiController, _chatService, _pairManager, _chatIdentityResolver, _roleplayClientService,
129-
_performanceCollectorService, roomId);
129+
_fileDialogManager, _imageTransferService, _performanceCollectorService, roomId);
130130
}
131131

132132
public PairRequestConfirmationWindow CreatePairRequestConfirmationWindow(string ident, string characterName, string pluginName)

Snowcloak/Snowcloak.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<PackageReference Include="NAudio" Version="2.3.0" />
4141
<PackageReference Include="Penumbra.Api" Version="5.15.1" />
4242
<PackageReference Include="Scrutor" Version="7.0.0" />
43-
<PackageReference Include="Snowcloak.API" Version="3.99.23" />
43+
<PackageReference Include="Snowcloak.API" Version="3.99.24" />
4444
<PackageReference Include="Snowcloak.CacheFile" Version="3.2.2.1" />
4545
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.20.0" />
4646
<PackageReference Include="Vortice.DXGI" Version="3.8.3" />

Snowcloak/UI/CharaDataHubGposeTogetherTab.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,19 +210,19 @@ private void DrawLobbyUser(GposeLobbyUserData user,
210210
{
211211
PlayerInteractionService.SetMarkerAndOpenMap(new(user.WorldData.Value.PositionX, user.WorldData.Value.PositionY, user.WorldData.Value.PositionZ), user.Map);
212212
}
213-
ElezenImgui.AttachTooltip(string.Format("{0}" + ElezenImgui.TooltipSeparator + "Note: Click to open the users location on your map." + Environment.NewLine + "Note: For GPose synchronization to work properly, you must be on the same map.",
213+
ElezenImgui.AttachTooltip(string.Format("{0}" + ElezenImgui.TooltipSeparator + "Note: Click to open the users location on your map." + Environment.NewLine + "Note: For GPose synchronisation to work properly, you must be on the same map.",
214214
sameMapAndServer.SameMap ? "You are on the same map." : "You are not on the same map."));
215215

216216
ImGui.SameLine();
217217
ElezenImgui.ShowIcon(FontAwesomeIcon.Globe, sameMapAndServer.SameServer ? ImGuiColors.ParsedGreen : ImGuiColors.DalamudRed);
218-
ElezenImgui.AttachTooltip(string.Format("{0}" + ElezenImgui.TooltipSeparator + "Note: GPose synchronization is not dependent on the current server, but you will have to spawn a character for the other lobby users.",
218+
ElezenImgui.AttachTooltip(string.Format("{0}" + ElezenImgui.TooltipSeparator + "Note: GPose synchronisation is not dependent on the current server, but you will have to spawn a character for the other lobby users.",
219219
sameMapAndServer.SameServer ? "You are on the same server." : "You are not on the same server."));
220220

221221
ImGui.SameLine();
222222
ElezenImgui.ShowIcon(FontAwesomeIcon.Running, sameMapAndServer.SameEverything ? ImGuiColors.ParsedGreen : ImGuiColors.DalamudRed);
223223
ElezenImgui.AttachTooltip((sameMapAndServer.SameEverything ? "You are in the same instanced area." : "You are not in the same instanced area.") + ElezenImgui.TooltipSeparator +
224224
"Note: Users not in your instance, but on the same map, will be drawn as floating wisps." + Environment.NewLine
225-
+ "Note: GPose synchronization is not dependent on the current instance, but you will have to spawn a character for the other lobby users.");
225+
+ "Note: GPose synchronisation is not dependent on the current instance, but you will have to spawn a character for the other lobby users.");
226226

227227
using (ImRaii.Disabled(!_dalamudUtilService.IsInGpose))
228228
{

Snowcloak/UI/Components/Account/AccountUidGenerationFlow.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ private void ConsumeOperation()
6868
{
6969
_success = true;
7070
_message = string.Format(CultureInfo.InvariantCulture,
71-
"Created account UID {0}. Stored {1} account key(s), including {2} new key(s), and assigned this character. Attempting to connect.",
71+
"Created account UID {0}. Registered {1} account key(s), including {2} new key(s), and assigned this character. Attempting to connect.",
7272
result.Uid, result.SecretKeyCount, result.NewSecretKeyCount);
7373
_ = _apiController.CreateConnections();
7474
}

Snowcloak/UI/Components/AdvancedSettingsPanel.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ public void Draw(CharacterData? lastCreatedCharacterData)
6363
{
6464
_mediator.Publish(new UiToggleMessage(typeof(EventViewerUI)));
6565
}
66+
6667

6768
var holdCombatApplication = _configService.Current.HoldCombatApplication;
6869
if (ImGui.Checkbox("Hold application during combat", ref holdCombatApplication))
@@ -74,6 +75,7 @@ public void Draw(CharacterData? lastCreatedCharacterData)
7475

7576
_configService.Update(c => c.HoldCombatApplication = holdCombatApplication);
7677
}
78+
ElezenImgui.DrawHelpText("Prevents applying character data if Snowcloak detects you're in combat. May help avoid hitches.");
7779

7880
ImGui.Separator();
7981
_fontService.BigText("Debug");
@@ -127,7 +129,7 @@ public void Draw(CharacterData? lastCreatedCharacterData)
127129
{
128130
_configService.Update(c => c.LogPerformance = logPerformance);
129131
}
130-
ElezenImgui.DrawHelpText("Enabling this can incur a (slight) performance impact. Enabling this for extended periods of time is not recommended.");
132+
ElezenImgui.DrawHelpText("Enabling this can incur a performance impact. Enabling this for extended periods of time is not recommended, and should only be used for debugging.");
131133

132134
using (ImRaii.Disabled(!logPerformance))
133135
{

Snowcloak/UI/Components/AnalysisBrowser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ private void DrawStatusAndStats(IAnalysisSource source, bool needAnalysis, bool
228228
ImGui.TextColored(ImGuiColors.DalamudOrange, FontAwesomeIcon.ExclamationTriangle.ToIconString());
229229
ImGui.SameLine(0f, 6f * scale);
230230
ImGui.TextColored(ImGuiColors.DalamudOrange,
231-
string.Format(CultureInfo.InvariantCulture, "This exceeds the default auto-pause thresholds ({0} MiB VRAM / {1}k triangles) other clients use.",
231+
string.Format(CultureInfo.InvariantCulture, "This exceeds the default auto-pause thresholds ({0} MiB VRAM / {1}k triangles) other clients use, and may be paused by them.",
232232
PerformanceBudgetPolicy.LegacyAutoBlockVramThresholdMiB, PerformanceBudgetPolicy.LegacyAutoBlockTrianglesThresholdThousands));
233233
ImGuiHelpers.ScaledDummy(new Vector2(0, 4));
234234
}

Snowcloak/UI/Components/ChatConversationView.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ private void DrawHeader(ConversationSnapshot conversation)
328328
}
329329

330330
ImGui.SameLine();
331-
if (ElezenImgui.ShowIconButton(FontAwesomeIcon.ExternalLinkAlt, "Open conversation in a separate window"))
331+
if (ElezenImgui.ShowIconButton(FontAwesomeIcon.ExternalLinkAlt, "Open conversation in a pop-out window"))
332332
{
333333
_mediator.Publish(new OpenChatPopoutMessage(conversation.Key));
334334
}

Snowcloak/UI/Components/CompactPairNotePopup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void Draw(PairManager pairManager, bool openPopupOnAdd)
4040
}
4141
else
4242
{
43-
ElezenImgui.WrappedText($"You have successfully added {_lastAddedUser.UserData.AliasOrUID}. Set a local note for the user in the field below:");
43+
ElezenImgui.WrappedText($"You have successfully added {_lastAddedUser.UserData.AliasOrUID}. Set a note for them below:");
4444
ImGui.InputTextWithHint("##noteforuser", $"Note for {_lastAddedUser.UserData.AliasOrUID}", ref _lastAddedUserComment, 100);
4545
if (ElezenImgui.ShowIconButton(Dalamud.Interface.FontAwesomeIcon.Save, "Save Note"))
4646
{

Snowcloak/UI/Components/DrawGroupPair.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ protected override float DrawRightSide(float textPosY, float originalY)
381381
permissions
382382
));
383383
}
384-
ElezenImgui.AttachTooltip("Sets your allowance for sound synchronization for this Syncshell member." +
384+
ElezenImgui.AttachTooltip("Whether or not sound synchronisation is allowed for this Syncshell member." +
385385
Environment.NewLine + "Disabling applies even without an individual pair.");
386386

387387
var isDisableAnims = permissions.IsDisableAnimations();
@@ -397,7 +397,7 @@ protected override float DrawRightSide(float textPosY, float originalY)
397397
permissions
398398
));
399399
}
400-
ElezenImgui.AttachTooltip("Sets your allowance for animation synchronization for this Syncshell member." +
400+
ElezenImgui.AttachTooltip("Whether or not animation sync is allowed for this Syncshell member." +
401401
Environment.NewLine +"Disabling applies even without an individual pair.");
402402

403403
var isDisableVfx = permissions.IsDisableVFX();
@@ -413,7 +413,7 @@ protected override float DrawRightSide(float textPosY, float originalY)
413413
permissions
414414
));
415415
}
416-
ElezenImgui.AttachTooltip("Sets your allowance for VFX synchronization for this Syncshell member." +
416+
ElezenImgui.AttachTooltip("Whether or not VFX sync is allowed for this Syncshell member." +
417417
Environment.NewLine + "Disabling applies even without an individual pair.");
418418

419419
ImGui.Separator();

0 commit comments

Comments
 (0)