- Allow temp channels again for fixed tabs

- French and Chinese loc update
This commit is contained in:
Infi
2025-02-07 12:05:18 +01:00
parent 8354db5b03
commit 14cb3af13a
5 changed files with 9 additions and 11 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<Version>1.29.18</Version> <Version>1.29.19</Version>
<TargetFramework>net8.0-windows</TargetFramework> <TargetFramework>net8.0-windows</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
-2
View File
@@ -463,8 +463,6 @@ internal class UsedChannel
internal void SetChannel(InputChannel channel) internal void SetChannel(InputChannel channel)
{ {
UseTempChannel = false;
TempTellTarget = null;
Channel = channel; Channel = channel;
} }
} }
+3 -3
View File
@@ -188,10 +188,10 @@
<value>Permettre le redimensionnement du chat</value> <value>Permettre le redimensionnement du chat</value>
</data> </data>
<data name="Popout_CanMove_Name"> <data name="Popout_CanMove_Name">
<value>Allow moving window</value> <value>Autoriser le déplacement de la fenêtre</value>
</data> </data>
<data name="Popout_CanResize_Name"> <data name="Popout_CanResize_Name">
<value>Allow resizing window</value> <value>Autoriser le redimensionnement de la fenêtre</value>
</data> </data>
<data name="Options_ShowTitleBar_Name"> <data name="Options_ShowTitleBar_Name">
<value>Afficher la barre de titre du chat</value> <value>Afficher la barre de titre du chat</value>
@@ -1292,7 +1292,7 @@
<value>Date</value> <value>Date</value>
</data> </data>
<data name="DbViewer_TableField_Type" xml:space="preserve"> <data name="DbViewer_TableField_Type" xml:space="preserve">
<value>Channel</value> <value>Canal</value>
</data> </data>
<data name="DbViewer_TableField_Sender" xml:space="preserve"> <data name="DbViewer_TableField_Sender" xml:space="preserve">
<value>Expéditeur</value> <value>Expéditeur</value>
+3 -3
View File
@@ -188,10 +188,10 @@
<value>允许调整聊天窗口大小</value> <value>允许调整聊天窗口大小</value>
</data> </data>
<data name="Popout_CanMove_Name"> <data name="Popout_CanMove_Name">
<value>Allow moving window</value> <value>允许移动窗口</value>
</data> </data>
<data name="Popout_CanResize_Name"> <data name="Popout_CanResize_Name">
<value>Allow resizing window</value> <value>允许调整窗口大小</value>
</data> </data>
<data name="Options_ShowTitleBar_Name"> <data name="Options_ShowTitleBar_Name">
<value>显示聊天窗口标题栏</value> <value>显示聊天窗口标题栏</value>
@@ -1292,7 +1292,7 @@
<value>日期</value> <value>日期</value>
</data> </data>
<data name="DbViewer_TableField_Type" xml:space="preserve"> <data name="DbViewer_TableField_Type" xml:space="preserve">
<value>Channel</value> <value>频道</value>
</data> </data>
<data name="DbViewer_TableField_Sender" xml:space="preserve"> <data name="DbViewer_TableField_Sender" xml:space="preserve">
<value>发送人</value> <value>发送人</value>
+2 -2
View File
@@ -9,7 +9,6 @@ using ChatTwo.GameFunctions.Types;
using ChatTwo.Resources; using ChatTwo.Resources;
using ChatTwo.Util; using ChatTwo.Util;
using Dalamud.Game.Addon.Lifecycle; using Dalamud.Game.Addon.Lifecycle;
using Dalamud.Game.ClientState.Conditions;
using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Game.Text.SeStringHandling.Payloads; using Dalamud.Game.Text.SeStringHandling.Payloads;
using Dalamud.Interface; using Dalamud.Interface;
@@ -485,8 +484,9 @@ public sealed class ChatLogWindow : Window
// the text input in a tab with input disabled. The usual way that // the text input in a tab with input disabled. The usual way that
// Activate gets disabled is via the text input callback, but that // Activate gets disabled is via the text input callback, but that
// doesn't get called if the input is disabled. // doesn't get called if the input is disabled.
if (Plugin.CurrentTab.InputDisabled == true) if (Plugin.CurrentTab.InputDisabled)
Activate = false; Activate = false;
if (Plugin.Config is { OverrideStyle: true, ChosenStyle: not null }) if (Plugin.Config is { OverrideStyle: true, ChosenStyle: not null })
StyleModel.GetConfiguredStyles()?.FirstOrDefault(style => style.Name == Plugin.Config.ChosenStyle)?.Pop(); StyleModel.GetConfiguredStyles()?.FirstOrDefault(style => style.Name == Plugin.Config.ChosenStyle)?.Pop();
} }