Skip to content

Icons Added #688

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 7 commits into from
Aug 3, 2026
Merged

Icons Added #688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8588202
test
Jul 28, 2026
6ce4f95
Added 2 new icons
Jul 28, 2026
8b312d4
added 1 new icons Added 1 new icons
Jul 28, 2026
b21a882
added 1 more icon
Jul 28, 2026
1a1df15
added 3 more Icons
Aug 1, 2026
9af0d30
added 3 more Icons
Aug 2, 2026
8a8bff3
Delete ElectronicObserver/74eo.png
wasicsop Aug 2, 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
Binary file added ElectronicObserver.Avalonia/Assets/Form/EquipmentUpgradePlanner.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ElectronicObserver.Avalonia/Assets/Form/EventLockPlanner.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ElectronicObserver.Avalonia/Assets/Form/ExpeditionRecord.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ElectronicObserver.Avalonia/Assets/Form/KancolleProgress.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ElectronicObserver.Avalonia/Assets/Form/QuestTrackerM.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ElectronicObserver.Avalonia/Assets/Form/SortieRecord.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions ElectronicObserver/Common/IconContentIcon.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,13 @@
<markup:Case Label="{x:Static resource:IconContent.FormExpeditionCheck}" Value="{StaticResource Form.ExpeditionCheck}" />
<markup:Case Label="{x:Static resource:IconContent.FormFleetPreset}" Value="{StaticResource Form.FleetPreset}" />

<markup:Case Label="{x:Static resource:IconContent.FormEventLockPlanner}" Value="{StaticResource Form.EventLockPlanner}" />
<markup:Case Label="{x:Static resource:IconContent.FormExpeditionRecord}" Value="{StaticResource Form.ExpeditionRecord}" />
<markup:Case Label="{x:Static resource:IconContent.FormSortieRecord}" Value="{StaticResource Form.SortieRecord}" />
<markup:Case Label="{x:Static resource:IconContent.FormEquipmentUpgradePlanner}" Value="{StaticResource Form.EquipmentUpgradePlanner}" />
<markup:Case Label="{x:Static resource:IconContent.FormKanColleProgress}" Value="{StaticResource Form.KanColleProgress}" />
<markup:Case Label="{x:Static resource:IconContent.FormQuestTrackerManager}" Value="{StaticResource Form.QuestTrackerManager}" />

<markup:Case Label="{x:Static resource:IconContent.FleetNoShip}" Value="{StaticResource Fleet.NoShip}" />
<markup:Case Label="{x:Static resource:IconContent.FleetDocking}" Value="{StaticResource Fleet.Docking}" />
<markup:Case Label="{x:Static resource:IconContent.FleetSortieDamaged}" Value="{StaticResource Fleet.SortieDamaged}" />
Expand Down Expand Up @@ -129,6 +136,7 @@
<markup:Case Label="{x:Static resource:IconContent.ShipStateExpedition}" Value="{StaticResource ShipState.Expedition}" />
<markup:Case Label="{x:Static resource:IconContent.ShipStateRepair}" Value="{StaticResource ShipState.Repair}" />
<markup:Case Label="{x:Static resource:IconContent.ShipStateSunk}" Value="{StaticResource ShipState.Sunk}" />

</markup:Switch>
</Image.Source>
</Image>
Expand Down
12 changes: 6 additions & 6 deletions ElectronicObserver/FormMainWpf.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@
Header="{Binding FormMain.SortieRecordViewer}"
>
<MenuItem.Icon>
<common:IconContentIcon Type="FormEquipmentList" />
<common:IconContentIcon Type="FormSortieRecord"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem
Expand All @@ -566,7 +566,7 @@
Header="{Binding FormMain.ExpeditionRecordViewer}"
>
<MenuItem.Icon>
<common:IconContentIcon Type="FormEquipmentList" />
<common:IconContentIcon Type="FormExpeditionRecord" />
</MenuItem.Icon>
</MenuItem>
<MenuItem
Expand Down Expand Up @@ -694,7 +694,7 @@
Header="{Binding FormMain.StripMenu_Tool_KancolleProgress}"
>
<MenuItem.Icon>
<common:IconContentIcon Type="FormEquipmentList" />
<common:IconContentIcon Type="FormKanColleProgress" />
</MenuItem.Icon>
</MenuItem>
<MenuItem
Expand All @@ -708,17 +708,17 @@
</MenuItem>
<MenuItem Command="{Binding OpenQuestTrackerManagerCommand}" Header="{Binding FormMain.StripMenu_Tool_QuestTrackerManager}">
<MenuItem.Icon>
<common:IconContentIcon Type="FormQuest" />
<common:IconContentIcon Type="FormQuestTrackerManager" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Command="{Binding OpenEventLockPlannerCommand}" Header="{Binding FormMain.EventLockPlannerTitle}">
<MenuItem.Icon>
<common:IconContentIcon Type="FormQuest" />
<common:IconContentIcon Type="FormEventLockPlanner" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Command="{Binding OpenEquipmentUpgradePlannerCommand}" Header="{Binding FormMain.EquipmentUpgradePlannerTitle}">
<MenuItem.Icon>
<common:IconContentIcon Type="FormQuest" />
<common:IconContentIcon Type="FormEquipmentUpgradePlanner" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Command="{Binding OpenAutoRefreshCommand}" Header="{Binding FormMain.AutoRefreshTitle}">
Expand Down
7 changes: 7 additions & 0 deletions ElectronicObserver/Icons.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,13 @@
<BitmapImage x:Key="Form.ShipGroup" UriSource="pack://siteoforigin:,,,/Assets/Form/ShipGroup.png" />
<BitmapImage x:Key="Form.WindowCapture" UriSource="pack://siteoforigin:,,,/Assets/Form/WindowCapture.png" />

<BitmapImage x:Key="Form.EventLockPlanner" UriSource="pack://siteoforigin:,,,/Assets/Form/EventLockPlanner.png" />
<BitmapImage x:Key="Form.ExpeditionRecord" UriSource="pack://siteoforigin:,,,/Assets/Form/ExpeditionRecord.png" />
<BitmapImage x:Key="Form.SortieRecord" UriSource="pack://siteoforigin:,,,/Assets/Form/SortieRecord.png" />
<BitmapImage x:Key="Form.EquipmentUpgradePlanner" UriSource="pack://siteoforigin:,,,/Assets/Form/EquipmentUpgradePlanner.png" />
<BitmapImage x:Key="Form.KanColleProgress" UriSource="pack://siteoforigin:,,,/Assets/Form/KanColleProgress.png" />
<BitmapImage x:Key="Form.QuestTrackerManager" UriSource="pack://siteoforigin:,,,/Assets/Form/QuestTrackerM.png" />

<BitmapImage x:Key="Fleet.AnchorageRepairing" UriSource="pack://siteoforigin:,,,/Assets/Fleet/AnchorageRepairing.png" />
<BitmapImage x:Key="Fleet.Combined" UriSource="pack://siteoforigin:,,,/Assets/Fleet/Combined.png" />
<BitmapImage x:Key="Fleet.Damaged" UriSource="pack://siteoforigin:,,,/Assets/Fleet/Damaged.png" />
Expand Down
6 changes: 6 additions & 0 deletions ElectronicObserver/Resource/ResourceManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,4 +791,10 @@ public enum IconContent
ShipStateExpedition,
ShipStateRepair,
ShipStateSunk,
FormEventLockPlanner,
FormExpeditionRecord,
FormSortieRecord,
FormEquipmentUpgradePlanner,
FormKanColleProgress,
FormQuestTrackerManager,
}
Loading