hpi-swa-teaching · TheGrayStone · Jul 4, 2021 · Jul 4, 2021 · Jul 5, 2021 · Jul 5, 2021
diff --git a/packages/Algernon.package/ALGActionVerbFilter.class/class/helpTexts.st b/packages/Algernon.package/ALGActionVerbFilter.class/class/helpTexts.st
@@ -7,7 +7,6 @@ helpTexts
 		add: 'browse'->'Open a given class in the Browser.';
 		add: 'fileout'->'Generates a .st file in Resources of squeak image Folder';
 		add: 'open'->'Open an app, tool or morph';
-		add: 'saverepo'->'Saves to Repository with a working copy';
 		add: 'inspect'->'Open Inspector for an object';
 		add: 'explore'-> 'Open Explorer for an object or all intances of a given class';
 		add: 'front'-> 'Bring a given window to the front';

diff --git a/packages/Algernon.package/ALGActionVerbFilter.class/class/keywords.st b/packages/Algernon.package/ALGActionVerbFilter.class/class/keywords.st
@@ -1,7 +1,7 @@
 filtering
 keywords
 	^ Set newFrom: {'run'. 'browse'. 'fileout'. 
-		'open'. 'saverepo'. 'do'. 
+		'open'. 'do'. 
 		'inspect'. 'explore'. '='.
 		'front'. 'expand'. 'collapse'. 
 		'contract'. 'close' }
diff --git a/packages/Algernon.package/ALGActionVerbFilter.class/methodProperties.json b/packages/Algernon.package/ALGActionVerbFilter.class/methodProperties.json
@@ -1,6 +1,6 @@
 {
 	"class" : {
-		"helpTexts" : "b 5/29/2021 09:18",
-		"keywords" : "lm 5/26/2021 19:46" },
+		"helpTexts" : "lm 7/6/2021 20:54",
+		"keywords" : "lm 7/6/2021 20:53" },
 	"instance" : {
 		"filter:given:" : "pw 8/4/2020 00:30" } }
diff --git a/packages/Algernon.package/ALGCore.class/instance/handleActivationKeyEvent..st b/packages/Algernon.package/ALGCore.class/instance/handleActivationKeyEvent..st
@@ -9,6 +9,7 @@ handleActivationKeyEvent: anEvent
 
 	isTrigger 
 		ifTrue: [
+			self saveLastFocus.
 			lastActivationKeyTimestamp := nil.
 			self toggleVisibility: anEvent ]
 		ifFalse: [

diff --git a/packages/Algernon.package/ALGCore.class/instance/lastFocus.st b/packages/Algernon.package/ALGCore.class/instance/lastFocus.st
@@ -0,0 +1,4 @@
+accessing
+lastFocus
+
+	^ lastFocus
diff --git a/packages/Algernon.package/ALGCore.class/instance/saveLastFocus.st b/packages/Algernon.package/ALGCore.class/instance/saveLastFocus.st
@@ -0,0 +1,4 @@
+updating
+saveLastFocus
+
+	lastFocus := ActiveHand keyboardFocus
diff --git a/packages/Algernon.package/ALGCore.class/methodProperties.json b/packages/Algernon.package/ALGCore.class/methodProperties.json
@@ -67,7 +67,7 @@
 		"firstOnSearchStack" : "jRo 6/14/2020 18:21",
 		"firstStep:" : "DS 5/21/2017 16:43",
 		"grabFocus:" : "b 6/2/2021 00:59",
-		"handleActivationKeyEvent:" : "NM 6/30/2021 14:43",
+		"handleActivationKeyEvent:" : "NL 7/7/2021 18:14",
 		"handleAsQuickAccess:" : "NM 6/7/2021 21:22",
 		"handleListenEvent:" : "NM 6/30/2021 14:45",
 		"handleTextEntered:" : "rk 8/3/2020 22:16",
@@ -95,6 +95,7 @@
 		"keyStroke:" : "NL 6/7/2021 20:05",
 		"lastActivationKeyTimestamp" : "fsa 6/16/2021 14:22",
 		"lastActivationKeyTimestamp:" : "fsa 6/16/2021 14:22",
+		"lastFocus" : "NL 7/7/2021 18:14",
 		"lastInputString" : "jRo 5/27/2020 17:35",
 		"lastInputString:" : "jRo 5/27/2020 17:35",
 		"moveCursorToEnd" : "beb 5/23/2020 15:58",
@@ -113,6 +114,7 @@
 		"registeredWithSystem" : "LK 7/14/2016 15:04",
 		"reset" : "beb 6/11/2020 15:13",
 		"resetFilteringThreshold" : "DS 5/21/2017 16:55",
+		"saveLastFocus" : "NL 7/7/2021 18:14",
 		"searchStack" : "J.J. 7/11/2015 21:40",
 		"searchStack:" : "J.J. 7/11/2015 21:40",
 		"selectNext" : "J.J. 7/27/2015 21:41",

diff --git a/packages/Algernon.package/ALGCore.class/properties.json b/packages/Algernon.package/ALGCore.class/properties.json
@@ -24,7 +24,8 @@
 		"textField",
 		"firstStep",
 		"lastInputString",
-		"lastActivationKeyTimestamp" ],
+		"lastActivationKeyTimestamp",
+		"lastFocus" ],
 	"name" : "ALGCore",
 	"pools" : [
 		 ],

diff --git a/packages/Algernon.package/ALGDynamicWorldMenuType.class/README.md b/packages/Algernon.package/ALGDynamicWorldMenuType.class/README.md
diff --git a/packages/Algernon.package/ALGDynamicWorldMenuType.class/class/extractMenuEntriesFrom..st b/packages/Algernon.package/ALGDynamicWorldMenuType.class/class/extractMenuEntriesFrom..st
diff --git a/packages/Algernon.package/ALGDynamicWorldMenuType.class/class/filterOutDuplicates..st b/packages/Algernon.package/ALGDynamicWorldMenuType.class/class/filterOutDuplicates..st
diff --git a/packages/Algernon.package/ALGDynamicWorldMenuType.class/methodProperties.json b/packages/Algernon.package/ALGDynamicWorldMenuType.class/methodProperties.json
diff --git a/packages/Algernon.package/ALGDynamicWorldMenuType.class/properties.json b/packages/Algernon.package/ALGDynamicWorldMenuType.class/properties.json
diff --git a/packages/Algernon.package/ALGItemProvider.class/class/initializeItems.st b/packages/Algernon.package/ALGItemProvider.class/class/initializeItems.st
@@ -11,5 +11,5 @@ initializeItems
 		addAll: ALGSettingsType algertemList;
 		addAll: ALGClassType algertemList;
 		addAll: ALGMethodType algertemList;
-		addAll: ALGStaticWorldMenuType algertemList;
+		addAll: ALGWindowOperationsType algertemList;
 		yourself
diff --git a/packages/Algernon.package/ALGItemProvider.class/instance/dynamicItems.st b/packages/Algernon.package/ALGItemProvider.class/instance/dynamicItems.st
@@ -1,5 +1,5 @@
 accessing
 dynamicItems
 	^ (ALGExpressionType algertemList: self controller), 
-		ALGDynamicWorldMenuType algertemList,
+		ALGWorldMenuType algertemList,
 		ALGWindowType algertemList
diff --git a/packages/Algernon.package/ALGItemProvider.class/methodProperties.json b/packages/Algernon.package/ALGItemProvider.class/methodProperties.json
@@ -3,7 +3,7 @@
 		"defaultItems" : "J.J. 7/27/2015 17:37",
 		"defaultSearchLevel" : "OH 5/20/2021 13:59",
 		"filters" : "beb 5/20/2020 17:57",
-		"initializeItems" : "lm 5/19/2021 10:54",
+		"initializeItems" : "NL 7/6/2021 11:59",
 		"maximumItemsToCompute" : "b 5/28/2021 15:43",
 		"newIn:" : "J.J. 7/30/2015 22:00",
 		"searchDelimeter" : "J.J. 7/28/2015 17:11" },
@@ -18,7 +18,7 @@
 		"controller:" : "beb 7/15/2020 16:47",
 		"createCategoriesFor:" : "jRo 7/2/2020 01:01",
 		"defaultItems" : "fsa 5/18/2021 17:37",
-		"dynamicItems" : "lm 5/25/2021 21:23",
+		"dynamicItems" : "NL 7/5/2021 19:32",
 		"filterItems:for:" : "OH 5/20/2021 14:37",
 		"filteredStaticItemsFor:" : "OH 5/20/2021 14:35",
 		"getCachedStaticItemsFor:" : "OH 5/20/2021 14:37",

diff --git a/packages/Algernon.package/ALGNamedWorldMenuEntry.class/class/newFrom..st b/packages/Algernon.package/ALGNamedWorldMenuEntry.class/class/newFrom..st
@@ -0,0 +1,6 @@
+instance creation
+newFrom: aMorph
+
+	^ self new
+			morph: aMorph;
+			yourself
diff --git a/packages/Algernon.package/ALGNamedWorldMenuEntry.class/class/newFrom.inCategory..st b/packages/Algernon.package/ALGNamedWorldMenuEntry.class/class/newFrom.inCategory..st
@@ -0,0 +1,6 @@
+instance creation
+newFrom: aMorph inCategory: aString
+
+	^ (self newFrom: aMorph)
+		category: aString;
+		yourself
diff --git a/packages/Algernon.package/ALGNamedWorldMenuEntry.class/class/newFrom.name..st b/packages/Algernon.package/ALGNamedWorldMenuEntry.class/class/newFrom.name..st
diff --git a/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/allEntries.st b/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/allEntries.st
@@ -0,0 +1,10 @@
+accessing
+allEntries
+	| entries |
+
+	entries := OrderedCollection new.
+
+	entries addAll: (self menuEntries inject: OrderedCollection new into: 
+		[ :accumulator :entry | accumulator addAll: {entry}, entry allEntries; yourself ]).
+
+	^ entries 
diff --git a/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/category..st b/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/category..st
@@ -0,0 +1,3 @@
+accessing
+category: aString
+	category := aString
diff --git a/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/category.st b/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/category.st
@@ -0,0 +1,3 @@
+accessing
+category
+	^ category
diff --git a/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/enabledMenuSubmorphs.st b/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/enabledMenuSubmorphs.st
@@ -2,4 +2,4 @@ accessing
 enabledMenuSubmorphs
 
 	"Some submorphs can't be disabled (e.g. line, ...)"
-	^ self menuSubmorphs select: [:menuItem | (menuItem class canUnderstand: #isEnabled) not or: [menuItem isEnabled]]
+	^ (self menuSubmorphs, self subMenuSubmorphs) select: [:menuItem | (menuItem class canUnderstand: #isEnabled) not or: [menuItem isEnabled]]
diff --git a/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/excludeDynamicWindows.st b/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/excludeDynamicWindows.st
diff --git a/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/execute.st b/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/execute.st
@@ -0,0 +1,4 @@
+action
+execute
+
+	self morph doButtonAction
diff --git a/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/hasEntries.st b/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/hasEntries.st
@@ -0,0 +1,4 @@
+accessing
+hasEntries
+
+	^ self menuEntries isEmpty not
diff --git a/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/ifDynamicItem..st b/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/ifDynamicItem..st
@@ -0,0 +1,4 @@
+accessing
+ifDynamicItem: aBlock
+
+	self isDynamicItem ifTrue: [aBlock value]
diff --git a/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/ifDynamicMenu..st b/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/ifDynamicMenu..st
@@ -0,0 +1,4 @@
+accessing
+ifDynamicMenu: aBlock
+
+	self isDynamicMenu ifTrue: [aBlock value]
diff --git a/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/isDynamic.st b/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/isDynamic.st
diff --git a/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/isDynamicItem.st b/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/isDynamicItem.st
@@ -0,0 +1,4 @@
+accessing
+isDynamicItem
+
+	^ self morph isKindOf: UpdatingMenuItemMorph
diff --git a/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/isDynamicMenu.st b/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/isDynamicMenu.st
@@ -0,0 +1,8 @@
+accessing
+isDynamicMenu
+
+	| subMenu |
+	subMenu := self subMenuIfAbsent: [ ^ false ].
+
+	^ (subMenu isKindOf: DockingBarUpdatingMenuMorph) 
+		or: [subMenu isKindOf: UpdatingMenuMorph]
diff --git a/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/isEnabled.st b/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/isEnabled.st
@@ -0,0 +1,4 @@
+accessing
+isEnabled
+
+	^ (self morph class canUnderstand: #isEnabled) not or: [self morph isEnabled]
diff --git a/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/isMenu.st b/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/isMenu.st
@@ -1,4 +1,6 @@
 accessing
 isMenu
-	"Some entries in the docking bar (project name) are not a real menu, but are only distinct by not having a menu morph"
-	^ self morph isNil not
+
+	self subMenuIfAbsent: [ ^ false ].
+
+	^ true
diff --git a/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/isValid.st b/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/isValid.st
@@ -0,0 +1,4 @@
+accessing
+isValid
+
+	^ (self morph isKindOf: DockingBarItemMorph) or: [self morph isKindOf: MenuItemMorph]
diff --git a/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/menuEntries.st b/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/menuEntries.st
@@ -1,7 +1,6 @@
 accessing
 menuEntries
 
-	(self isDynamic and: [self name = 'Windows'])
-		ifTrue: [^ self excludeDynamicWindows].
-
-	^ self enabledMenuSubmorphs
+	^ self menuSubmorphs
+		collect: [ :morph | ALGNamedWorldMenuEntry newFrom: morph inCategory: self category ]
+		thenSelect: [ :entry | entry isValid and: [entry isEnabled] ]
diff --git a/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/menuSubmorphs.st b/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/menuSubmorphs.st
@@ -1,4 +1,9 @@
 accessing
 menuSubmorphs
 
-	^ self morph submorphs
+	| subMenu |
+
+	subMenu := self subMenuIfAbsent: [ ^ OrderedCollection new ].
+
+	self ifDynamicMenu: [subMenu updateMenu].
+	^ OrderedCollection newFrom: subMenu submorphs
diff --git a/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/name..st b/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/name..st
diff --git a/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/name.st b/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/name.st
@@ -1,3 +1,4 @@
 accessing
 name
-	^ name
+	self ifDynamicItem: [self morph updateContents].
+	^ self morph contents
diff --git a/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/selector.st b/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/selector.st
@@ -0,0 +1,4 @@
+accessing
+selector
+	^ (self morph selector
+		ifNil: [ String new.]) asString
diff --git a/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/subMenuIfAbsent..st b/packages/Algernon.package/ALGNamedWorldMenuEntry.class/instance/subMenuIfAbsent..st
@@ -0,0 +1,6 @@
+accessing
+subMenuIfAbsent: aBlock
+
+	^ (self morph class canUnderstand: #subMenu)
+		ifTrue: [ self morph subMenu ifNil: [^ aBlock value] ]
+		ifFalse: [ aBlock value ]
diff --git a/packages/Algernon.package/ALGNamedWorldMenuEntry.class/methodProperties.json b/packages/Algernon.package/ALGNamedWorldMenuEntry.class/methodProperties.json
@@ -1,14 +1,25 @@
 {
 	"class" : {
-		"newFrom:name:" : "NL 6/4/2021 16:16" },
+		"newFrom:" : "NL 7/12/2021 23:09",
+		"newFrom:inCategory:" : "lm 7/6/2021 22:54" },
 	"instance" : {
-		"enabledMenuSubmorphs" : "fsa 6/27/2021 11:29",
-		"excludeDynamicWindows" : "fsa 6/27/2021 10:55",
-		"isDynamic" : "fsa 6/27/2021 10:40",
-		"isMenu" : "fsa 6/27/2021 10:40",
-		"menuEntries" : "fsa 6/27/2021 10:56",
-		"menuSubmorphs" : "fsa 6/27/2021 11:09",
+		"allEntries" : "b 7/12/2021 15:15",
+		"category" : "NL 7/5/2021 19:20",
+		"category:" : "NL 7/5/2021 19:21",
+		"enabledMenuSubmorphs" : "lm 7/4/2021 22:36",
+		"execute" : "NL 7/6/2021 12:16",
+		"hasEntries" : "NL 7/5/2021 19:42",
+		"ifDynamicItem:" : "NL 7/12/2021 23:24",
+		"ifDynamicMenu:" : "NL 7/12/2021 23:24",
+		"isDynamicItem" : "b 7/12/2021 18:54",
+		"isDynamicMenu" : "b 7/12/2021 18:41",
+		"isEnabled" : "NL 7/5/2021 17:48",
+		"isMenu" : "NL 7/5/2021 17:54",
+		"isValid" : "b 7/5/2021 18:43",
+		"menuEntries" : "b 7/12/2021 15:04",
+		"menuSubmorphs" : "b 7/12/2021 20:26",
 		"morph" : "NL 6/4/2021 16:15",
 		"morph:" : "NL 6/4/2021 16:15",
-		"name" : "NL 6/4/2021 16:15",
-		"name:" : "NL 6/4/2021 16:15" } }
+		"name" : "b 7/12/2021 20:28",
+		"selector" : "NL 7/12/2021 23:12",
+		"subMenuIfAbsent:" : "b 7/5/2021 18:18" } }
diff --git a/packages/Algernon.package/ALGNamedWorldMenuEntry.class/properties.json b/packages/Algernon.package/ALGNamedWorldMenuEntry.class/properties.json
@@ -6,8 +6,8 @@
 		 ],
 	"commentStamp" : "fsa 6/27/2021 10:38",
 	"instvars" : [
-		"name",
-		"morph" ],
+		"morph",
+		"category" ],
 	"name" : "ALGNamedWorldMenuEntry",
 	"pools" : [
 		 ],

diff --git a/packages/Algernon.package/ALGStaticWorldMenuType.class/README.md b/packages/Algernon.package/ALGStaticWorldMenuType.class/README.md