Skip to content

Commit cf39fd2

Browse files
committed
split filters on Alerts and Redirects and separate toolbar entries for them (they are seen as separated stuff for users)
1 parent d8cf646 commit cf39fd2

File tree

77 files changed

+448
-256
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+448
-256
lines changed
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"separateMethodMetaAndSource" : false,
32
"noMethodMetaData" : true,
4-
"useCypressPropertiesFile" : true
5-
}
3+
"separateMethodMetaAndSource" : false,
4+
"useCypressPropertiesFile" : true }
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
accessing
2+
label
3+
^ self subclassResponsibility

mc/MUDClient-Plugin-Filter.package/MUDFilter.class/instance/descriptionAlert.st

Lines changed: 0 additions & 9 deletions
This file was deleted.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
descriptions
2+
descriptionContainer
3+
^ super descriptionContainer
4+
tkAcceptIcon: #accept asMUDIcon;
5+
tkCancelIcon: #cancel asMUDIcon;
6+
yourself

mc/MUDClient-Plugin-Filter.package/MUDFilter.class/instance/descriptionPatterns.st

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,7 @@ descriptionPatterns
1212
default: OrderedCollection new;
1313
morphClass: TkOneToManyFastListMorph;
1414
tkRowsToShow: 5;
15+
tkAddIcon: #add asMUDIcon;
16+
tkEditIcon: #edit asMUDIcon;
17+
tkRemoveIcon: #delete asMUDIcon;
1518
yourself
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
testing
22
isAlert
3-
^ alert
3+
^ false
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
testing
2+
isRedirect
3+
^ false
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
testing
2+
isTrigger
3+
^ false
Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,43 @@
11
{
2+
"class" : {
3+
"availableSoundsWithLabels" : "EstebanLorenzano 10/14/2015 00:16",
4+
"bass1" : "EstebanLorenzano 10/19/2015 22:18",
5+
"flute1" : "EstebanLorenzano 10/19/2015 22:17",
6+
"flute2" : "EstebanLorenzano 10/19/2015 22:17",
7+
"flute3" : "EstebanLorenzano 10/19/2015 22:17",
8+
"label" : "EstebanLorenzano 7/7/2016 14:26",
9+
"loadSoundsWithLabels" : "EstebanLorenzano 10/19/2015 22:18",
10+
"soundNamed:" : "EstebanLorenzano 10/15/2015 22:08" },
211
"instance" : {
12+
"activate" : "EstebanLorenzano 9/17/2015 19:20",
313
"active:" : "EstebanLorenzano 9/17/2015 19:21",
4-
"soundName" : "EstebanLorenzano 10/15/2015 22:08",
5-
"patternMatching:" : "EstebanLorenzano 9/24/2015 21:06",
6-
"descriptionAlert" : "EstebanLorenzano 10/2/2015 08:21",
7-
"descriptionPatterns" : "EstebanLorenzano 5/18/2016 16:49",
8-
"initialize" : "EstebanLorenzano 5/18/2016 17:17",
9-
"isActive" : "EstebanLorenzano 5/18/2016 17:18",
14+
"addPattern:" : "EstebanLorenzano 9/24/2015 21:11",
15+
"alert:" : "EstebanLorenzano 10/1/2015 16:47",
1016
"alertColor" : "EstebanLorenzano 10/1/2015 16:47",
11-
"matches:" : "EstebanLorenzano 9/24/2015 20:54",
12-
"name" : "EstebanLorenzano 9/18/2015 13:05",
17+
"alertColor:" : "EstebanLorenzano 10/1/2015 16:47",
18+
"beAlert" : "EstebanLorenzano 10/1/2015 16:47",
1319
"beNotAlert" : "EstebanLorenzano 10/1/2015 16:48",
20+
"deactivate" : "EstebanLorenzano 9/17/2015 19:20",
21+
"descriptionActive" : "EstebanLorenzano 10/13/2015 23:14",
22+
"descriptionContainer" : "EstebanLorenzano 7/7/2016 14:29",
1423
"descriptionName" : "EstebanLorenzano 9/17/2015 21:41",
15-
"descriptionSound" : "EstebanLorenzano 10/15/2015 22:08",
16-
"patternMatching:ifNone:" : "EstebanLorenzano 9/24/2015 20:55",
24+
"descriptionPatterns" : "EstebanLorenzano 7/7/2016 14:34",
25+
"descriptionSound" : "EstebanLorenzano 7/7/2016 12:05",
1726
"hasSound" : "EstebanLorenzano 10/15/2015 22:29",
18-
"alert:" : "EstebanLorenzano 10/1/2015 16:47",
19-
"soundName:" : "EstebanLorenzano 10/15/2015 22:08",
20-
"addPattern:" : "EstebanLorenzano 9/24/2015 21:11",
21-
"deactivate" : "EstebanLorenzano 9/17/2015 19:20",
27+
"initialize" : "EstebanLorenzano 5/18/2016 17:17",
28+
"isActive" : "EstebanLorenzano 5/18/2016 17:18",
29+
"isAlert" : "EstebanLorenzano 7/7/2016 12:04",
30+
"isRedirect" : "EstebanLorenzano 7/7/2016 12:04",
31+
"isTrigger" : "EstebanLorenzano 7/7/2016 12:04",
32+
"matches:" : "EstebanLorenzano 9/24/2015 20:54",
33+
"name" : "EstebanLorenzano 9/18/2015 13:05",
2234
"name:" : "EstebanLorenzano 9/17/2015 21:44",
35+
"patternMatching:" : "EstebanLorenzano 9/24/2015 21:06",
36+
"patternMatching:ifNone:" : "EstebanLorenzano 9/24/2015 20:55",
37+
"patterns" : "EstebanLorenzano 9/24/2015 20:49",
38+
"patterns:" : "EstebanLorenzano 9/24/2015 21:12",
2339
"playSound" : "EstebanLorenzano 10/15/2015 22:31",
24-
"isAlert" : "EstebanLorenzano 10/1/2015 16:47",
25-
"descriptionAlertColor" : "EstebanLorenzano 10/2/2015 08:22",
26-
"alertColor:" : "EstebanLorenzano 10/1/2015 16:47",
27-
"activate" : "EstebanLorenzano 9/17/2015 19:20",
28-
"send:toWindows:" : "EstebanLorenzano 5/19/2016 05:35",
29-
"beAlert" : "EstebanLorenzano 10/1/2015 16:47",
3040
"printOn:" : "EstebanLorenzano 9/24/2015 21:23",
31-
"descriptionActive" : "EstebanLorenzano 10/13/2015 23:14",
32-
"patterns" : "EstebanLorenzano 9/24/2015 20:49",
33-
"patterns:" : "EstebanLorenzano 9/24/2015 21:12"
34-
},
35-
"class" : {
36-
"flute3" : "EstebanLorenzano 10/19/2015 22:17",
37-
"flute1" : "EstebanLorenzano 10/19/2015 22:17",
38-
"loadSoundsWithLabels" : "EstebanLorenzano 10/19/2015 22:18",
39-
"availableSoundsWithLabels" : "EstebanLorenzano 10/14/2015 00:16",
40-
"bass1" : "EstebanLorenzano 10/19/2015 22:18",
41-
"flute2" : "EstebanLorenzano 10/19/2015 22:17",
42-
"soundNamed:" : "EstebanLorenzano 10/15/2015 22:08"
43-
}
44-
}
41+
"send:toWindows:" : "EstebanLorenzano 5/19/2016 05:35",
42+
"soundName" : "EstebanLorenzano 10/15/2015 22:08",
43+
"soundName:" : "EstebanLorenzano 10/15/2015 22:08" } }
Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
{
2-
"commentStamp" : "<historical>",
3-
"super" : "Object",
42
"category" : "MUDClient-Plugin-Filter-Model",
5-
"classinstvars" : [ ],
6-
"pools" : [ ],
3+
"classinstvars" : [
4+
],
75
"classvars" : [
8-
"Sounds"
9-
],
6+
"Sounds" ],
7+
"commentStamp" : "<historical>",
108
"instvars" : [
119
"name",
1210
"patterns",
1311
"active",
14-
"alert",
1512
"alertColor",
16-
"soundName"
17-
],
13+
"soundName" ],
1814
"name" : "MUDFilter",
19-
"type" : "normal"
20-
}
15+
"pools" : [
16+
],
17+
"super" : "Object",
18+
"type" : "normal" }

mc/MUDClient-Plugin-Filter.package/MUDFilterAlert.class/README.md

Whitespace-only changes.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
accessing
2+
label
3+
^ 'Alerts'
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
testing
2+
isAlert
3+
^ true
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"class" : {
3+
"label" : "EstebanLorenzano 7/7/2016 14:27" },
4+
"instance" : {
5+
"descriptionAlertColor" : "EstebanLorenzano 7/7/2016 12:05",
6+
"isAlert" : "EstebanLorenzano 7/7/2016 11:49" } }
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"category" : "MUDClient-Plugin-Filter-Model",
3+
"classinstvars" : [
4+
],
5+
"classvars" : [
6+
],
7+
"commentStamp" : "",
8+
"instvars" : [
9+
],
10+
"name" : "MUDFilterAlert",
11+
"pools" : [
12+
],
13+
"super" : "MUDFilter",
14+
"type" : "normal" }

mc/MUDClient-Plugin-Filter.package/MUDFilterAlertSpec.class/README.md

Whitespace-only changes.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
accessing
2+
filterClass
3+
^ MUDFilterAlert
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
accessing
2+
icon
3+
^ #filterAlert asMUDIcon
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
accessing
2+
pluginClass
3+
^ MUDFilterPlugin
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"class" : {
3+
},
4+
"instance" : {
5+
"filterClass" : "EstebanLorenzano 7/7/2016 12:11",
6+
"icon" : "EstebanLorenzano 7/7/2016 13:22",
7+
"pluginClass" : "EstebanLorenzano 5/17/2016 21:58" } }
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"category" : "MUDClient-Plugin-Filter-Model",
3+
"classinstvars" : [
4+
],
5+
"classvars" : [
6+
],
7+
"commentStamp" : "",
8+
"instvars" : [
9+
],
10+
"name" : "MUDFilterAlertSpec",
11+
"pools" : [
12+
],
13+
"super" : "MUDFilterSpec",
14+
"type" : "normal" }
Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
{
2+
"class" : {
3+
"game:plugin:" : "EstebanLorenzano 5/17/2016 22:50",
4+
"game:plugin:filter:" : "EstebanLorenzano 5/17/2016 22:49" },
25
"instance" : {
6+
"areaMorph" : "EstebanLorenzano 5/17/2016 22:56",
7+
"buildOn:" : "EstebanLorenzano 5/18/2016 17:13",
8+
"buildToolbarOn:" : "EstebanLorenzano 5/19/2016 00:01",
39
"clearAreaMorph" : "EstebanLorenzano 5/17/2016 22:54",
4-
"initializeGame:plugin:filter:" : "EstebanLorenzano 5/17/2016 22:51",
510
"configure" : "EstebanLorenzano 5/17/2016 22:52",
611
"createAreaMorph" : "EstebanLorenzano 5/20/2016 17:29",
7-
"title" : "EstebanLorenzano 5/17/2016 22:48",
812
"createSettings" : "EstebanLorenzano 5/18/2016 22:26",
13+
"edit" : "EstebanLorenzano 5/19/2016 06:11",
14+
"filter" : "EstebanLorenzano 5/17/2016 22:51",
15+
"initializeGame:plugin:filter:" : "EstebanLorenzano 5/17/2016 22:51",
916
"isSettingsMatching:" : "EstebanLorenzano 5/18/2016 18:27",
10-
"buildOn:" : "EstebanLorenzano 5/18/2016 17:13",
1117
"send:" : "EstebanLorenzano 5/19/2016 05:34",
12-
"areaMorph" : "EstebanLorenzano 5/17/2016 22:56",
13-
"buildToolbarOn:" : "EstebanLorenzano 5/19/2016 00:01",
1418
"settingsClass" : "EstebanLorenzano 5/18/2016 18:05",
15-
"filter" : "EstebanLorenzano 5/17/2016 22:51",
16-
"edit" : "EstebanLorenzano 5/19/2016 06:11"
17-
},
18-
"class" : {
19-
"game:plugin:filter:" : "EstebanLorenzano 5/17/2016 22:49",
20-
"game:plugin:" : "EstebanLorenzano 5/17/2016 22:50"
21-
}
22-
}
19+
"title" : "EstebanLorenzano 5/17/2016 22:48" } }
Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
{
2-
"commentStamp" : "",
3-
"super" : "MUDPluginBrowser",
42
"category" : "MUDClient-Plugin-Filter-View",
5-
"classinstvars" : [ ],
6-
"pools" : [ ],
7-
"classvars" : [ ],
3+
"classinstvars" : [
4+
],
5+
"classvars" : [
6+
],
7+
"commentStamp" : "",
88
"instvars" : [
99
"filter",
10-
"areaMorph"
11-
],
10+
"areaMorph" ],
1211
"name" : "MUDFilterBrowser",
13-
"type" : "normal"
14-
}
12+
"pools" : [
13+
],
14+
"super" : "MUDPluginBrowser",
15+
"type" : "normal" }
Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
{
2+
"class" : {
3+
"findByFilter:" : "EstebanLorenzano 5/18/2016 18:05" },
24
"instance" : {
3-
"filter:" : "EstebanLorenzano 5/18/2016 18:04",
45
"filter" : "EstebanLorenzano 5/18/2016 18:04",
6+
"filter:" : "EstebanLorenzano 5/18/2016 18:04",
57
"newBrowser" : "EstebanLorenzano 6/23/2016 19:35",
6-
"printOn:" : "EstebanLorenzano 5/18/2016 20:38"
7-
},
8-
"class" : {
9-
"findByFilter:" : "EstebanLorenzano 5/18/2016 18:05"
10-
}
11-
}
8+
"printOn:" : "EstebanLorenzano 5/18/2016 20:38" } }
Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
2-
"commentStamp" : "",
3-
"super" : "MUDBrowserPluginSettings",
42
"category" : "MUDClient-Plugin-Filter-View",
5-
"classinstvars" : [ ],
6-
"pools" : [ ],
7-
"classvars" : [ ],
3+
"classinstvars" : [
4+
],
5+
"classvars" : [
6+
],
7+
"commentStamp" : "",
88
"instvars" : [
9-
"filter"
10-
],
9+
"filter" ],
1110
"name" : "MUDFilterBrowserSettings",
12-
"type" : "normal"
13-
}
11+
"pools" : [
12+
],
13+
"super" : "MUDBrowserPluginSettings",
14+
"type" : "normal" }

mc/MUDClient-Plugin-Filter.package/MUDFilterConfigureDialog.class/instance/addObjectThen..st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ actions
22
addObjectThen: aBlock
33
| filter |
44

5-
filter := (TkMagritteEditor object: MUDFilter new) go.
5+
filter := (TkMagritteEditor object: self filterClass new) go.
66
filter ifNil: [ ^ self ].
77
self plugin addFilter: filter.
88
aBlock cull: filter

mc/MUDClient-Plugin-Filter.package/MUDFilterConfigureDialog.class/instance/buildBrowser.st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ buildBrowser
33
| browser |
44

55
browser := GLMTabulator new
6-
title: self class title;
6+
title: self title;
77
initialExtent: self class preferredExtent;
88
column: #objects;
99
column: #currentObject span: 2;
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
accessing
2+
filterClass: aClass
3+
filterClass := aClass
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
accessing
2+
filterClass
3+
^ filterClass
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
accessing
22
filters
3-
^ self plugin filters
3+
^ self plugin filters
4+
select: [ :each | each class = self filterClass ]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
accessing
22
listTitle
3-
^ 'Filters'
3+
^ self filterClass label
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
accessing
2+
title
3+
^ 'Configure ', self listTitle asLowercase

0 commit comments

Comments
 (0)