Skip to content
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.

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

Added Notification Badges to the overview items. #277

Open
wants to merge 31 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
4e26d7a
1) Download static dump in XmlGenerator.
wvdvegt Mar 12, 2021
d18e6cb
1) Merged with main/origin from GitHub.
wvdvegt Mar 17, 2021
b1a6f71
1) Updated code to match latest on GitHub some more.
wvdvegt Mar 18, 2021
14121e5
1) Fixed the issue with the dangling industry notifications by cleari…
wvdvegt Oct 6, 2021
bd5fa55
1) Reverted some industry changes (splitting notifications for person…
wvdvegt Oct 26, 2021
964df39
1) Simplyfied NoFlickerListBox to get rid of slow window movement.
wvdvegt Oct 27, 2021
d45921a
1) Cleaned a using statement.
wvdvegt Oct 28, 2021
0a0d277
Merge branch 'temp_vegt2'
wvdvegt Oct 28, 2021
cc21e30
1) Commit of some changes that got lost in the merge.
wvdvegt Oct 28, 2021
2b592f9
1) Changed the ntp server to pool.ntp.org.
wvdvegt Oct 28, 2021
fcee267
1) Reverted async start of MainWindow.
wvdvegt Oct 28, 2021
826b0c4
1) Worked on sluggish movement after some time (no clue yet).
wvdvegt Oct 25, 2023
1103e0d
1) Updated packages.
wvdvegt Oct 25, 2023
4c68d22
1) Removed some decimals from larege ISK amounts.
wvdvegt Oct 26, 2023
b20503b
1) Updated readme.md.
wvdvegt Oct 26, 2023
0f21c46
Merge branch 'release/Viridian'
wvdvegt Oct 26, 2023
bf0ad28
Merge tag 'Viridian' into develop
wvdvegt Oct 26, 2023
6161451
1) By default sort IndustryJobs on TTC (once at first view).
wvdvegt Oct 28, 2023
9b62455
1) By default sort IndustryJobs on TTC (once at first view).
wvdvegt Oct 28, 2023
9e0b55b
1) Commit Fix.
wvdvegt Oct 28, 2023
2602617
1) Commit Fix.
wvdvegt Oct 28, 2023
3baef3b
1) Made TCC column for Industry a bit wider so it only shrinks after …
wvdvegt Nov 16, 2023
65d622c
1) Reverted change as columns are autosized with -2 as width.
wvdvegt Nov 16, 2023
7e02d73
1) Applied experimental Code to widen the TTC colums (so they don't h…
wvdvegt Nov 18, 2023
4668886
1) Updated some NuGet packages.
wvdvegt Nov 18, 2023
5fc3633
1) Commit (NuGet).
wvdvegt Nov 18, 2023
21d752f
1) Commit.
wvdvegt Nov 18, 2023
94f11af
1) Disabled more Lochitech G15 code in settings.
wvdvegt Nov 18, 2023
7ce5222
1) Disabled sine Tracing in EventHandlerExtensions.
wvdvegt Nov 24, 2023
88da32c
1) Updated zip files created from the SDE dump (Equinox) in src\EVEMo…
wvdvegt Jun 12, 2024
e5ec7ba
Merge branch 'release/Equinox_Data'
wvdvegt Jun 12, 2024
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
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -214,3 +214,8 @@ ModelManifest.xml
/*.rb
/*.bat
/tools/XmlGenerator/*.sqlite
/Remote.txt
/tools/XmlGenerator/sqlite-latest.sqlite.bz2
*.diff
tools/XmlGenerator/Index of -dump.url
src/EVEMon.Common/Resources/Index of -dump.url
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ A lightweight, easy-to-use standalone Windows application designed to assist you

For complete info on *How To Contribute* please visit the [wiki](https://bitbucket.org/EVEMonDevTeam/evemon/wiki) section

**Maintainer of the ESI fork:**
**Maintainer of the fork:**

[EVE:Wim van der Vegt](https://github.com/wvdvegt/evemon) (GitHub)

**Forked from:**

[EVE:Peter Han](https://github.com/peterhaneve/evemon) (GitHub)

Expand All @@ -27,4 +31,4 @@ For complete info on *How To Contribute* please visit the [wiki](https://bitbuck

[JimiC](https://github.com/JimiC) (GitHub)

[Jimi C](https://bitbucket.org/Desmont_McCallock) (Bitbucket)
[Jimi C](https://bitbucket.org/Desmont_McCallock) (Bitbucket)
288 changes: 284 additions & 4 deletions src/EVEMon.Common/App.config

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -50,28 +50,28 @@ public void Notify(NotificationEventArgs notification)

switch (notification.Behaviour)
{
case NotificationBehaviour.Cohabitate:
Items.Add(notification);
break;

case NotificationBehaviour.Overwrite:
// Replace the previous notifications with the same invalidation key
InvalidateCore(notification.InvalidationKey);
Items.Add(notification);
break;

case NotificationBehaviour.Merge:
// Merge the notifications with the same key
long key = notification.InvalidationKey;
foreach (NotificationEventArgs other in Items.Where(x => x.InvalidationKey == key))
{
notification.Append(other);
}

// Replace the previous notifications with the same invalidation key
InvalidateCore(key);
Items.Add(notification);
break;
case NotificationBehaviour.Cohabitate:
Items.Add(notification);
break;

case NotificationBehaviour.Overwrite:
// Replace the previous notifications with the same invalidation key
InvalidateCore(notification.InvalidationKey);
Items.Add(notification);
break;

case NotificationBehaviour.Merge:
// Merge the notifications with the same key
long key = notification.InvalidationKey;
foreach (NotificationEventArgs other in Items.Where(x => x.InvalidationKey == key))
{
notification.Append(other);
}

// Replace the previous notifications with the same invalidation key
InvalidateCore(key);
Items.Add(notification);
break;
}

EveMonClient.OnNotificationSent(notification);
Expand Down Expand Up @@ -1202,17 +1202,17 @@ internal void NotifyServerStatusChanged(string serverName, ServerStatus status)
string text = string.Empty;
switch (status)
{
case ServerStatus.Offline:
text = $"{serverName} is offline.";
break;
case ServerStatus.Online:
text = $"{serverName} is online.";
break;
case ServerStatus.CheckDisabled:
case ServerStatus.Unknown:
break;
default:
throw new NotImplementedException();
case ServerStatus.Offline:
text = $"{serverName} is offline.";
break;
case ServerStatus.Online:
text = $"{serverName} is online.";
break;
case ServerStatus.CheckDisabled:
case ServerStatus.Unknown:
break;
default:
throw new NotImplementedException();
}

if (!string.IsNullOrEmpty(text))
Expand Down Expand Up @@ -1341,15 +1341,25 @@ public void NotifyCharacterContractsAssigned(Character character, int assignedCo
#region Industry jobs completion

/// <summary>
/// Notify some character industry jobs have ended.
/// Invalidates the notification for completed industry hobs.
/// </summary>
/// <param name="character">The character.</param>
internal void InvalidateIndustryJobsCompleted(CCPCharacter character)
{
Invalidate(new NotificationInvalidationEventArgs(character, NotificationCategory.
IndustryJobsCompletion));
}

/// <summary>
/// Notify some character industry jobs have ended.
/// </summary>
/// <param name="character"> The character. </param>
/// <param name="jobsCompleted">The completed jobs.</param>
internal void NotifyCharacterIndustryJobCompletion(Character character,
IEnumerable<IndustryJob> jobsCompleted)
{
var notification = new IndustryJobsNotificationEventArgs(character, jobsCompleted)
{
{
Behaviour = NotificationBehaviour.Merge,
Priority = NotificationPriority.Information
};
Expand All @@ -1370,7 +1380,7 @@ internal void NotifyCorporationIndustryJobCompletion(Corporation corporation,
Priority = NotificationPriority.Information
};
Notify(notification);
}
}

#endregion

Expand Down
8 changes: 4 additions & 4 deletions src/EVEMon.Common/Constants/NetworkConstants.resx
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@
<comment>600</comment>
</data>
<data name="ESICharacterSheet" xml:space="preserve">
<value>/v4/characters/{0:D}/</value>
<comment>3600</comment>
<value>/v5/characters/{0:D}/</value>
<comment>120</comment>
</data>
<data name="ESIStandings" xml:space="preserve">
<value>/v1/characters/{0:D}/standings/</value>
Expand Down Expand Up @@ -480,7 +480,7 @@
<comment>3600</comment>
</data>
<data name="GlobalNTPPool" xml:space="preserve">
<value>0.pool.ntp.org</value>
<value>pool.ntp.org</value>
</data>
<data name="ESIBase" xml:space="preserve">
<value>https://esi.evetech.net</value>
Expand Down Expand Up @@ -610,4 +610,4 @@
<data name="FuzzworksMarketUrl" xml:space="preserve">
<value>https://market.fuzzwork.co.uk/aggregates/?region=10000002&amp;types=</value>
</data>
</root>
</root>
6 changes: 3 additions & 3 deletions src/EVEMon.Common/Constants/NetworkConstants1.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/EVEMon.Common/Controls/ControlExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public static bool IsDesignModeHosted(this Control control)
/// <param name="parent">The parent.</param>
public static void SuspendDrawing(this Control parent)
{
NativeMethods.SendMessage(parent.Handle, NativeMethods.WM_SETREDRAW, IntPtr.Zero, IntPtr.Zero);
//NativeMethods.SendMessage(parent.Handle, NativeMethods.WM_SETREDRAW, IntPtr.Zero, IntPtr.Zero);
}

/// <summary>
Expand All @@ -38,8 +38,8 @@ public static void SuspendDrawing(this Control parent)
/// <param name="parent">The parent.</param>
public static void ResumeDrawing(this Control parent)
{
NativeMethods.SendMessage(parent.Handle, NativeMethods.WM_SETREDRAW, (IntPtr)1, IntPtr.Zero);
parent.Refresh();
//NativeMethods.SendMessage(parent.Handle, NativeMethods.WM_SETREDRAW, (IntPtr)1, IntPtr.Zero);
//parent.Refresh();
}
}
}
}
69 changes: 37 additions & 32 deletions src/EVEMon.Common/Controls/NoFlickerListBox.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ protected override void OnDrawItem(DrawItemEventArgs e)
NativeMethods.CopyGraphics(e.Graphics, e.Bounds, bufferedGraphics.Graphics, new Point(0, 0));
}
}

/// <summary>
/// The list's window procedure.
/// </summary>
Expand All @@ -51,39 +51,44 @@ protected override void WndProc(ref Message m)
{
switch (m.Msg)
{
case NativeMethods.WM_ERASEBKGND:
PaintNonItemRegion();
m.Msg = NativeMethods.WM_NULL;
break;
case NativeMethods.WM_POINTERDOWN:
uint id = (uint)m.WParam & NativeMethods.PT_POINTERID_MASK;
if (NativeMethods.GetPointerType(id, out int pPointerType))
{
if (pPointerType == NativeMethods.PT_TOUCH)
// Touch press down
pointerDown = DateTime.UtcNow;
else
pointerDown = DateTime.MinValue;
// Handle the event
case NativeMethods.WM_ERASEBKGND:
PaintNonItemRegion();
m.Msg = NativeMethods.WM_NULL;
m.Result = new IntPtr(1);
} else
pointerDown = DateTime.MinValue;
break;
case NativeMethods.WM_POINTERUP:
// Check for tap and hold
if (DateTime.UtcNow.Subtract(pointerDown).TotalMilliseconds >= TOUCH_HOLD_TIME)
{
// Extract position from the event and convert to control coordinates
var pos = PointToClient(new Point(m.LParam.ToInt32()));
OnMouseDown(new MouseEventArgs(MouseButtons.Right, 1, pos.X, pos.Y, 0));
}
// Handle the event
m.Msg = NativeMethods.WM_NULL;
m.Result = new IntPtr(1);
pointerDown = DateTime.MinValue;
break;
return;
/*
case NativeMethods.WM_POINTERDOWN:
uint id = (uint)m.WParam & NativeMethods.PT_POINTERID_MASK;
if (NativeMethods.GetPointerType(id, out int pPointerType))
{
if (pPointerType == NativeMethods.PT_TOUCH)
// Touch press down
pointerDown = DateTime.UtcNow;
else
pointerDown = DateTime.MinValue;
// Handle the event
m.Msg = NativeMethods.WM_NULL;
m.Result = new IntPtr(1);
}
else
pointerDown = DateTime.MinValue;
break;
case NativeMethods.WM_POINTERUP:
// Check for tap and hold
if (DateTime.UtcNow.Subtract(pointerDown).TotalMilliseconds >= TOUCH_HOLD_TIME)
{
// Extract position from the event and convert to control coordinates
var pos = PointToClient(new Point(m.LParam.ToInt32()));
OnMouseDown(new MouseEventArgs(MouseButtons.Right, 1, pos.X, pos.Y, 0));
}
// Handle the event
m.Msg = NativeMethods.WM_NULL;
m.Result = new IntPtr(1);
pointerDown = DateTime.MinValue;

return;
*/
}

base.WndProc(ref m);
}

Expand Down
Loading