Skip to content

Commit 17a2454

Browse files
committed
Changed AlertsForm alerts order to show include rules first.
Since include rules are processed before excludes, this should be reflected in the UI for clarity.
1 parent 638969c commit 17a2454

File tree

5 files changed

+51
-53
lines changed

5 files changed

+51
-53
lines changed

Source/Controls/FissureControl.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using Newtonsoft.Json.Linq;
77
using ScriptFUSION.WarframeAlertTracker.Resource;
88
using ScriptFUSION.WarframeAlertTracker.Alerts;
9-
using ScriptFUSION.WarframeAlertTracker.Drawing;
109

1110
namespace ScriptFUSION.WarframeAlertTracker.Controls {
1211
public partial class FissureControl : UserControl {
@@ -26,7 +25,7 @@ public bool Active
2625
}
2726
}
2827

29-
public Color ActiveColour { get; } = Color.FromArgb(byte.MaxValue / 6, Color.CornflowerBlue);
28+
public Color ActiveColour { get; } = Color.FromArgb(byte.MaxValue / 5, Color.CornflowerBlue);
3029

3130
public FissureControl() {
3231
InitializeComponent();

Source/Forms/AlertsForm.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Source/Forms/AlertsForm.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ private void PopulateFissureData() {
4242
private void PopulateAlerts() {
4343
alerts.Items.Clear();
4444

45-
foreach (var alert in Alerts) {
45+
foreach (var alert in Alerts.OrderBy(alert => alert.MatchingRule)) {
4646
alerts.Items.Add(new ListViewItem(alert.Type.ToString(), (int)alert.MatchingRule) {
4747
Tag = alert,
4848
Checked = alert.Enabled,

Source/Forms/AlertsForm.resx

Lines changed: 45 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -124,52 +124,51 @@
124124
<value>
125125
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
126126
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
127-
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABM
128-
CgAAAk1TRnQBSQFMAgEBAgEAARgBAAEYAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
129-
AwABEAMAAQEBAAEgBgABEP8AJwADOAFdAVEBVwFLAaUBWQFxAUQBzgFZAW4BRgHJAVABVQFLAZ0DMgFQ
130-
JAADEAEVAkgBTAGIAlIBggHOAT8BQAG3AfABPwFAAbcB8AJQAYUB0QJMAVMBlAMbASacAAMlATcBWQF4
131-
AT0B1wFOAaQBAAH/AU0BpAEAAf8BTgGkAQAB/wFOAaQBAAH/AU4BpAEAAf8BTgGkAQAB/wFYAWsBRQHH
132-
AxgBIhgAAywBRAFCAUQBsAHsASoBLAHbAf8BMAEyAdwB/wEwATIB3AH/ATABMgHcAf8BMQEzAdwB/wEq
133-
ASwB2wH/ATMBNQHTAf0COQE6AWCUAAMkATYBTgGkAQAB/wFSAaYBAAH/AUUBnwEAAf8BMQGVAQAB/wE9
134-
AZsBAAH/AVEBpgEAAf8BTgGkAQAB/wFOAaQBAAH/AU4BpAEAAf8BUwGSAR0B8QMWAR4QAAMjAjMBNQHd
135-
Af8BIQEjAdkB/wEeASAB2QH/ARoBHQHYAf8BNAE2Ad0B/wE1ATcB3QH/ARwBHgHZAf8BHgEhAdkB/wEh
136-
ASMB2QH/ATEBMwHcAf8DNAFUjAADBAEGAVYBkwEZAfIBUAGlAQAB/wE+AZwBAAH/AUwBowEAAf8BqAHS
137-
AYAB/wFtAbQBKwH/AS4BkwEAAf8BUAGlAQAB/wFPAaQBAAH/AU4BpAEAAf8BTgGkAQAB/wFZAXgBPQHX
138-
EAABSAFJAaMB5QEYARoB2AH/AYcBiAHqAf8CygH2Af8BUQFTAeIB/wEMAQ4B1gH/AQ4BEAHWAf8BQAFC
139-
Ad8B/wLKAfYB/wGeAZ8B7gH/ARoBHQHZAf8BMQEzAdcB/gMJAQyIAAFAAUEBQAFxAU8BpQEAAf8BSAGh
140-
AQAB/wEoAZABAAH/AcEB3wGlCf8BYgGuASgB/wEqAZEBAAH/AU8BpQEAAf8BTwGkAQAB/wFOAaQBAAH/
141-
AU4BpAEAAf8CMQEwAU0IAAM4AVwBLwExAdwB/wEIAQoB1QH/AbYBtwHzBf8C9gH9Af8BLgEwAdwB/wEd
142-
ASAB2QH/AukB+wX/Ac0BzgH2Af8BDAEOAdYB/wEtAS8B3AH/AkQBRgF7iAABWQFvAUUBygFPAaUBAAH/
143-
ASwBkgEAAf8BmAHJAWAF/wHwAfcB4gn/AWUBsAEtAf8BKQGRAQAB/wFPAaUBAAH/AU8BpAEAAf8BTgGk
144-
AQAB/wFRAVcBSwGlCAABUAFRAWMBrgEwATIB3AH/ASUBKAHaAf8BIwEmAdoB/wHLAcwB9gX/AuoB+wH/
145-
AuIB+gX/AtsB+QH/ASsBLQHbAf8BIgEkAdoB/wEwATIB3AH/AlEBfQHMiAABWAGEATEB4wE1AZcBAAH/
146-
AXcBuQE9Bf8C/QH7Af8BQQGdAQMB/wFzAbcBOQn/AWoBswE0Af8BKQGQAQAB/wFOAaQBAAH/AU8BpAEA
147-
Af8BWQFyAUMBzwgAAVABUwF8AckBMAEyAdwB/wE1ATcB3QH/ARoBHQHZAf8BBwEKAdUB/wHDAcQB9Qn/
148-
AtIB9wH/ARUBFwHXAf8BFAEWAdcB/wE1ATcB3QH/ATABMgHcAf8BSAFKAZwB4ogAAVUBggEuAeQBNAGW
149-
AQAB/wGPAcUBVgH/Ae4B9gHmAf8BewG7AT8B/wEpAZEBAAH/ASoBkQEAAf8BggG9AUwJ/wFwAbYBOwH/
150-
ASsBkgEAAf8BUAGlAQAB/wFZAXYBPQHVCAACUQF7AcoBMAEyAdwB/wE1ATcB3QH/ARUBFwHXAf8BGwEd
151-
AdgB/wHIAckB9gn/AdgB2QH4Af8BKwEtAdsB/wEPARIB1gH/ATQBNgHdAf8BMAEyAdwB/wJKAZUB34gA
152-
AVkBcgFDAc8BUAGlAQAB/wFJAaEBAAH/AUwBowEAAf8BPwGcAQAB/wFQAaUBAAH/AU0BowEAAf8BJQGP
153-
AQAB/wF5AboBRAn/AYEBvQFNAf8BOQGZAQAB/wFVAV4BTAGxCAACTwFfAakBMAEyAdwB/wEiASQB2gH/
154-
ATEBMwHcAf8C4QH6Bf8C0gH3Af8BxwHIAfUF/wLvAfwB/wE+AUAB3gH/AR4BIQHZAf8BMAEyAdwB/wJS
155-
AXMBwYgAAUgBSQFHAYQBTwGlAQAB/wFMAaMBAAH/AUUBnwEAAf8BTQGjAQAB/wFPAaQBAAH/AU8BpQEA
156-
Af8BTQGkAQAB/wEoAZABAAH/AXkBugFBBf8BywHkAbAB/wEvAZQBAAH/AzgBXQgAAzEBTQEvATEB3AH/
157-
AQYBCAHVAf8BvAG9AfMF/wHlAeYB+wH/ARwBHgHYAf8BCwENAdYB/wHSAdMB9wX/At8B+gH/AQwBDwHW
158-
Af8BLAEuAdsB/wI/AUEBb4gAAw0BEQFRAZ8BAQH+AU4BpAEAAf8BTgGkAQAB/wFOAaQBAAH/AU4BpAEA
159-
Af8BTgGkAQAB/wFPAaUBAAH/AU4BpAEAAf8BNgGYAQAB/wFiAa4BHAH/AVkBqgEOAf8BVgGFASgB6BAA
160-
AU8BUAGHAdQBHAEeAdgB/wFyAXMB5wH/ArMB8gH/AUIBRAHfAf8BEQETAdcB/wEVARgB2AH/ATIBNAHc
161-
Af8CrwHxAf8BhwGJAesB/wEfASEB2QH/ATUBNwHEAfYDBQEHjAADMgFQAU4BpAEAAf8BTgGkAQAB/wFO
162-
AaQBAAH/AU4BpAEAAf8BTgGkAQAB/wFOAaQBAAH/AU8BpAEAAf8BTwGkAQAB/wE8AZsBAAH/AUQBnwEA
163-
Af8CIgEhATEQAAMZASMBOwE9Ac8B+gEfASEB2QH/ARMBFQHXAf8BHwEhAdkB/wE1ATcB3QH/ATUBNwHd
164-
Af8BIgEkAdoB/wESARUB1wH/ARoBHAHYAf8BMwE1Ad0B/wMoAT2UAAE1ATYBNQFXAVIBjwEdAfABTgGk
165-
AQAB/wFOAaQBAAH/AU4BpAEAAf8BTgGkAQAB/wFOAaQBAAH/AU4BpAEAAf8BWAGEATEB4wMmATkYAAMg
166-
AS8BTgFQAYQB0gEtAS8B3AH/ATABMgHcAf8BMAEyAdwB/wEwATIB3AH/ATABMgHcAf8BLgEwAdwB/wFJ
167-
AUwBmwHhAysBQpwAAw8BFAFHAUgBRQGBAVgBawFFAccBWQGAATMB4AFYAXwBNwHdAVcBZwFJAb8CQAE/
168-
AW8DBwEJJAACOwE8AWUCUQFmAbQCTAGNAdgCTwGQAdoCUQFwAb0CQQFCAXIDCAEL/wCRAAFCAU0BPgcA
169-
AT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/AQAE/wQAAfgBHwHwAQ8EAAHgAQcB4AEHBAABwAED
170-
AcABAwQAAYABAwHAAQEEAAGAAQEBgAEBBAABgAEBAYABAQQAAYABAQGAAQEEAAGAAQEBgAEBBAABgAEB
171-
AYABAQQAAYABAQGAAQEEAAGAAQMBwAEBBAABwAEDAcABAwQAAeABBwHgAQcEAAHwAQ8B+AEPBAAE/wQA
172-
Cw==
127+
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAA6
128+
CgAAAk1TRnQBSQFMAgEBAgEAASABAAEgAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
129+
AwABEAMAAQEBAAEgBgABEP8AJwADOAFdAVEBVAFPAaUBWgFqAU0BzgFZAWgBTQHJAVABUgFNAZ0DMgFQ
130+
JAADEAEVAkgBSgGIAlUBdQHOAUEBQgGsAfABQQFCAawB8AJUAXgB0QJNAU8BlAMbASacAAMlATcBWQFw
131+
AUYB1wFNAaQBAAH/AUwBpAEAAf8BTQGkAQAB/wFNAaQBAAH/AU0BpAEAAf8BTQGkAQAB/wFZAWUBTQHH
132+
AxgBIhgAAywBRAFGAUgBpQHsASkBKwHbAf8BLwExAdwB/wEvATEB3AH/AS8BMQHcAf8BMAEyAdwB/wEp
133+
ASsB2wH/ATQBNgHQAf0COQE6AWCUAAMkATYBTQGkAQAB/wFRAaYBAAH/AUQBnwEAAf8BMAGVAQAB/wE8
134+
AZsBAAH/AVABpgEAAf8BTQGkAQAB/wFNAaQBAAH/AU0BpAEAAf8BUwGOASMB8QMWAR4QAAMjATMBMgE0
135+
Ad0B/wEgASIB2QH/AR0BHwHZAf8BGQEcAdgB/wEzATUB3QH/ATQBNgHdAf8BGwEdAdkB/wEdASAB2QH/
136+
ASABIgHZAf8BMAEyAdwB/wM0AVSMAAMEAQYBVwGPASEB8gFPAaUBAAH/AT0BnAEAAf8BSwGjAQAB/wGo
137+
AdIBgAH/AWwBtAEqAf8BLQGTAQAB/wFPAaUBAAH/AU4BpAEAAf8BTQGkAQAB/wFNAaQBAAH/AVkBcAFG
138+
AdcQAAFNAU4BlgHlARcBGQHYAf8BhwGIAeoB/wLKAfYB/wFQAVIB4gH/AQsBDQHWAf8BDQEPAdYB/wE/
139+
AUEB3wH/AsoB9gH/AZ4BnwHuAf8BGQEcAdkB/wExATMB1QH+AwkBDIgAA0ABcQFOAaUBAAH/AUcBoQEA
140+
Af8BJwGQAQAB/wHBAd8BpQn/AWEBrgEnAf8BKQGRAQAB/wFOAaUBAAH/AU4BpAEAAf8BTQGkAQAB/wFN
141+
AaQBAAH/AjEBMAFNCAADOAFcAS4BMAHcAf8BBwEJAdUB/wG2AbcB8wX/AvYB/QH/AS0BLwHcAf8BHAEf
142+
AdkB/wLpAfsF/wHNAc4B9gH/AQsBDQHWAf8BLAEuAdwB/wJEAUUBe4gAAVoBaAFOAcoBTgGlAQAB/wEr
143+
AZIBAAH/AZgByQFfBf8B8AH3AeIJ/wFkAbABLAH/ASgBkQEAAf8BTgGlAQAB/wFOAaQBAAH/AU0BpAEA
144+
Af8BUQFUAU8BpQgAAlIBXAGuAS8BMQHcAf8BJAEnAdoB/wEiASUB2gH/AcsBzAH2Bf8C6gH7Af8C4gH6
145+
Bf8C2wH5Af8BKgEsAdsB/wEhASMB2gH/AS8BMQHcAf8CVQFxAcyIAAFYAX0BOwHjATQBlwEAAf8BdgG5
146+
ATwF/wL9AfsB/wFAAZ0BAgH/AXIBtwE4Cf8BaQGzATMB/wEoAZABAAH/AU0BpAEAAf8BTgGkAQAB/wFZ
147+
AWwBTAHPCAABVAFWAXEByQEvATEB3AH/ATQBNgHdAf8BGQEcAdkB/wEGAQkB1QH/AcMBxAH1Cf8C0gH3
148+
Af8BFAEWAdcB/wETARUB1wH/ATQBNgHdAf8BLwExAdwB/wFNAU8BjwHiiAABVgF6ATcB5AEzAZYBAAH/
149+
AY8BxQFVAf8B7gH2AeYB/wF6AbsBPgH/ASgBkQEAAf8BKQGRAQAB/wGCAb0BSwn/AW8BtgE6Af8BKgGS
150+
AQAB/wFPAaUBAAH/AVoBcAFHAdUIAAJUAXABygEvATEB3AH/ATQBNgHdAf8BFAEWAdcB/wEaARwB2AH/
151+
AcgByQH2Cf8B2AHZAfgB/wEqASwB2wH/AQ4BEQHWAf8BMwE1Ad0B/wEvATEB3AH/Ak8BhwHfiAABWQFs
152+
AUwBzwFPAaUBAAH/AUgBoQEAAf8BSwGjAQAB/wE+AZwBAAH/AU8BpQEAAf8BTAGjAQAB/wEkAY8BAAH/
153+
AXgBugFDCf8BgQG9AUwB/wE4AZkBAAH/AVUBWgFRAbEIAAJRAVkBqQEvATEB3AH/ASEBIwHaAf8BMAEy
154+
AdwB/wLhAfoF/wLSAfcB/wHHAcgB9QX/Au8B/AH/AT0BPwHeAf8BHQEgAdkB/wEvATEB3AH/AlQBaAHB
155+
iAADSAGEAU4BpQEAAf8BSwGjAQAB/wFEAZ8BAAH/AUwBowEAAf8BTgGkAQAB/wFOAaUBAAH/AUwBpAEA
156+
Af8BJwGQAQAB/wF4AboBQAX/AcsB5AGwAf8BLgGUAQAB/wM4AV0IAAMxAU0BLgEwAdwB/wEFAQcB1QH/
157+
AbwBvQHzBf8B5QHmAfsB/wEbAR0B2AH/AQoBDAHWAf8B0gHTAfcF/wLfAfoB/wELAQ4B1gH/ASsBLQHb
158+
Af8CPwFAAW+IAAMNAREBUQGdAQEB/gFNAaQBAAH/AU0BpAEAAf8BTQGkAQAB/wFNAaQBAAH/AU0BpAEA
159+
Af8BTgGlAQAB/wFNAaQBAAH/ATUBmAEAAf8BYQGuARsB/wFYAaoBDQH/AVcBfgEwAegQAAFUAVUBegHU
160+
ARsBHQHYAf8BcQFyAecB/wKzAfIB/wFBAUMB3wH/ARABEgHXAf8BFAEXAdgB/wExATMB3AH/Aq8B8QH/
161+
AYcBiQHrAf8BHgEgAdkB/wE2ATgBvAH2AwUBB4wAAzIBUAFNAaQBAAH/AU0BpAEAAf8BTQGkAQAB/wFN
162+
AaQBAAH/AU0BpAEAAf8BTQGkAQAB/wFOAaQBAAH/AU4BpAEAAf8BOwGbAQAB/wFDAZ8BAAH/AiIBIQEx
163+
EAADGQEjATwBPgHLAfoBHgEgAdkB/wESARQB1wH/AR4BIAHZAf8BNAE2Ad0B/wE0ATYB3QH/ASEBIwHa
164+
Af8BEQEUAdcB/wEZARsB2AH/ATIBNAHdAf8DKAE9lAADNQFXAVIBigEjAfABTQGkAQAB/wFNAaQBAAH/
165+
AU0BpAEAAf8BTQGkAQAB/wFNAaQBAAH/AU0BpAEAAf8BWAF9ATsB4wMmATkYAAMgAS8BUgFUAXgB0gEs
166+
AS4B3AH/AS8BMQHcAf8BLwExAdwB/wEvATEB3AH/AS8BMQHcAf8BLQEvAdwB/wFOAU8BjwHhAysBQpwA
167+
Aw8BFAJHAUYBgQFZAWUBTQHHAVoBeQE+AeABWAF1AUEB3QFXAWABUAG/AkABPwFvAwcBCSQAAzsBZQJS
168+
AV4BtAJRAYAB2AJUAYMB2gJUAWUBvQNBAXIDCAEL/wCRAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEB
169+
AQABAQUAAYAXAAP/AQAE/wQAAfgBHwHwAQ8EAAHgAQcB4AEHBAABwAEDAcABAwQAAYABAwHAAQEEAAGA
170+
AQEBgAEBBAABgAEBAYABAQQAAYABAQGAAQEEAAGAAQEBgAEBBAABgAEBAYABAQQAAYABAQGAAQEEAAGA
171+
AQMBwAEBBAABwAEDAcABAwQAAeABBwHgAQcEAAHwAQ8B+AEPBAAE/wQACw==
173172
</value>
174173
</data>
175174
<metadata name="alertsMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

Source/Forms/WatForm.Designer.cs

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)