dave/eveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#71 implement new icon set and allow configuration via IconName in configuration json.

Browse Source
This commit is contained in:
Izakbar
2025-04-04 10:52:23 +01:00
parent 3177c80c66
commit bfcb7916e3
19 changed files with 967 additions and 885 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Eve-O-Preview/Configuration/Implementation/ThumbnailConfiguration.cs
View File

@@ -131,6 +131,8 @@ namespace EveOPreview.Configuration.Implementation
this.OverlayLabelColor = Color.Orange;
this.OverlayLabelSize = 10;
this.IconName = "";
this.LoginThumbnailLocation = new Point(5, 5);
}
@@ -262,6 +264,8 @@ namespace EveOPreview.Configuration.Implementation
public Color ActiveClientHighlightColor { get; set; }
public Color OverlayLabelColor { get; set; }
public int OverlayLabelSize { get; set; }
public string IconName { get; set; }
public int ActiveClientHighlightThickness { get; set; }
[JsonProperty("LoginThumbnailLocation")]

2
src/Eve-O-Preview/Configuration/Interface/IThumbnailConfiguration.cs
View File

@@ -71,6 +71,8 @@ namespace EveOPreview.Configuration
Color OverlayLabelColor { get; set; }
int OverlayLabelSize { get; set; }
string IconName { get; set; }
Point LoginThumbnailLocation { get; set; }
Point GetThumbnailLocation(string currentClient, string activeClient, Point defaultLocation);

4
src/Eve-O-Preview/Eve-O-Preview.csproj
View File

@@ -39,7 +39,7 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>icon.ico</ApplicationIcon>
<ApplicationIcon>original-icon.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup>
<StartupObject>EveOPreview.Program</StartupObject>
@@ -84,7 +84,7 @@
<EmbeddedResource Include="app.manifest" />
</ItemGroup>
<ItemGroup>
<Content Include="icon.ico" />
<Content Include="original-icon.ico" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="LightInject">

BIN
src/Eve-O-Preview/Icons/EVE-O_Amber.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 112 KiB

BIN
src/Eve-O-Preview/Icons/EVE-O_Blue.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 112 KiB

BIN
src/Eve-O-Preview/Icons/EVE-O_Cherry.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 112 KiB

BIN
src/Eve-O-Preview/Icons/EVE-O_Dal.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 112 KiB

BIN
src/Eve-O-Preview/Icons/EVE-O_Dark.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 103 KiB

BIN
src/Eve-O-Preview/Icons/EVE-O_Default.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 106 KiB

BIN
src/Eve-O-Preview/Icons/EVE-O_Mint.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 112 KiB

BIN
src/Eve-O-Preview/Icons/EVE-O_Purple.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 112 KiB

BIN
src/Eve-O-Preview/Icons/EVE-O_urns.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 112 KiB

6
src/Eve-O-Preview/Presenters/Implementation/MainFormPresenter.cs
View File

@@ -45,6 +45,8 @@ namespace EveOPreview.Presenters
this.View.ThumbnailStateChanged = this.UpdateThumbnailState;
this.View.DocumentationLinkActivated = this.OpenDocumentationLink;
this.View.ApplicationExitRequested = this.ExitApplication;
this.View.IconName = this._configuration.IconName;
}
private void Activate()
@@ -131,6 +133,8 @@ namespace EveOPreview.Presenters
this.View.OverlayLabelColor = this._configuration.OverlayLabelColor;
this.View.OverlayLabelSize = this._configuration.OverlayLabelSize;
this.View.IconName = this._configuration.IconName;
}
private async void SaveApplicationSettings()
@@ -172,6 +176,8 @@ namespace EveOPreview.Presenters
this._configuration.OverlayLabelColor = this.View.OverlayLabelColor;
this._configuration.OverlayLabelSize = this.View.OverlayLabelSize;
this._configuration.IconName = this.View.IconName;
this._configurationStorage.Save();
this.View.RefreshZoomSettings();

1634
src/Eve-O-Preview/View/Implementation/MainForm.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

43
src/Eve-O-Preview/View/Implementation/MainForm.cs
View File

@@ -1,7 +1,9 @@
using EveOPreview.Configuration;
using EveOPreview.Properties;
using System;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Windows.Forms;
using static System.Windows.Forms.VisualStyles.VisualStyleElement;
@@ -19,6 +21,7 @@ namespace EveOPreview.View
private bool _suppressEvents;
private Size _minimumSize;
private Size _maximumSize;
private string _iconName;
#endregion
public MainForm(ApplicationContext context)
@@ -39,9 +42,7 @@ namespace EveOPreview.View
this.InitOverlayLabelMap();
this.InitFormSize();
this.AnimationStyleCombo.DataSource = Enum.GetValues(typeof(AnimationStyle));
}
public bool MinimizeToTray
@@ -50,6 +51,43 @@ namespace EveOPreview.View
set => this.MinimizeToTrayCheckBox.Checked = value;
}
public string IconName
{
get => this._iconName;
set {
this._iconName = value;
// Set Icon
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
if (this._iconName == null || ((resources.GetObject(this._iconName))) == null)
{
this._iconName = "IconOriginal";
}
// pull icon from resources
try
{
var iconBytes = (byte[])resources.GetObject(this._iconName);
using (MemoryStream ms = new MemoryStream(iconBytes))
{
this.Icon = new Icon(ms);
this.NotifyIcon.Icon = this.Icon;
}
}
catch (Exception ex)
{
// Log ?
}
if (value != "")
{
this.ApplicationSettingsChanged?.Invoke();
}
}
}
public double ThumbnailOpacity
{
get => Math.Min(this.ThumbnailOpacityTrackBar.Value / 100.00, 1.00);
@@ -264,7 +302,6 @@ namespace EveOPreview.View
this.OverlayLabelSizeNumericEdit.Value = value;
}
}
public new void Show()
{
// Registers the current instance as the application's Main Form

156
src/Eve-O-Preview/View/Implementation/MainForm.resx
View File

@@ -117,84 +117,85 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="RestoreWindowMenuItem.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="RestoreWindowMenuItem.GenerateMember" type="System.Boolean, mscorlib">
<value>False</value>
</metadata>
<metadata name="ExitMenuItem.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
</data>
<data name="ExitMenuItem.GenerateMember" type="System.Boolean, mscorlib">
<value>False</value>
</metadata>
<metadata name="TitleMenuItem.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
</data>
<data name="TitleMenuItem.GenerateMember" type="System.Boolean, mscorlib">
<value>False</value>
</metadata>
<metadata name="SeparatorMenuItem.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
</data>
<data name="SeparatorMenuItem.GenerateMember" type="System.Boolean, mscorlib">
<value>False</value>
</metadata>
<metadata name="ContentTabControl.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
</data>
<data name="ContentTabControl.GenerateMember" type="System.Boolean, mscorlib">
<value>False</value>
</metadata>
<metadata name="GeneralTabPage.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
</data>
<data name="GeneralTabPage.GenerateMember" type="System.Boolean, mscorlib">
<value>False</value>
</metadata>
<metadata name="GeneralSettingsPanel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
</data>
<data name="GeneralSettingsPanel.GenerateMember" type="System.Boolean, mscorlib">
<value>False</value>
</metadata>
<metadata name="label4.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
</data>
<data name="label4.GenerateMember" type="System.Boolean, mscorlib">
<value>False</value>
</metadata>
<metadata name="ThumbnailTabPage.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
</data>
<data name="ThumbnailTabPage.GenerateMember" type="System.Boolean, mscorlib">
<value>False</value>
</metadata>
<metadata name="ThumbnailSettingsPanel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
</data>
<data name="ThumbnailSettingsPanel.GenerateMember" type="System.Boolean, mscorlib">
<value>False</value>
</metadata>
<metadata name="HeigthLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
</data>
<data name="HeigthLabel.GenerateMember" type="System.Boolean, mscorlib">
<value>False</value>
</metadata>
<metadata name="WidthLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
</data>
<data name="WidthLabel.GenerateMember" type="System.Boolean, mscorlib">
<value>False</value>
</metadata>
<metadata name="OpacityLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
</data>
<data name="OpacityLabel.GenerateMember" type="System.Boolean, mscorlib">
<value>False</value>
</metadata>
<metadata name="ZoomSettingsPanel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
</data>
<data name="ZoomSettingsPanel.GenerateMember" type="System.Boolean, mscorlib">
<value>False</value>
</metadata>
<metadata name="ZoomFactorLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
</data>
<data name="ZoomFactorLabel.GenerateMember" type="System.Boolean, mscorlib">
<value>False</value>
</metadata>
<metadata name="ZoomAnchorLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
</data>
<data name="ZoomAnchorLabel.GenerateMember" type="System.Boolean, mscorlib">
<value>False</value>
</metadata>
<metadata name="OverlayTabPage.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
</data>
<data name="OverlayTabPage.GenerateMember" type="System.Boolean, mscorlib">
<value>False</value>
</metadata>
<metadata name="OverlaySettingsPanel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
</data>
<data name="OverlaySettingsPanel.GenerateMember" type="System.Boolean, mscorlib">
<value>False</value>
</metadata>
<metadata name="ClientsTabPage.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
</data>
<data name="ClientsTabPage.GenerateMember" type="System.Boolean, mscorlib">
<value>False</value>
</metadata>
<metadata name="ClientsPanel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
</data>
<data name="ClientsPanel.GenerateMember" type="System.Boolean, mscorlib">
<value>False</value>
</metadata>
<metadata name="ThumbnailsListLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
</data>
<data name="ThumbnailsListLabel.GenerateMember" type="System.Boolean, mscorlib">
<value>False</value>
</metadata>
<metadata name="AboutTabPage.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
</data>
<data name="AboutTabPage.GenerateMember" type="System.Boolean, mscorlib">
<value>False</value>
</metadata>
<metadata name="AboutPanel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
</data>
<data name="AboutPanel.GenerateMember" type="System.Boolean, mscorlib">
<value>False</value>
</metadata>
<metadata name="CreditMaintLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
</data>
<data name="CreditMaintLabel.GenerateMember" type="System.Boolean, mscorlib">
<value>False</value>
</metadata>
<metadata name="DocumentationLinkLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
</data>
<data name="DocumentationLinkLabel.GenerateMember" type="System.Boolean, mscorlib">
<value>False</value>
</metadata>
<metadata name="DescriptionLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
</data>
<data name="DescriptionLabel.GenerateMember" type="System.Boolean, mscorlib">
<value>False</value>
</metadata>
</data>
<data name="DescriptionLabel.Text" xml:space="preserve">
<value>An advanced task switcher for EVE Online clients.
@@ -205,16 +206,16 @@ The program does NOT
• interact with EVE Online except of;
- resizing or bringing it to the foreground</value>
</data>
<metadata name="NameLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<data name="NameLabel.GenerateMember" type="System.Boolean, mscorlib">
<value>False</value>
</metadata>
<metadata name="NotifyIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="TrayMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>123, 17</value>
</metadata>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="NotifyIcon.TrayLocation" type="System.Drawing.Point, System.Drawing">
<value>17, 17</value>
</data>
<data name="TrayMenu.TrayLocation" type="System.Drawing.Point, System.Drawing">
<value>123, 17</value>
</data>
<data name="NotifyIcon.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAQAEBAAAAEAIABoBAAARgAAACAgAAABACAAqBAAAK4EAAAwMAAAAQAgAKglAABWFQAAQEAAAAEA
@@ -753,9 +754,9 @@ The program does NOT
Af//4AAAAAAH///wAAAAAA////gAAAAAH////gAAAAB/////AAAAAP/////AAAAD/////+AAAAf//w==
</value>
</data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<data name="$this.TrayHeight" type="System.Int32, mscorlib">
<value>36</value>
</metadata>
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAQAEBAAAAEAIABoBAAARgAAACAgAAABACAAqBAAAK4EAAAwMAAAAQAgAKglAABWFQAAQEAAAAEA
@@ -1294,4 +1295,35 @@ The program does NOT
Af//4AAAAAAH///wAAAAAA////gAAAAAH////gAAAAB/////AAAAAP/////AAAAD/////+AAAAf//w==
</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="IconOriginal" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\..\original-icon.ico;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="IconAmber" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\..\Icons\EVE-O_Amber.ico;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="IconBlue" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\..\Icons\EVE-O_Blue.ico;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="IconCherry" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\..\Icons\EVE-O_Cherry.ico;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="IconDal" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\..\Icons\EVE-O_Dal.ico;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="IconDark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\..\Icons\EVE-O_Dark.ico;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="IconDefault" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\..\Icons\EVE-O_Default.ico;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="IconMint" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\..\Icons\EVE-O_Mint.ico;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="IconPurple" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\..\Icons\EVE-O_Purple.ico;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="IconUrns" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\..\Icons\EVE-O_urns.ico;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>

2
src/Eve-O-Preview/View/Interface/IMainFormView.cs
View File

@@ -42,6 +42,8 @@ namespace EveOPreview.View
Color OverlayLabelColor { get; set; }
int OverlayLabelSize { get; set; }
string IconName { get; set; }
void SetDocumentationUrl(string url);
void SetVersionInfo(string version);
void SetThumbnailSizeLimitations(Size minimumSize, Size maximumSize);

0
src/Eve-O-Preview/icon.ico → src/Eve-O-Preview/original-icon.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB