Skip to content

Fleet name tooltip refactor #638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
myangelkamikaze merged 4 commits into from
Feb 17, 2026
Merged

Fleet name tooltip refactor #638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f228819
refactor
myangelkamikaze Feb 17, 2026
95982fb
useless usings
myangelkamikaze Feb 17, 2026
f171740
useless code
myangelkamikaze Feb 17, 2026
0967787
resource cleanup
myangelkamikaze Feb 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 33 additions & 13 deletions ElectronicObserver/Properties/Window/FleetResources.en.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,19 +156,6 @@
<data name="SupportTypeTorpedo" xml:space="preserve">
<value>Long-range Torpedo Attack</value>
</data>
<data name="FleetNameToolTip" xml:space="preserve">
<value>Lv sum: {0} / avg: {1:0.00}
{2} fleet
Support Expedition: {3}
Total FP {4} ({20}) / Torp {5} / AA {6} ({21}) / ASW {7} ({22}) / LOS {8} ({23}){26}
Drum: {9} ({10} ships)
Daihatsu: {11} ({12} ships, +{13:p1})
TP: S {14} / A {15}{27}
Surface Radar: {24} ({25} ships)
Consumption: {16} fuel / {17} ammo
({18} fuel / {19} ammo per battle)
</value>
</data>
<data name="WithoutProficiency" xml:space="preserve">
<value>w/o Proficiency</value>
</data>
Expand Down Expand Up @@ -285,4 +272,37 @@ Range: {20} / Speed: {21}
<data name="SearchingPhase" xml:space="preserve">
<value>Searching phase</value>
</data>
<data name="FleetNameToolTip_Level" xml:space="preserve">
<value>Lv sum: {0} / avg: {1:0.00}</value>
</data>
<data name="FleetNameToolTip_Speed" xml:space="preserve">
<value>{0} fleet</value>
</data>
<data name="FleetNameToolTip_Support" xml:space="preserve">
<value>Support Expedition: {0}</value>
</data>
<data name="FleetNameToolTip_Stats" xml:space="preserve">
<value>Total FP {0} ({1}) / Torp {2} / AA {3} ({4}) / ASW {5} ({6}) / LOS {7} ({8})</value>
</data>
<data name="FleetNameToolTip_Drum" xml:space="preserve">
<value>Drum: {0} ({1} ships)</value>
</data>
<data name="FleetNameToolTip_Daihatsu" xml:space="preserve">
<value>Daihatsu: {0} ({1} ships, +{2:p1})</value>
</data>
<data name="FleetNameToolTip_Tp" xml:space="preserve">
<value>TP: S {0} / A {1}</value>
</data>
<data name="FleetNameToolTip_SurfaceRadar" xml:space="preserve">
<value>Surface Radar: {0} ({1} ships)</value>
</data>
<data name="FleetNameToolTip_Consumption" xml:space="preserve">
<value>Consumption: {0} fuel / {1} ammo</value>
</data>
<data name="FleetNameToolTip_ConsumptionPerBattle" xml:space="preserve">
<value>({0} fuel / {1} ammo per battle)</value>
</data>
<data name="FleetNameToolTip_JetConsumption" xml:space="preserve">
<value>Jet: {0} steel per battle</value>
</data>
</root>
42 changes: 30 additions & 12 deletions ElectronicObserver/Properties/Window/FleetResources.es-ES.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,18 +156,6 @@
<data name="SupportTypeTorpedo" xml:space="preserve">
<value>Ataque de torpedos de largo alcance</value>
</data>
<data name="FleetNameToolTip" xml:space="preserve">
<value>Suma de niveles: {0} / Promedio: {1:0.00}
{2} flota
Apoyo de expedición: {3}
FP total {4} ({20}) / Torp {5} / AA {6} ({21}) / ASW {7} ({22}) / LOS {8} ({23}){26}
Bidones: {9} ({10} barcos)
Daihatsu: {11} ({12} barcos, +{13:p1})
TP: S {14} / A {15}{27}
Radar de superficie: {24} ({25} barcos)
Consumo: {16} de combustible / {17} de munición
({18} combustible / {19} munición por batalla)</value>
</data>
<data name="WithoutProficiency" xml:space="preserve">
<value>Sin competencia</value>
</data>
Expand Down Expand Up @@ -280,4 +268,34 @@ Alcance: {20} / Velocidad: {21}
<data name="SmokeScreen" xml:space="preserve">
<value>Pantalla de humo</value>
</data>
<data name="FleetNameToolTip_Level" xml:space="preserve">
<value>Suma de niveles: {0} / Promedio: {1:0.00}</value>
</data>
<data name="FleetNameToolTip_Speed" xml:space="preserve">
<value>{0} flota</value>
</data>
<data name="FleetNameToolTip_Support" xml:space="preserve">
<value>Apoyo de expedición: {0}</value>
</data>
<data name="FleetNameToolTip_Stats" xml:space="preserve">
<value>FP total {0} ({1}) / Torp {2} / AA {3} ({4}) / ASW {5} ({6}) / LOS {7} ({8})</value>
</data>
<data name="FleetNameToolTip_Drum" xml:space="preserve">
<value>Bidones: {0} ({1} barcos)</value>
</data>
<data name="FleetNameToolTip_Daihatsu" xml:space="preserve">
<value>Daihatsu: {0} ({1} barcos, +{2:p1})</value>
</data>
<data name="FleetNameToolTip_Tp" xml:space="preserve">
<value>TP: S {0} / A {1}</value>
</data>
<data name="FleetNameToolTip_SurfaceRadar" xml:space="preserve">
<value>Radar de superficie: {0} ({1} barcos)</value>
</data>
<data name="FleetNameToolTip_Consumption" xml:space="preserve">
<value>Consumo: {0} de combustible / {1} de munición</value>
</data>
<data name="FleetNameToolTip_ConsumptionPerBattle" xml:space="preserve">
<value>({0} combustible / {1} munición por batalla)</value>
</data>
</root>
42 changes: 30 additions & 12 deletions ElectronicObserver/Properties/Window/FleetResources.ko-KR.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,18 +156,6 @@
<data name="SupportTypeTorpedo" xml:space="preserve">
<value>지원 장거리 뇌격</value>
</data>
<data name="FleetNameToolTip" xml:space="preserve">
<value>Lv 합계: {0} / 평균: {1:0.00}
{2}함대
지원 공격: {3}
합계 화력 {4} ({20}) / 뇌장 {5} / 대공 {6} ({21}) / 대잠 {7} ({22}) / 색적 {8} ({23}){26}
드럼통 탑재: {9}개 ({10}함)
대발동정 탑재: {11}개 ({12}함, +{13:p1})
유송량(TP): S {14} / A {15}{27}
수상 전탐: {24}개 ({25}함)
총 적재: 연료 {16} / 탄약 {17}
(전투당 연료 {18} / 탄약 {19})</value>
</data>
<data name="WithoutProficiency" xml:space="preserve">
<value>숙련도 없음</value>
</data>
Expand Down Expand Up @@ -281,4 +269,34 @@
<data name="SmokeScreen" xml:space="preserve">
<value>연막</value>
</data>
<data name="FleetNameToolTip_Level" xml:space="preserve">
<value>Lv 합계: {0} / 평균: {1:0.00}</value>
</data>
<data name="FleetNameToolTip_Speed" xml:space="preserve">
<value>{0}함대</value>
</data>
<data name="FleetNameToolTip_Support" xml:space="preserve">
<value>지원 공격: {0}</value>
</data>
<data name="FleetNameToolTip_Stats" xml:space="preserve">
<value>합계 화력 {0} ({1}) / 뇌장 {2} / 대공 {3} ({4}) / 대잠 {5} ({6}) / 색적 {7} ({8})</value>
</data>
<data name="FleetNameToolTip_Drum" xml:space="preserve">
<value>드럼통 탑재: {0}개 ({1}함)</value>
</data>
<data name="FleetNameToolTip_Daihatsu" xml:space="preserve">
<value>대발동정 탑재: {0}개 ({1}함, +{2:p1})</value>
</data>
<data name="FleetNameToolTip_Tp" xml:space="preserve">
<value>유송량(TP): S {0} / A {1}</value>
</data>
<data name="FleetNameToolTip_SurfaceRadar" xml:space="preserve">
<value>수상 전탐: {0}개 ({1}함)</value>
</data>
<data name="FleetNameToolTip_Consumption" xml:space="preserve">
<value>총 적재: 연료 {0} / 탄약 {1}</value>
</data>
<data name="FleetNameToolTip_ConsumptionPerBattle" xml:space="preserve">
<value>(전투당 연료 {0} / 탄약 {1})</value>
</data>
</root>
45 changes: 33 additions & 12 deletions ElectronicObserver/Properties/Window/FleetResources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,18 +157,6 @@
<data name="SupportTypeTorpedo" xml:space="preserve">
<value>支援長距離雷撃</value>
</data>
<data name="FleetNameToolTip" xml:space="preserve">
<value>Lv合計: {0} / 平均: {1:0.00}
{2}艦隊
支援攻撃: {3}
合計火力 {4} ({20}) / 雷装 {5} / 対空 {6} ({21}) / 対潜 {7} ({22}) / 索敵 {8} ({23}){26}
ドラム缶搭載: {9}個 ({10}艦)
大発動艇搭載: {11}個 ({12}艦, +{13:p1})
輸送量(TP): S {14} / A {15}{27}
水上電探: {24}個 ({25}艦)
総積載: 燃 {16} / 弾 {17}
(1戦当たり 燃 {18} / 弾 {19})</value>
</data>
<data name="WithoutProficiency" xml:space="preserve">
<value>熟練度なし</value>
</data>
Expand Down Expand Up @@ -285,4 +273,37 @@
<data name="SearchingPhase" xml:space="preserve">
<value>索敵フェイズ</value>
</data>
<data name="FleetNameToolTip_Level" xml:space="preserve">
<value>Lv合計: {0} / 平均: {1:0.00}</value>
</data>
<data name="FleetNameToolTip_Speed" xml:space="preserve">
<value>{0}艦隊</value>
</data>
<data name="FleetNameToolTip_Support" xml:space="preserve">
<value>支援攻撃: {0}</value>
</data>
<data name="FleetNameToolTip_Stats" xml:space="preserve">
<value>合計火力 {0} ({1}) / 雷装 {2} / 対空 {3} ({4}) / 対潜 {5} ({6}) / 索敵 {7} ({8})</value>
</data>
<data name="FleetNameToolTip_Drum" xml:space="preserve">
<value>ドラム缶搭載: {0}個 ({1}艦)</value>
</data>
<data name="FleetNameToolTip_Daihatsu" xml:space="preserve">
<value>大発動艇搭載: {0}個 ({1}艦, +{2:p1})</value>
</data>
<data name="FleetNameToolTip_Tp" xml:space="preserve">
<value>輸送量(TP): S {0} / A {1}</value>
</data>
<data name="FleetNameToolTip_SurfaceRadar" xml:space="preserve">
<value>水上電探: {0}個 ({1}艦)</value>
</data>
<data name="FleetNameToolTip_Consumption" xml:space="preserve">
<value>総積載: 燃 {0} / 弾 {1}</value>
</data>
<data name="FleetNameToolTip_ConsumptionPerBattle" xml:space="preserve">
<value>(1戦当たり 燃 {0} / 弾 {1})</value>
</data>
<data name="FleetNameToolTip_JetConsumption" xml:space="preserve">
<value>ジェット1戦当たり: 鋼材 {0}</value>
</data>
</root>
42 changes: 30 additions & 12 deletions ElectronicObserver/Properties/Window/FleetResources.zh-CN.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,18 +150,6 @@
<data name="SupportTypeTorpedo" xml:space="preserve">
<value>长距离雷击支援</value>
</data>
<data name="FleetNameToolTip" xml:space="preserve">
<value>Lv合计: {0} / 平均: {1:0.00}
{2}舰队
支援攻击: {3}
总火力 {4} ({20}) / 雷装 {5} / 对空 {6} ({21}) / 对潜 {7} ({22}) / 索敌 {8} ({23}){26}
运输桶搭载: {9}个 ({10}舰)
大发动艇搭载: {11}个 ({12}舰, +{13:p1})
运输量(TP): S {14} / A {15}{27}
水上电探: {24}个 ({25}舰)
总搭载: 燃 {16} / 弹 {17}
(1次战斗消耗 燃 {18} / 弹 {19})</value>
</data>
<data name="WithoutProficiency" xml:space="preserve">
<value>无熟练度</value>
</data>
Expand Down Expand Up @@ -266,4 +254,34 @@
<data name="SearchingPhase" xml:space="preserve">
<value>索敌阶段</value>
</data>
<data name="FleetNameToolTip_Level" xml:space="preserve">
<value>Lv合计: {0} / 平均: {1:0.00}</value>
</data>
<data name="FleetNameToolTip_Speed" xml:space="preserve">
<value>{0}舰队</value>
</data>
<data name="FleetNameToolTip_Support" xml:space="preserve">
<value>支援攻击: {0}</value>
</data>
<data name="FleetNameToolTip_Stats" xml:space="preserve">
<value>总火力 {0} ({1}) / 雷装 {2} / 对空 {3} ({4}) / 对潜 {5} ({6}) / 索敌 {7} ({8})</value>
</data>
<data name="FleetNameToolTip_Drum" xml:space="preserve">
<value>运输桶搭载: {0}个 ({1}舰)</value>
</data>
<data name="FleetNameToolTip_Daihatsu" xml:space="preserve">
<value>大发动艇搭载: {0}个 ({1}舰, +{2:p1})</value>
</data>
<data name="FleetNameToolTip_Tp" xml:space="preserve">
<value>运输量(TP): S {0} / A {1}</value>
</data>
<data name="FleetNameToolTip_SurfaceRadar" xml:space="preserve">
<value>水上电探: {0}个 ({1}舰)</value>
</data>
<data name="FleetNameToolTip_Consumption" xml:space="preserve">
<value>总搭载: 燃 {0} / 弹 {1}</value>
</data>
<data name="FleetNameToolTip_ConsumptionPerBattle" xml:space="preserve">
<value>(1次战斗消耗 燃 {0} / 弹 {1})</value>
</data>
</root>
42 changes: 30 additions & 12 deletions ElectronicObserver/Properties/Window/FleetResources.zh-TW.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,18 +156,6 @@
<data name="SupportTypeTorpedo" xml:space="preserve">
<value>長距離支援雷擊</value>
</data>
<data name="FleetNameToolTip" xml:space="preserve">
<value>總等級: {0} / 平均: {1:0.00}
{2}艦隊
支援攻擊: {3}
總計火力 {4} ({20}) / 雷裝 {5} / 對空 {6} ({21}) / 反潛 {7} ({22}) / 索敵 {8} ({23}){26}
搭載運輸罐: {9}個 ({10}艦)
搭載大發動艇: {11}個 ({12}艦, +{13:p1})
運送量(TP): S {14} / A {15}{27}
水上電探: {24}個 ({25}艦)
總消耗: 油 {16} / 彈 {17}
(每場戰鬥 油 {18} / 彈 {19})</value>
</data>
<data name="WithoutProficiency" xml:space="preserve">
<value>無熟練度</value>
</data>
Expand Down Expand Up @@ -284,4 +272,34 @@
<data name="SearchingPhase" xml:space="preserve">
<value>索敵階段</value>
</data>
<data name="FleetNameToolTip_Support" xml:space="preserve">
<value>支援攻擊: {0}</value>
</data>
<data name="FleetNameToolTip_Level" xml:space="preserve">
<value>總等級: {0} / 平均: {1:0.00}</value>
</data>
<data name="FleetNameToolTip_Speed" xml:space="preserve">
<value>{0}艦隊</value>
</data>
<data name="FleetNameToolTip_Stats" xml:space="preserve">
<value>總計火力 {0} ({1}) / 雷裝 {2} / 對空 {3} ({4}) / 反潛 {5} ({6}) / 索敵 {7} ({8})</value>
</data>
<data name="FleetNameToolTip_Drum" xml:space="preserve">
<value>搭載運輸罐: {0}個 ({1}艦)</value>
</data>
<data name="FleetNameToolTip_Daihatsu" xml:space="preserve">
<value>搭載大發動艇: {0}個 ({1}艦, +{2:p1})</value>
</data>
<data name="FleetNameToolTip_Tp" xml:space="preserve">
<value>運送量(TP): S {0} / A {1}</value>
</data>
<data name="FleetNameToolTip_SurfaceRadar" xml:space="preserve">
<value>水上電探: {0}個 ({1}艦)</value>
</data>
<data name="FleetNameToolTip_Consumption" xml:space="preserve">
<value>總消耗: 油 {0} / 彈 {1}</value>
</data>
<data name="FleetNameToolTip_ConsumptionPerBattle" xml:space="preserve">
<value>(每場戰鬥 油 {0} / 彈 {1})</value>
</data>
</root>
5 changes: 4 additions & 1 deletion ElectronicObserver/Utility/Data/TransportGaugeService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,10 @@ public string GetEventLandingOperationToolTip(List<IFleetData> fleets, List<TpGa

if (sb.Length is 0) return "";

return $"\n{Translations.LandingOperationTooltip}:\n{sb.ToString().TrimEnd()}";
return $"""
{Translations.LandingOperationTooltip}:
{sb.ToString().TrimEnd()}
""";
}

public List<TpGauge> GetEventLandingGauges(bool includeNone)
Expand Down
1 change: 0 additions & 1 deletion ElectronicObserver/ViewModels/Translations/FormFleetTranslationViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ public class FormFleetTranslationViewModel : TranslationBaseViewModel
public string SupportTypeShelling => FleetResources.SupportTypeShelling;
public string SupportTypeTorpedo => FleetResources.SupportTypeTorpedo;

public string FleetNameToolTip => FleetResources.FleetNameToolTip;
public string WithoutProficiency => FleetResources.WithoutProficiency;
public string WithProficiency => FleetResources.WithProficiency;
public string FleetLosToolTip => FleetResources.FleetLosToolTip;
Expand Down
12 changes: 12 additions & 0 deletions ElectronicObserver/Window/Wpf/Extensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Text;
using System.Windows;
Expand Down Expand Up @@ -322,4 +323,15 @@ public static ObservableCollection<T> ToObservableCollection<T>(this IEnumerable

public static ReadOnlyCollection<T> ToReadOnlyCollection<T>(this IList<T> enumerable)
=> new(enumerable);

public static StringBuilder AppendFormatLine(
this StringBuilder sb,
[StringSyntax(StringSyntaxAttribute.CompositeFormat)] string format,
params ReadOnlySpan<object?> args)
{
sb.AppendFormat(format, args);
sb.AppendLine();

return sb;
}
}
Loading