Merge pull request #96 from hpi-swa-teaching/83-selection-actions-in-…

…context-menu Add context menu and several selection actions for the history list
hpi-swa-teaching · Jun 29, 2020 · 9e97c77 · 9e97c77
2 parents cbcbdd0 + cd4064f
commit 9e97c77
Show file tree

Hide file tree

Showing 18 changed files with 83 additions and 25 deletions.
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/buildHistoryListSpecWith..st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/buildHistoryListSpecWith..st
@@ -5,4 +5,5 @@ buildHistoryListSpecWith: aBuilder
 		model: self;
 		list: #historyDescriptions;
 		getIndex: #historyListSelectionIndex;
-		setIndex: #historyListSelectionIndex:
+		setIndex: #historyListSelectionIndex:;
+		menu: #setUpHistoryListMenuMorph:
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/buttons.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/buttons.st
@@ -2,5 +2,4 @@ building
 buttons
 
 	^ #(('Switch to detailed view' #switchToDetailedView 'Switch to a more detailed version of this window with more functionality')
-		('Invert selection' #invertSelection 'Select all unselected changes and vice versa')
 		('Load selected changes' #loadSelectedChanges 'Load the selected changes into this image'))
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/ignoreAllOfHistoryList.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/ignoreAllOfHistoryList.st
@@ -0,0 +1,4 @@
+actions
+ignoreAllOfHistoryList
+
+	self historyList do: [:each | each ignore]
diff --git a/...hangesReloaded-Core.package/CRBrowser.class/instance/ignoreAllOfHistoryListAndUpdateUI.st b/...hangesReloaded-Core.package/CRBrowser.class/instance/ignoreAllOfHistoryListAndUpdateUI.st
@@ -0,0 +1,6 @@
+menu-actions
+ignoreAllOfHistoryListAndUpdateUI
+
+	self
+		ignoreAllOfHistoryList;
+		updateAfterMenuAction
diff --git a/...gesReloaded-Core.package/CRBrowser.class/instance/ignoreAllOfHistoryListExceptSelected.st b/...gesReloaded-Core.package/CRBrowser.class/instance/ignoreAllOfHistoryListExceptSelected.st
@@ -0,0 +1,6 @@
+actions
+ignoreAllOfHistoryListExceptSelected
+
+	(self historyList
+		reject: [:each | each = self selectedHistoryListItem])
+		do: [:each | each ignore]
diff --git a/...-Core.package/CRBrowser.class/instance/ignoreAllOfHistoryListExceptSelectedAndUpdateUI.st b/...-Core.package/CRBrowser.class/instance/ignoreAllOfHistoryListExceptSelectedAndUpdateUI.st
@@ -0,0 +1,6 @@
+menu-actions
+ignoreAllOfHistoryListExceptSelectedAndUpdateUI
+
+	self
+		ignoreAllOfHistoryListExceptSelected;
+		updateAfterMenuAction
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/initializeHistoryList.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/initializeHistoryList.st
@@ -6,5 +6,4 @@ initializeHistoryList
 				showWhile: [(self retrieveChangeRecordsFromChangesFile
 						reject: [:each | self isInImage: each]) reversed].
 	self historyList: (self getHistoryListFrom: changeRecords).
-	self historyList do: [:each |
-		each history first isSelected: true]
+	self selectAllLatestChangesOfHistoryList
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/invertSelection.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/invertSelection.st
diff --git a/...ngesReloaded-Core.package/CRBrowser.class/instance/selectAllLatestChangesOfHistoryList.st b/...ngesReloaded-Core.package/CRBrowser.class/instance/selectAllLatestChangesOfHistoryList.st
@@ -0,0 +1,4 @@
+actions
+selectAllLatestChangesOfHistoryList
+
+	self historyList do: [:each | each selectLatest]
diff --git a/...d-Core.package/CRBrowser.class/instance/selectAllLatestChangesOfHistoryListAndUpdateUI.st b/...d-Core.package/CRBrowser.class/instance/selectAllLatestChangesOfHistoryListAndUpdateUI.st
@@ -0,0 +1,6 @@
+menu-actions
+selectAllLatestChangesOfHistoryListAndUpdateUI
+
+	self
+		selectAllLatestChangesOfHistoryList;
+		updateAfterMenuAction
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/setUpHistoryListMenuMorph..st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/setUpHistoryListMenuMorph..st
@@ -0,0 +1,8 @@
+building
+setUpHistoryListMenuMorph: aMenuMorph
+
+	aMenuMorph addList: #(
+		('Ignore all' ignoreAllOfHistoryListAndUpdateUI)
+		('All latest changes' selectAllLatestChangesOfHistoryListAndUpdateUI)
+		('Ingore all except this one' ignoreAllOfHistoryListExceptSelectedAndUpdateUI)).
+	^ aMenuMorph
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/updateAfterChangeSelection.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/updateAfterChangeSelection.st
@@ -1,7 +1,8 @@
 updating
 updateAfterChangeSelection
 
-	self repaintChangeListSelection.
-	self refreshHistoryList.
-	self repaintHistoryListSelection.
-	self updateCodePane
+	self
+		repaintChangeListSelection;
+		refreshHistoryList;
+		repaintHistoryListSelection;
+		updateCodePane
diff --git a/...ages/ChangesReloaded-Core.package/CRBrowser.class/instance/updateAfterHistorySelection.st b/...ages/ChangesReloaded-Core.package/CRBrowser.class/instance/updateAfterHistorySelection.st
@@ -1,6 +1,7 @@
 updating
 updateAfterHistorySelection
 
-	self refreshChangeList.
-	self repaintChangeListSelection.
-	self repaintHistoryListSelection
+	self
+		refreshChangeList;
+		repaintChangeListSelection;
+		repaintHistoryListSelection
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/updateAfterMenuAction.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/updateAfterMenuAction.st
@@ -0,0 +1,6 @@
+updating
+updateAfterMenuAction
+
+	self
+		refreshHistoryList;
+		refreshChangeList
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json b/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json
@@ -5,11 +5,11 @@
 	"instance" : {
 		"buildButtonPanelSpecWith:" : "mg 5/15/2020 09:24",
 		"buildButtonSpecsWith:" : "mg 5/14/2020 21:14",
-		"buildHistoryListSpecWith:" : "SV 6/12/2020 19:57",
+		"buildHistoryListSpecWith:" : "mg 6/26/2020 10:59",
 		"buildSingleSelectionChangeListSpecWith:" : "SV 6/21/2020 12:54",
 		"buildWith:" : "SV 6/21/2020 13:07",
 		"buttonHeight" : "mg 5/11/2020 19:05",
-		"buttons" : "mg 6/15/2020 18:46",
+		"buttons" : "mg 6/29/2020 17:53",
 		"buttonsFrame" : "mg 5/11/2020 18:56",
 		"changeListFrame" : "SV 6/21/2020 12:24",
 		"changeListSelectionIndex" : "SV 6/21/2020 12:53",
@@ -28,9 +28,12 @@
 		"historyListFrame" : "SV 6/21/2020 12:24",
 		"historyListSelectionIndex" : "SV 6/12/2020 19:58",
 		"historyListSelectionIndex:" : "SV 6/21/2020 13:35",
-		"initialize" : "SV 6/21/2020 13:10",
-		"initializeHistoryList" : "SV 6/22/2020 21:32",
-		"invertSelection" : "SV 6/12/2020 21:50",
+		"ignoreAllOfHistoryList" : "mg 6/29/2020 18:56",
+		"ignoreAllOfHistoryListAndUpdateUI" : "mg 6/29/2020 18:58",
+		"ignoreAllOfHistoryListExceptSelected" : "mg 6/29/2020 18:58",
+		"ignoreAllOfHistoryListExceptSelectedAndUpdateUI" : "mg 6/29/2020 18:59",
+		"initialize" : "mg 6/29/2020 18:50",
+		"initializeHistoryList" : "mg 6/26/2020 11:11",
 		"isAnyDisplayedChangeListItemSelected" : "SV 6/27/2020 19:38",
 		"isInImage:" : "SV 5/20/2020 13:03",
 		"loadSelectedChanges" : "mg 6/20/2020 09:52",
@@ -40,12 +43,16 @@
 		"repaintChangeListSelection" : "SV 6/27/2020 19:48",
 		"repaintHistoryListSelection" : "SV 6/12/2020 21:41",
 		"retrieveChangeRecordsFromChangesFile" : "SV 6/12/2020 22:03",
+		"selectAllLatestChangesOfHistoryList" : "mg 6/29/2020 18:58",
+		"selectAllLatestChangesOfHistoryListAndUpdateUI" : "mg 6/29/2020 18:59",
 		"selectedChangeListItems" : "SV 6/27/2020 19:39",
 		"selectedDisplayedChangeListItems" : "SV 6/27/2020 19:38",
 		"selectedHistoryListItem" : "SV 6/12/2020 21:37",
 		"setChangeListItemSelectionAt:to:" : "SV 6/12/2020 21:51",
+		"setUpHistoryListMenuMorph:" : "mg 6/29/2020 19:00",
 		"switchToDetailedView" : "mg 5/14/2020 21:26",
-		"updateAfterChangeSelection" : "SV 6/27/2020 19:48",
-		"updateAfterHistorySelection" : "SV 6/27/2020 19:48",
+		"updateAfterChangeSelection" : "mg 6/29/2020 18:04",
+		"updateAfterHistorySelection" : "mg 6/29/2020 18:04",
+		"updateAfterMenuAction" : "mg 6/29/2020 18:04",
 		"updateCodePane" : "SV 6/21/2020 13:16",
 		"wantsOptionalButtons" : "SV 6/21/2020 12:26" } }
diff --git a/packages/ChangesReloaded-Core.package/CRHistoryListItem.class/instance/ignore.st b/packages/ChangesReloaded-Core.package/CRHistoryListItem.class/instance/ignore.st
@@ -0,0 +1,4 @@
+selecting
+ignore
+
+	self history do: [:change | change isSelected: false]
diff --git a/packages/ChangesReloaded-Core.package/CRHistoryListItem.class/instance/selectLatest.st b/packages/ChangesReloaded-Core.package/CRHistoryListItem.class/instance/selectLatest.st
@@ -0,0 +1,5 @@
+selecting
+selectLatest
+
+	self ignore.
+	self history first isSelected: true
diff --git a/packages/ChangesReloaded-Core.package/CRHistoryListItem.class/methodProperties.json b/packages/ChangesReloaded-Core.package/CRHistoryListItem.class/methodProperties.json
@@ -13,7 +13,9 @@
 		"hasSelectedChangeListItem" : "SV 6/22/2020 21:08",
 		"history" : "SV 6/12/2020 13:46",
 		"history:" : "gf 6/15/2020 23:34",
+		"ignore" : "mg 6/26/2020 11:09",
 		"initialize" : "mg 6/20/2020 09:55",
+		"selectLatest" : "mg 6/26/2020 11:09",
 		"selectedChangeListItems" : "mg 6/20/2020 09:30",
 		"selector" : "SV 6/12/2020 13:49",
 		"selector:" : "SV 6/12/2020 13:49" } }